From c1c4fb2ca4a2ab1f560362b484e23ce19a8b073a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 21 十月 2021 18:10:45 +0800
Subject: [PATCH] update hutool 5.7.13 => 5.7.14 update qcloud.cos 5.6.55 => 5.6.58 update minio 8.3.0 => 8.3.1
---
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java | 19 ++++++++++++-------
1 files changed, 12 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 4d36a92..8af1257 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,9 +1,8 @@
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 com.ruoyi.common.utils.StringUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -59,15 +58,15 @@
// 涓虹┖锛岀洿鎺ヨ繑鍥�
String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8);
- if (Validator.isEmpty(json))
+ if (StringUtils.isEmpty(json))
{
return super.getInputStream();
}
// xss杩囨护
json = HtmlUtil.cleanHtmlTag(json).trim();
-
- final ByteArrayInputStream bis = IoUtil.toStream(json, StandardCharsets.UTF_8);
+ byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
+ final ByteArrayInputStream bis = IoUtil.toStream(jsonBytes);
return new ServletInputStream()
{
@Override
@@ -80,6 +79,12 @@
public boolean isReady()
{
return true;
+ }
+
+ @Override
+ public int available() throws IOException
+ {
+ return jsonBytes.length;
}
@Override
@@ -103,6 +108,6 @@
public boolean isJsonRequest()
{
String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
- return StrUtil.startWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
+ return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3