diff --git a/pom.xml b/pom.xml index 39b46e9ec..52b9f9b05 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.2.6 1.21 2.3.2 - 2.9.2 + 3.0.0 2.1.4 1.3.0 1.2.76 @@ -47,21 +47,21 @@ import - + com.alibaba druid-spring-boot-starter ${druid.version} - + com.github.penggle kaptcha ${kaptcha.version} - + org.apache.shiro shiro-core @@ -129,38 +129,25 @@ ${jna.version} - + io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - + springfox-boot-starter + 3.0.0 + + io.swagger + swagger-models + - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - + commons-io commons-io ${commons.io.version} - + commons-fileupload commons-fileupload @@ -174,7 +161,7 @@ ${poi.version} - + org.apache.velocity velocity diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 65d571144..e29eeaf3c 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -30,29 +30,17 @@ true - + io.springfox - springfox-swagger2 - - - - - io.swagger - swagger-annotations - 1.5.21 + springfox-boot-starter + io.swagger swagger-models - 1.5.21 - - - - - io.springfox - springfox-swagger-ui + 1.6.2 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 index cfa748f30..079d7d2a7 100644 --- 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 @@ -19,6 +19,6 @@ public class SwaggerController extends BaseController @GetMapping() public String index() { - return redirect("/swagger-ui.html"); + return redirect("/swagger-ui/index.html"); } }