admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
疯狂的狮子Li 2022-07-09 12:57:30 +08:00
parent da4077f3b7
commit ac1d7aa69f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application.yml
View File

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

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

@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.pattern.PathPattern;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -41,18 +42,18 @@ public class ExcludeUrlProperties implements InitializingBean {
// 获取方法上边的注解 替代path variable 为 * // 获取方法上边的注解 替代path variable 为 *
Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class); Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
Optional.ofNullable(method).ifPresent(anonymous -> { Optional.ofNullable(method).ifPresent(anonymous -> {
Set<String> patterns = info.getPatternsCondition().getPatterns(); Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
patterns.forEach(url -> { patterns.forEach(url -> {
excludes.add(ReUtil.replaceAll(url, PATTERN, asterisk)); excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
}); });
}); });
// 获取类上边的注解, 替代path variable 为 * // 获取类上边的注解, 替代path variable 为 *
Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class); Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);
Optional.ofNullable(controller).ifPresent(anonymous -> { Optional.ofNullable(controller).ifPresent(anonymous -> {
Set<String> patterns = info.getPatternsCondition().getPatterns(); Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
patterns.forEach(url -> { patterns.forEach(url -> {
excludes.add(ReUtil.replaceAll(url, PATTERN, asterisk)); excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
}); });
}); });
}); });