From 63a582404b0766b22d8ea69e9a5d58edfb0a7a90 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 17:51:00 +0800
Subject: [PATCH] update swagger 模板修改为 swagger-bootstrap-ui
---
/dev/null | 24 ------------
ruoyi-admin/pom.xml | 5 +-
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 17 ++++----
pom.xml | 26 +++----------
ruoyi-common/pom.xml | 6 ---
ruoyi-ui/src/views/tool/swagger/index.vue | 2
README.md | 1
7 files changed, 18 insertions(+), 63 deletions(-)
diff --git a/README.md b/README.md
index c8d2829..2352aa8 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
* 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow
* 浠ｇ爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮�
* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃�
+* swagger 淇敼涓� swagger-bootstrap-ui
* 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘
* 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑)
* 鍗囩骇MybatisPlus 3.4.2
diff --git a/pom.xml b/pom.xml
index beb331f..b27f40e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.4</druid.version>
<swagger.version>2.9.2</swagger.version>
+ <swagger-ui.version>1.9.6</swagger-ui.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
<fastjson.version>1.2.75</fastjson.version>
<oshi.version>5.6.0</oshi.version>
@@ -84,7 +85,7 @@
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
-
+
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
@@ -101,26 +102,11 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- swagger2-UI-->
+
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
- <!--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>
- <version>${commons.fileupload.version}</version>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
+ <version>${swagger-ui.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index ae5fd0b..94316f5 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -43,10 +43,9 @@
<version>1.5.21</version>
</dependency>
- <!-- swagger2-UI-->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
</dependency>
<!-- Mysql椹卞姩鍖� -->
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
deleted file mode 100644
index e901fed..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
-
-/**
- * swagger 鎺ュ彛
- *
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/tool/swagger")
-public class SwaggerController extends BaseController
-{
- @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
- @GetMapping()
- public String index()
- {
- return redirect("/swagger-ui.html");
- }
-}
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 1273785..0479891 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,25 +1,23 @@
package com.ruoyi.web.core.config;
-import java.util.ArrayList;
-import java.util.List;
+import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
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.RuoYiConfig;
-import io.swagger.annotations.ApiOperation;
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.*;
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 java.util.ArrayList;
+import java.util.List;
/**
* Swagger2鐨勬帴鍙ｉ厤缃�
@@ -28,6 +26,7 @@
*/
@Configuration
@EnableSwagger2
+@EnableSwaggerBootstrapUI
public class SwaggerConfig
{
/** 绯荤粺鍩虹閰嶇疆 */
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 72a7e80..2b04147 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -95,12 +95,6 @@
<artifactId>commons-pool2</artifactId>
</dependency>
- <!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
- <dependency>
- <groupId>eu.bitwalker</groupId>
- <artifactId>UserAgentUtils</artifactId>
- </dependency>
-
<!-- servlet鍖� -->
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue
index 61cfcca..8504daf 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 + "/doc.html",
height: document.documentElement.clientHeight - 94.5 + "px;",
loading: true
};
--
Gitblit v1.9.3