From 211a0ab746bdfb676a0915425a642abf95bfaec8 Mon Sep 17 00:00:00 2001
From: kuangbx <kuangbaoxu@neusoft.com>
Date: Sun, 7 Oct 2018 22:06:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9]=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4Pom=E4=BE=9D=E8=B5=96=EF=BC=8C=E7=9B=AE=E5=89=8Druoyi-?=
 =?UTF-8?q?admin=E5=8F=AA=E4=BE=9D=E8=B5=96ruoyi-framework,ruoyi-framework?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96ruoyi-system=EF=BC=8Cruoyi-generator,ruoyi-qu?=
 =?UTF-8?q?artz=E3=80=82ruoyi-common=E4=B8=BA=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E3=80=82=20[=E4=BF=AE=E6=94=B9=E4=BA=BA]=E5=8C=A1?=
 =?UTF-8?q?=E5=AE=9D=E6=97=AD=20[=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4]2018?=
 =?UTF-8?q?-10-07=2022:06=20[=E5=A4=87=E6=B3=A8]=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8C=85=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=9D=87?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                 | 21 ++++++++++++++++++-
 ruoyi-admin/pom.xml     | 45 +++--------------------------------------
 ruoyi-framework/pom.xml | 41 +++++++++++++++++++++++++------------
 ruoyi-generator/pom.xml | 24 ++++++++--------------
 ruoyi-quartz/pom.xml    |  9 +--------
 ruoyi-system/pom.xml    | 15 --------------
 6 files changed, 60 insertions(+), 95 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56d6aa247..00e344586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,26 @@
 
 
 	<dependencies>
-	
+
+		<!--Spring框架基本的核心工具-->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+		</dependency>
+
+        <!-- SpringBoot集成mybatis框架 -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis.boot.version}</version>
+        </dependency>
+
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
        <dependency>
 		    <groupId>javax.servlet</groupId>
 		    <artifactId>javax.servlet-api</artifactId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index bc6caf0da..830064dd0 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -21,19 +21,7 @@
 	</properties>
 
     <dependencies>
-        
-		<!-- SpringBoot Web容器 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        
-		<!-- SpringBoot集成thymeleaf模板 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        
+
         <!-- spring-boot-devtools -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -54,42 +42,15 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
-        
-		<!-- 通用工具-->
-		<dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
-		
+
 		<!-- 核心模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
             <version>${ruoyi.version}</version>
-        </dependency>
-		
-		<!-- 系统模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-system</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
-        
-        <!-- 定时任务-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-quartz</artifactId>
-            <version>${ruoyi.version}</version>
+
         </dependency>
         
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
-		
     </dependencies>
 
     <build>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index d89ca5c1a..95105f4fd 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -16,18 +16,19 @@
 	</description>
     
     <dependencies>
-	    
+
+        <!-- SpringBoot Web容器 -->
 	     <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        
-    	 <!-- SpringBoot 拦截器 -->
+
+        <!-- SpringBoot 拦截器 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
-		
+
 		<!--阿里数据库连接池 -->
 		<dependency>
             <groupId>com.alibaba</groupId>
@@ -47,14 +48,20 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
+        <!-- SpringBoot集成thymeleaf模板 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
 		<!--Shiro核心框架 -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
 			<version>${shiro.version}</version>
 		</dependency>
-		
+
 		<!-- Shiro使用Srping框架 -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
@@ -68,32 +75,40 @@
 			<artifactId>shiro-ehcache</artifactId>
 			<version>${shiro.version}</version>
 		</dependency>
-		
+
 		<!-- thymeleaf模板引擎和shiro框架的整合 -->
 		<dependency>
 			<groupId>com.github.theborakompanioni</groupId>
 			<artifactId>thymeleaf-extras-shiro</artifactId>
 			<version>${thymeleaf.extras.shiro.version}</version>
 		</dependency>
-		
+
 		<!-- 解析客户端操作系统、浏览器等 -->
 		<dependency>
 			<groupId>eu.bitwalker</groupId>
 			<artifactId>UserAgentUtils</artifactId>
 			<version>${bitwalker.version}</version>
 		</dependency>
-		
-		<dependency>
+
+        <!-- 系统模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
+        <!-- 定时任务-->
+        <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-quartz</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
+        <!-- 代码生成-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-system</artifactId>
+            <artifactId>ruoyi-generator</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
-		
+
     </dependencies>
     
 </project>
\ No newline at end of file
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 7c9b25f6d..7d4fe3f3b 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -20,27 +20,19 @@
     </properties>
 
     <dependencies>
-   
-        <!--Spring框架基本的核心工具-->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-		</dependency>
-		
-		<!--velocity代码生成使用模板 -->
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>${velocity.version}</version>
-		</dependency>
-		
-		<!-- 通用工具-->
+        <!--velocity代码生成使用模板 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>${velocity.version}</version>
+        </dependency>
+
+        <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
-		
     </dependencies>
 	
 </project>
\ No newline at end of file
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 24550cd94..f2a3b829d 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -16,13 +16,6 @@
 	</description>
 
     <dependencies>
-   
-        <!--Spring框架基本的核心工具-->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-		</dependency>
-		
 		<!-- 定时任务 -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -34,7 +27,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 0dc3e91b2..aa5236fc0 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -16,27 +16,12 @@
 	</description>
 	
     <dependencies>
-        
-        <!-- SpringBoot集成mybatis框架 -->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis.boot.version}</version>
-        </dependency>
-        
-        <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        
 		<!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
-        
     </dependencies>
 	
 </project>
\ No newline at end of file