From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java | 115 +++++++++++++++++++++++++++------------------------------
1 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
index 8b17834..6f3b099 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
@@ -1,60 +1,55 @@
-package com.ruoyi.framework.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.DispatcherType;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.filter.RepeatableFilter;
-import com.ruoyi.common.filter.XssFilter;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * Filter閰嶇疆
- *
- * @author ruoyi
- */
-@Configuration
-public class FilterConfig
-{
- @Value("${xss.enabled}")
- private String enabled;
-
- @Value("${xss.excludes}")
- private String excludes;
-
- @Value("${xss.urlPatterns}")
- private String urlPatterns;
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Bean
- public FilterRegistrationBean xssFilterRegistration()
- {
- FilterRegistrationBean registration = new FilterRegistrationBean();
- registration.setDispatcherTypes(DispatcherType.REQUEST);
- registration.setFilter(new XssFilter());
- registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
- registration.setName("xssFilter");
- registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
- Map<String, String> initParameters = new HashMap<String, String>();
- initParameters.put("excludes", excludes);
- initParameters.put("enabled", enabled);
- registration.setInitParameters(initParameters);
- return registration;
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Bean
- public FilterRegistrationBean someFilterRegistration()
- {
- FilterRegistrationBean registration = new FilterRegistrationBean();
- registration.setFilter(new RepeatableFilter());
- registration.addUrlPatterns("/*");
- registration.setName("repeatableFilter");
- registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
- return registration;
- }
-
-}
+package com.ruoyi.framework.config;
+
+import com.ruoyi.common.filter.RepeatableFilter;
+import com.ruoyi.common.filter.XssFilter;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.config.properties.XssProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.DispatcherType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Filter閰嶇疆
+ *
+ * @author Lion Li
+ */
+@Configuration
+public class FilterConfig {
+
+ @Autowired
+ private XssProperties xssProperties;
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ @Bean
+ @ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
+ public FilterRegistrationBean xssFilterRegistration() {
+ FilterRegistrationBean registration = new FilterRegistrationBean();
+ registration.setDispatcherTypes(DispatcherType.REQUEST);
+ registration.setFilter(new XssFilter());
+ registration.addUrlPatterns(StringUtils.split(xssProperties.getUrlPatterns(), ","));
+ registration.setName("xssFilter");
+ registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+ Map<String, String> initParameters = new HashMap<String, String>();
+ initParameters.put("excludes", xssProperties.getExcludes());
+ registration.setInitParameters(initParameters);
+ return registration;
+ }
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ @Bean
+ public FilterRegistrationBean someFilterRegistration() {
+ FilterRegistrationBean registration = new FilterRegistrationBean();
+ registration.setFilter(new RepeatableFilter());
+ registration.addUrlPatterns("/*");
+ registration.setName("repeatableFilter");
+ registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
+ return registration;
+ }
+
+}
--
Gitblit v1.9.3