From a28dd0fe4057d9d1c52be85457ad0c3882ec2d40 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 18:26:09 +0800
Subject: [PATCH] fix 修复 数据加密拦截器空数据异常
---
ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java
index a11ec79..7444f73 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java
@@ -4,13 +4,13 @@
import com.ruoyi.common.web.config.properties.XssProperties;
import com.ruoyi.common.web.filter.RepeatableFilter;
import com.ruoyi.common.web.filter.XssFilter;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.DispatcherType;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
-import jakarta.servlet.DispatcherType;
import java.util.HashMap;
import java.util.Map;
@@ -20,22 +20,20 @@
* @author Lion Li
*/
@AutoConfiguration
+@EnableConfigurationProperties(XssProperties.class)
public class FilterConfig {
-
- @Autowired
- private XssProperties xssProperties;
@SuppressWarnings({"rawtypes", "unchecked"})
@Bean
@ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
- public FilterRegistrationBean xssFilterRegistration() {
+ public FilterRegistrationBean xssFilterRegistration(XssProperties xssProperties) {
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setDispatcherTypes(DispatcherType.REQUEST);
registration.setFilter(new XssFilter());
- registration.addUrlPatterns(StringUtils.split(xssProperties.getUrlPatterns(), ","));
+ registration.addUrlPatterns(StringUtils.split(xssProperties.getUrlPatterns(), StringUtils.SEPARATOR));
registration.setName("xssFilter");
registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
- Map<String, String> initParameters = new HashMap<String, String>();
+ Map<String, String> initParameters = new HashMap<>();
initParameters.put("excludes", xssProperties.getExcludes());
registration.setInitParameters(initParameters);
return registration;
--
Gitblit v1.9.3