From a2dede8448dd9b85d91d972338ede0ce628d5950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E8=89=BA=E5=B3=B0?= <1064168114@qq.com> Date: Thu, 4 Mar 2021 09:28:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DByte[]=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=AD=BB=E5=BE=AA=E7=8E=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/text/Convert.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 1c87e75b..aa7c436b 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,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) { From 24e7ed38a5de3f740155d9ad6ba9b649371d8f20 Mon Sep 17 00:00:00 2001 From: TwelveT <2471835953@qq.com> Date: Sun, 7 Mar 2021 23:47:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0feign=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AFIP=E5=A4=B4=E9=83=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/feign/FeignRequestInterceptor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java index 2642dd12..50539f33 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java @@ -2,6 +2,8 @@ package com.ruoyi.common.security.feign; import java.util.Map; import javax.servlet.http.HttpServletRequest; + +import com.ruoyi.common.core.utils.ip.IpUtils; import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.utils.ServletUtils; @@ -40,6 +42,10 @@ public class FeignRequestInterceptor implements RequestInterceptor { requestTemplate.header(CacheConstants.AUTHORIZATION_HEADER, authentication); } + + // 配置客户端IP + requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr(ServletUtils.getRequest())); + } } } \ No newline at end of file From 41fa57d778d2bdfdbe7aad0a8c999c6681a24061 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 14 Mar 2021 21:53:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?velocity=E5=89=94=E9=99=A4commons-collectio?= =?UTF-8?q?ns=E7=89=88=E6=9C=AC=EF=BC=8C=E9=98=B2=E6=AD=A23.2.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ .../ruoyi/common/core/web/controller/BaseController.java | 4 +--- .../common/security/feign/FeignRequestInterceptor.java | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 292ae495..d1617561 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,12 @@ org.apache.velocity velocity ${velocity.version} + + + commons-collections + commons-collections + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index 5b0814a7..6460340b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -3,12 +3,10 @@ package com.ruoyi.common.core.web.controller; import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ruoyi.common.core.constant.HttpStatus; @@ -27,7 +25,7 @@ import com.ruoyi.common.core.web.page.TableSupport; */ public class BaseController { - protected final Logger logger = LoggerFactory.getLogger(BaseController.class); + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java index 50539f33..045485c8 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java @@ -2,7 +2,6 @@ package com.ruoyi.common.security.feign; import java.util.Map; import javax.servlet.http.HttpServletRequest; - import com.ruoyi.common.core.utils.ip.IpUtils; import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; @@ -45,7 +44,6 @@ public class FeignRequestInterceptor implements RequestInterceptor // 配置客户端IP requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr(ServletUtils.getRequest())); - } } } \ No newline at end of file