From 5952b1c90e9d30b6111ecadbf8bc6f3cf8886abe Mon Sep 17 00:00:00 2001
From: G405G <guilongji@outlook.com>
Date: Fri, 18 Nov 2022 06:01:45 +0000
Subject: [PATCH] =?UTF-8?q?!253=20=E8=BF=87=E6=BB=A4=E5=99=A8=E9=93=BE?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8IoUtil.read=E6=96=B9=E6=B3=95=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4request=E6=B5=81=E5=85=B3=E9=97=AD=20*=20fix-=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E9=93=BE=E4=BD=BF=E7=94=A8IoUtil.read?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=BC=E8=87=B4request=E6=B5=81=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/filter/RepeatedlyRequestWrapper.java     | 3 ++-
 .../com/ruoyi/common/filter/XssHttpServletRequestWrapper.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
index ca76e76cc..d1ff5a58d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.common.filter;
 
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.constant.Constants;
 
 import javax.servlet.ReadListener;
@@ -27,7 +28,7 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper {
         request.setCharacterEncoding(Constants.UTF8);
         response.setCharacterEncoding(Constants.UTF8);
 
-        body = IoUtil.readUtf8(request.getInputStream()).getBytes(StandardCharsets.UTF_8);
+        body = StrUtil.str(IoUtil.readBytes(request.getInputStream(), false), StandardCharsets.UTF_8).getBytes();
     }
 
     @Override
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
index f1b51315a..3646f1fee 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.common.filter;
 
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.http.HttpHeaders;
@@ -50,7 +51,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         }
 
         // 为空，直接返回
-        String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8);
+        String json = StrUtil.str(IoUtil.readBytes(super.getInputStream(), false), StandardCharsets.UTF_8);
         if (StringUtils.isEmpty(json)) {
             return super.getInputStream();
         }
@@ -88,7 +89,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
     /**
      * 是否是Json请求
-     *
      */
     public boolean isJsonRequest() {
         String header = super.getHeader(HttpHeaders.CONTENT_TYPE);