From 57d2299a11ba45b0092d39872b5f05a184882bb0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 06 五月 2024 14:54:06 +0800
Subject: [PATCH] 升级接口文档4.4.0
---
ard-work/pom.xml | 14 +++++++-------
ruoyi-admin/pom.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 34 ++++++++++------------------------
pom.xml | 5 ++---
4 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index c40a85b..1fbbf6c 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -62,7 +62,7 @@
<!--knife4j渚濊禆-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
+ <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
</dependency>
<!--寮犲缓鎻愪緵寮曞渚濊禆-->
<dependency>
@@ -144,12 +144,12 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.2.0</version>
</dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-annotations</artifactId>
- <version>3.0.3</version>
- <scope>compile</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.github.xiaoymin</groupId>-->
+<!-- <artifactId>knife4j-annotations</artifactId>-->
+<!-- <version>3.0.3</version>-->
+<!-- <scope>compile</scope>-->
+<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/org.apache.axis/axis -->
<dependency>
<groupId>org.apache.axis</groupId>
diff --git a/pom.xml b/pom.xml
index a44b2ce..55de364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,7 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.15</druid.version>
<bitwalker.version>1.21</bitwalker.version>
- <swagger.version>3.0.0</swagger.version>
- <knife4j.version>3.0.3</knife4j.version>
+ <knife4j.version>4.4.0</knife4j.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.20</fastjson.version>
@@ -77,7 +76,7 @@
<!-- Knife4j 澧炲己Swagger鏂囨。 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
+ <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index cdb9822..ee84a16 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -29,7 +29,7 @@
<!--knife4j渚濊禆-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
+ <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
</dependency>
<!-- Postgresql椹卞姩鍖� -->
<dependency>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 3ebe714..8df7756 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -1,28 +1,22 @@
package com.ruoyi.web.core.config;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.ARDConfig;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Swagger2鐨勬帴鍙ｉ厤缃�
@@ -30,20 +24,12 @@
* @author ruoyi
*/
@Configuration
-@EnableSwagger2
+@EnableSwagger2WebMvc
public class SwaggerConfig
{
/** 绯荤粺鍩虹閰嶇疆 */
@Autowired
private ARDConfig ardConfig;
-
- ///** 鏄惁寮�鍚痵wagger */
- //@Value("${swagger.enabled}")
- //private boolean enabled;
- //
- ///** 璁剧疆璇锋眰鐨勭粺涓�鍓嶇紑 */
- //@Value("${swagger.pathMapping}")
- //private String pathMapping;
/**
* 鍒涘缓API
@@ -90,7 +76,7 @@
securityContexts.add(
SecurityContext.builder()
.securityReferences(defaultAuth())
- .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+ .forPaths(PathSelectors.regex("^(?!auth).*$"))
.build());
return securityContexts;
}
--
Gitblit v1.9.3