From a63abbf268e4c0a60344f63b5cba828a1347e178 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 07 十一月 2022 22:27:21 +0800
Subject: [PATCH] update 优化 hikari 参数顺序 最常用的放上面 删除无用 druid 监控页面
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
index b4e3eae..99d2eae 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
@@ -1,5 +1,7 @@
package com.ruoyi.framework.config.properties;
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.hutool.core.util.ReUtil;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -11,7 +13,10 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.util.pattern.PathPattern;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.regex.Pattern;
@@ -19,7 +24,10 @@
* 璁剧疆娉ㄨВ鍏佽鍖垮悕璁块棶鐨剈rl
*
* @author Lion Li
+ * @deprecated 灏嗗湪鍚庣画鐗堟湰浣跨敤Sa-Token娉ㄨВ {@link SaIgnore} 浠ｆ浛锛�
+ * 搴曞眰杩囨护鏂规硶璇﹁ {@link SaInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)}
*/
+@Deprecated
@Lazy
@Component
public class ExcludeUrlProperties implements InitializingBean {
@@ -32,7 +40,7 @@
@Override
public void afterPropertiesSet() {
String asterisk = "*";
- RequestMappingHandlerMapping mapping = SpringUtils.getBean(RequestMappingHandlerMapping.class);
+ RequestMappingHandlerMapping mapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
Map<RequestMappingInfo, HandlerMethod> map = mapping.getHandlerMethods();
map.keySet().forEach(info -> {
@@ -41,18 +49,18 @@
// 鑾峰彇鏂规硶涓婅竟鐨勬敞瑙� 鏇夸唬path variable 涓� *
Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
Optional.ofNullable(method).ifPresent(anonymous -> {
- Set<String> patterns = info.getPatternsCondition().getPatterns();
+ Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
patterns.forEach(url -> {
- excludes.add(ReUtil.replaceAll(url, PATTERN, asterisk));
+ excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
});
});
// 鑾峰彇绫讳笂杈圭殑娉ㄨВ, 鏇夸唬path variable 涓� *
Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);
Optional.ofNullable(controller).ifPresent(anonymous -> {
- Set<String> patterns = info.getPatternsCondition().getPatterns();
+ Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
patterns.forEach(url -> {
- excludes.add(ReUtil.replaceAll(url, PATTERN, asterisk));
+ excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
});
});
});
--
Gitblit v1.9.3