diff --git a/pom.xml b/pom.xml index 56d6aa24..00e34458 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,26 @@ - + + + + org.springframework + spring-context-support + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.boot.version} + + + + + mysql + mysql-connector-java + + javax.servlet javax.servlet-api diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index bc6caf0d..830064dd 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -21,19 +21,7 @@ - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - + org.springframework.boot @@ -54,42 +42,15 @@ springfox-swagger2 ${swagger.version} - - - - com.ruoyi - ruoyi-common - ${ruoyi.version} - - + com.ruoyi ruoyi-framework ${ruoyi.version} - - - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} + - - - com.ruoyi - ruoyi-generator - ${ruoyi.version} - - diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index d89ca5c1..95105f4f 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -16,18 +16,19 @@ - + + org.springframework.boot spring-boot-starter-web - - + + org.springframework.boot spring-boot-starter-aop - + com.alibaba @@ -47,14 +48,20 @@ - + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + org.apache.shiro shiro-core ${shiro.version} - + org.apache.shiro @@ -68,32 +75,40 @@ 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-common + ruoyi-quartz ${ruoyi.version} + com.ruoyi - ruoyi-system + ruoyi-generator ${ruoyi.version} - + \ No newline at end of file diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 7c9b25f6..7d4fe3f3 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -20,27 +20,19 @@ - - - - org.springframework - spring-context-support - - - - - org.apache.velocity - velocity - ${velocity.version} - - - + + + org.apache.velocity + velocity + ${velocity.version} + + + com.ruoyi ruoyi-common ${ruoyi.version} - \ No newline at end of file diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 24550cd9..f2a3b829 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -16,13 +16,6 @@ - - - - org.springframework - spring-context-support - - org.quartz-scheduler @@ -34,7 +27,7 @@ - + com.ruoyi diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 0dc3e91b..aa5236fc 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -16,27 +16,12 @@ - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis.boot.version} - - - - - mysql - mysql-connector-java - - com.ruoyi ruoyi-common ${ruoyi.version} - \ No newline at end of file