From 95c1286f063054c095ce2279177dc8c96c5fa3bc Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 24 Apr 2022 18:18:40 +0800
Subject: [PATCH] !184 spring-boot 最新版本 2.6.7 Merge pull request !184 from abbfun/N/A
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index aa7c436..95a00b7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -797,16 +797,20 @@
}
else if (obj instanceof byte[] || obj instanceof Byte[])
{
- if (obj instanceof byte[]){
+ if (obj instanceof byte[])
+ {
return str((byte[]) obj, charset);
- } else {
- Byte[] bytes = (Byte[])obj;
+ }
+ else
+ {
+ Byte[] bytes = (Byte[]) obj;
int length = bytes.length;
byte[] dest = new byte[length];
- for (int i = 0; i < length; i++) {
+ for (int i = 0; i < length; i++)
+ {
dest[i] = bytes[i];
}
- return str (dest,charset);
+ return str(dest, charset);
}
}
else if (obj instanceof ByteBuffer)
--
Gitblit v1.9.3