From c16ee7fc2c6cbda1cc8e87f21f1c29b2cb5948cd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 08 六月 2021 16:34:36 +0800
Subject: [PATCH] 升级swagger到最新版本v3.0.0
---
ruoyi-admin/pom.xml | 20 ++--------
ruoyi-ui/src/components/Editor/index.vue | 1
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 12 +++---
pom.xml | 41 +++++++-------------
ruoyi-ui/src/views/tool/swagger/index.vue | 2
5 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 640387a..ebf3f28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
<bitwalker.version>1.21</bitwalker.version>
- <swagger.version>2.9.2</swagger.version>
+ <swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
@@ -48,7 +48,7 @@
<scope>import</scope>
</dependency>
- <!--阿里数据库连接池 -->
+ <!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -95,38 +95,25 @@
<version>${jna.version}</version>
</dependency>
- <!-- swagger2-->
+ <!-- Swagger3依赖 -->
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>3.0.0</version>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
</dependency>
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
- <!--io常用工具类 -->
+ <!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
- <!--文件上传工具类 -->
+ <!-- 文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -140,7 +127,7 @@
<version>${poi.version}</version>
</dependency>
- <!--velocity代码生成使用模板 -->
+ <!-- velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@@ -167,14 +154,14 @@
<version>${fastjson.version}</version>
</dependency>
- <!--Token生成与解析-->
+ <!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
- <!--验证码 -->
+ <!-- 验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index d58ad5b..25016b0 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -24,29 +24,17 @@
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
- <!-- swagger2-->
+ <!-- swagger3-->
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
+ <artifactId>springfox-boot-starter</artifactId>
</dependency>
- <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.21</version>
- </dependency>
-
+ <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
- <version>1.5.21</version>
- </dependency>
-
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
+ <version>1.6.2</version>
</dependency>
<!-- Mysql驱动包 -->
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 86acc3f..02227fd 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
@@ -8,6 +8,7 @@
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
@@ -16,10 +17,10 @@
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.Contact;
import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
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;
/**
* Swagger2的接口配置
@@ -27,7 +28,6 @@
* @author ruoyi
*/
@Configuration
-@EnableSwagger2
public class SwaggerConfig
{
/** 系统基础配置 */
@@ -71,10 +71,10 @@
/**
* 安全模式，这里指定token通过Authorization头请求头传递
*/
- private List<ApiKey> securitySchemes()
+ private List<SecurityScheme> securitySchemes()
{
- List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
- apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
+ List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+ apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
return apiKeyList;
}
@@ -87,7 +87,7 @@
securityContexts.add(
SecurityContext.builder()
.securityReferences(defaultAuth())
- .forPaths(PathSelectors.regex("^(?!auth).*$"))
+ .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
.build());
return securityContexts;
}
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index ad4da7e..d63a48d 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -158,7 +158,6 @@
});
},
handleUploadSuccess(res, file) {
- console.info(file);
// 获取富文本组件实例
let quill = this.Quill;
// 如果上传成功
diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue
index 624b59a..8db3180 100644
--- a/ruoyi-ui/src/views/tool/swagger/index.vue
+++ b/ruoyi-ui/src/views/tool/swagger/index.vue
@@ -8,7 +8,7 @@
name: "Swagger",
data() {
return {
- src: process.env.VUE_APP_BASE_API + "/swagger-ui.html",
+ src: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html",
height: document.documentElement.clientHeight - 94.5 + "px;",
loading: true
};
--
Gitblit v1.9.2