Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

删除多余的代码

Browse Source
This commit is contained in:
RuoYi
2021-03-07 11:06:47 +08:00
parent 78deee063d
commit 61432480c8
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
View File

@ -785,19 +785,28 @@ public class Convert
* @param charset 字符集
* @return 字符串
*/
public static String str(Object obj, Charset charset) {
if (null == obj) {
public static String str(Object obj, Charset charset)
{
if (null == obj)
{
return null;
}
if (obj instanceof String) {
if (obj instanceof String)
{
return (String) obj;
} else if (obj instanceof byte[]) {
}
else if (obj instanceof byte[])
{
return str((byte[]) obj, charset);
} else if (obj instanceof Byte[]) {
}
else if (obj instanceof Byte[])
{
byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
return str(bytes, charset);
} else if (obj instanceof ByteBuffer) {
}
else if (obj instanceof ByteBuffer)
{
return str((ByteBuffer) obj, charset);
}
return obj.toString();