From ff4a429136ed859d3c121b164ab3dc9a4321c89b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:07:09 +0800
Subject: [PATCH] update 升级 springboot 2.6.X 解决 springfox 兼容性问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
pom.xml | 4 ++--
ruoyi-admin/src/main/resources/application.yml | 4 ++++
3 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index eea70e7..16501c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.8</spring-boot.version>
+ <spring-boot.version>2.6.2</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@@ -30,7 +30,7 @@
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version>
- <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
+ <spring-boot-admin.version>2.6.0</spring-boot-admin.version>
<redisson.version>3.16.7</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.5.0</dynamic-ds.version>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 700cec0..ed9f1d2 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -79,6 +79,10 @@
thymeleaf:
# 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
template-resolver-order: 1
+ 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/SwaggerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
index 29d79d1..16437f4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
@@ -7,8 +7,13 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.properties.SwaggerProperties;
import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
@@ -16,8 +21,11 @@
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
+import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
import javax.annotation.PostConstruct;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
@@ -26,18 +34,45 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Configuration
@EnableKnife4j
public class SwaggerConfig {
- @Autowired
- private SwaggerProperties swaggerProperties;
+ private final SwaggerProperties swaggerProperties;
+ private final TokenProperties tokenProperties;
+ private final OpenApiExtensionResolver openApiExtensionResolver;
- @Autowired
- private TokenProperties tokenProperties;
+ /**
+ * 鐢ㄤ簬閫傞厤springboot 2.6
+ */
+ @Bean
+ @SuppressWarnings("all")
+ public BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
+ return new BeanPostProcessor() {
+ @Override
+ public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+ if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
+ customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
+ }
+ return bean;
+ }
- @Autowired
- private OpenApiExtensionResolver openApiExtensionResolver;
+ private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
+ mappings.removeIf(mapping -> mapping.getPatternParser() != null);
+ }
+
+ private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
+ try {
+ Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
+ field.setAccessible(true);
+ return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ };
+ }
/**
* 鍒涘缓API
@@ -97,7 +132,7 @@
* 榛樿鐨勫畨鍏ㄤ笂寮曠敤
*/
private List<SecurityReference> defaultAuth() {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+ AuthorizationScope authorizationScope = new AuthorizationScope("global" , "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
--
Gitblit v1.9.3