Browse Source

修复Byte[]类型参数死循环的问题

周艺峰 4 years ago
parent
commit
a2dede8448

+ 11 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -797,7 +797,17 @@ public class Convert
         }
         else if (obj instanceof byte[] || obj instanceof Byte[])
         {
-            return str((Byte[]) obj, charset);
+            if (obj instanceof byte[]){
+                return str((byte[]) obj, charset);
+            } else {
+                Byte[] bytes = (Byte[])obj;
+                int length = bytes.length;
+                byte[] dest = new byte[length];
+                for (int i = 0; i < length; i++) {
+                    dest[i] = bytes[i];
+                }
+            return str (dest,charset);
+            }
         }
         else if (obj instanceof ByteBuffer)
         {