From ac1d7aa69f66ec02f2909dd16b7e1ce6e68611b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sat, 9 Jul 2022 12:57:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E4=B8=8E=20springfox=20=E5=85=BC=E5=AE=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E5=90=AF=E7=94=A8=E6=96=B0=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml           | 4 ----
 .../config/properties/ExcludeUrlProperties.java          | 9 +++++----
 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 74d251b63..27482ac06 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/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
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 b4e3eae6d..2182fded6 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.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));
                 });
             });
         });