From a8c1d02ee14a3aa01dc02f496a9e4a61b6abdf99 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 六月 2021 18:15:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
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 0548934..4d36a92 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,8 +1,9 @@
package com.ruoyi.common.filter;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil;
-import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -12,10 +13,11 @@
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
/**
* XSS杩囨护澶勭悊
- *
+ *
* @author ruoyi
*/
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
@@ -56,7 +58,7 @@
}
// 涓虹┖锛岀洿鎺ヨ繑鍥�
- String json = IOUtils.toString(super.getInputStream(), "utf-8");
+ String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8);
if (Validator.isEmpty(json))
{
return super.getInputStream();
@@ -64,7 +66,8 @@
// xss杩囨护
json = HtmlUtil.cleanHtmlTag(json).trim();
- final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
+
+ final ByteArrayInputStream bis = IoUtil.toStream(json, StandardCharsets.UTF_8);
return new ServletInputStream()
{
@Override
@@ -94,12 +97,12 @@
/**
* 鏄惁鏄疛son璇锋眰
- *
+ *
* @param request
*/
public boolean isJsonRequest()
{
String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
- return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header);
+ return StrUtil.startWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3