From ac1d7aa69f66ec02f2909dd16b7e1ce6e68611b9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 09 七月 2022 12:57:46 +0800
Subject: [PATCH] update 优化 路由与 springfox 兼容问题 启用新路由方式
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java | 9 +++++----
ruoyi-admin/src/main/resources/application.yml | 4 ----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 74d251b..27482ac 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -75,10 +75,6 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
- mvc:
- pathmatch:
- # 閫傞厤 boot 2.6 璺敱涓� springfox 鍏煎
- matching-strategy: ANT_PATH_MATCHER
jackson:
# 鏃ユ湡鏍煎紡鍖�
date-format: yyyy-MM-dd HH:mm:ss
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..2182fde 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
@@ -11,6 +11,7 @@
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 java.util.*;
import java.util.regex.Pattern;
@@ -41,18 +42,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