update 优化 路由与 springfox 兼容问题 启用新路由方式

ruoyi-admin/src/main/resources/application.yml

@@ -75,10 +75,6 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-  mvc:
-    pathmatch:
-      # 适配 boot 2.6 路由与 springfox 兼容
-      matching-strategy: ANT_PATH_MATCHER
   jackson:
     # 日期格式化
     date-format: yyyy-MM-dd HH:mm:ss

ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 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 @@ public class ExcludeUrlProperties implements InitializingBean {
             // 获取方法上边的注解 替代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));
                 });
             });
         });