diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index bc6caf0da..61752a86b 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -54,14 +54,14 @@ springfox-swagger2 ${swagger.version} - - - - com.ruoyi - ruoyi-common - ${ruoyi.version} - + + + io.springfox + springfox-swagger-ui + ${swagger.version} + + com.ruoyi @@ -69,13 +69,6 @@ ${ruoyi.version} - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - com.ruoyi 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 88f63450c..9cee0a47f 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 @@ -32,7 +32,7 @@ public class SwaggerConfig .apiInfo(apiInfo()) .select() // 指定当前包路径 - .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + .apis(RequestHandlerSelectors.basePackage("com.ruoyi.web.controller.tool")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build(); diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index b2fbbe732..32552e111 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -64,6 +64,7 @@ ${poi.version} + org.yaml snakeyaml diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index d89ca5c1a..4cb1e5d15 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -83,11 +83,7 @@ ${bitwalker.version} - - com.ruoyi - ruoyi-common - ${ruoyi.version} - + com.ruoyi ruoyi-system