diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 830064dd0..477ba08d3 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -1,76 +1,76 @@ - - - - ruoyi - com.ruoyi - 3.0 - - 4.0.0 - - ruoyi-admin - - - web服务入口 - - - - 1.2.5 - 2.7.0 - - - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - - - com.ruoyi - ruoyi-framework - ${ruoyi.version} - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - repackage - - - - - - ruoyi-${ruoyi.version} - - + + + + ruoyi + com.ruoyi + 3.0 + + 4.0.0 + + ruoyi-admin + + + web服务入口 + + + + 1.2.5 + 2.7.0 + + + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + io.springfox + springfox-swagger2 + ${swagger.version} + + + + + com.ruoyi + ruoyi-framework + ${ruoyi.version} + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + repackage + + + + + + ruoyi-${ruoyi.version} + + \ No newline at end of file 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 95105f4fd..cd9e10147 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -1,114 +1,114 @@ - - - - ruoyi - com.ruoyi - 3.0 - - 4.0.0 - - ruoyi-framework - - - framework框架核心 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-aop - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - javax.servlet-api - javax.servlet - - - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - - - org.apache.shiro - shiro-spring - ${shiro.version} - - - - - org.apache.shiro - shiro-ehcache - ${shiro.version} - - - - - com.github.theborakompanioni - thymeleaf-extras-shiro - ${thymeleaf.extras.shiro.version} - - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} - - - - com.ruoyi - ruoyi-generator - ${ruoyi.version} - - - - + + + + ruoyi + com.ruoyi + 3.0 + + 4.0.0 + + ruoyi-framework + + + framework框架核心 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + com.github.penggle + kaptcha + ${kaptcha.version} + + + javax.servlet-api + javax.servlet + + + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + org.apache.shiro + shiro-core + ${shiro.version} + + + + + org.apache.shiro + shiro-spring + ${shiro.version} + + + + + org.apache.shiro + shiro-ehcache + ${shiro.version} + + + + + com.github.theborakompanioni + thymeleaf-extras-shiro + ${thymeleaf.extras.shiro.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + com.ruoyi + ruoyi-system + ${ruoyi.version} + + + + com.ruoyi + ruoyi-quartz + ${ruoyi.version} + + + + com.ruoyi + ruoyi-generator + ${ruoyi.version} + + + + \ No newline at end of file