From 63a582404b0766b22d8ea69e9a5d58edfb0a7a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 15 Mar 2021 17:51:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20swagger=20=E6=A8=A1=E6=9D=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20swagger-bootstrap-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + pom.xml | 26 +++++-------------- ruoyi-admin/pom.xml | 5 ++-- .../controller/tool/SwaggerController.java | 24 ----------------- .../ruoyi/web/core/config/SwaggerConfig.java | 17 ++++++------ ruoyi-common/pom.xml | 6 ----- ruoyi-ui/src/views/tool/swagger/index.vue | 2 +- 7 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java diff --git a/README.md b/README.md index c8d2829e..2352aa86 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ * 容器改动 Tomcat 改为 并发性能更好的 undertow * 代码生成模板 改为适配 Mybatis-Plus 的代码 * 项目修改为 maven多环境配置 +* swagger 修改为 swagger-bootstrap-ui * 集成 Hutool 5.X 并重写RuoYi部分功能 * 集成 Feign 接口化管理 Http 请求(如三方请求 支付,短信,推送等) * 升级MybatisPlus 3.4.2 diff --git a/pom.xml b/pom.xml index beb331f6..b27f40eb 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ 3.1.1 1.2.4 2.9.2 + 1.9.6 1.3.0 1.2.75 5.6.0 @@ -84,7 +85,7 @@ jna-platform ${jna.version} - + io.springfox @@ -101,26 +102,11 @@ - - + - io.springfox - springfox-swagger-ui - ${swagger.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} + com.github.xiaoymin + swagger-bootstrap-ui + ${swagger-ui.version} diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index ae5fd0bf..94316f57 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -43,10 +43,9 @@ 1.5.21 - - io.springfox - springfox-swagger-ui + com.github.xiaoymin + swagger-bootstrap-ui 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 e901fedd..00000000 --- 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 12737856..0479891e 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,26 +1,24 @@ 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 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; */ @Configuration @EnableSwagger2 +@EnableSwaggerBootstrapUI public class SwaggerConfig { /** 系统基础配置 */ diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 72a7e800..2b04147e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -95,12 +95,6 @@ commons-pool2 - - - eu.bitwalker - UserAgentUtils - - javax.servlet diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue index 61cfccaa..8504daf3 100644 --- a/ruoyi-ui/src/views/tool/swagger/index.vue +++ b/ruoyi-ui/src/views/tool/swagger/index.vue @@ -8,7 +8,7 @@ export default { 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 };