From c559f9b4ce1035f62f776a30da21492049bb1766 Mon Sep 17 00:00:00 2001
From: "he.xinyu" <he.xinyu@oe.21vianet.com>
Date: Tue, 9 Nov 2021 16:36:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(maven):=E6=96=B0=E5=A2=9E=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=90=8E=E8=87=AA=E5=8A=A8=E7=A7=BB=E5=8A=A8=E5=8C=85?=
 =?UTF-8?q?=E5=88=B0=E6=8C=87=E5=AE=9A=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                            | 59 ++++++++++++++++++++++++++++--
 ruoyi-api/pom.xml                  |  3 ++
 ruoyi-api/ruoyi-api-system/pom.xml |  4 ++
 ruoyi-auth/pom.xml                 |  4 ++
 ruoyi-common/pom.xml               | 10 +++++
 ruoyi-gateway/pom.xml              |  4 ++
 ruoyi-modules/pom.xml              |  3 ++
 ruoyi-modules/ruoyi-file/pom.xml   |  4 ++
 ruoyi-modules/ruoyi-gen/pom.xml    |  4 ++
 ruoyi-modules/ruoyi-job/pom.xml    |  4 ++
 ruoyi-modules/ruoyi-system/pom.xml |  4 ++
 ruoyi-visual/pom.xml               |  5 +++
 ruoyi-visual/ruoyi-monitor/pom.xml |  4 ++
 13 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4ecdd6c..c3bb3652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
+    <artifactId>${root.id}</artifactId>
     <version>3.2.0</version>
 
     <name>ruoyi</name>
@@ -13,6 +13,7 @@
     <description>若依微服务系统</description>
 
     <properties>
+        <root.id>ruoyi</root.id>
         <ruoyi.version>3.2.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -40,6 +41,10 @@
         <common-pool.version>2.10.0</common-pool.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+        <publish.root>${rootlocation}/docker-test/ruoyi</publish.root>
+        <!-- 将配置文件打包到指定目录 -->
+        <publish.dir>${publish.root}</publish.dir>
+        <jardir>${project.artifactId}</jardir>
     </properties>
 
     <!-- 依赖声明 -->
@@ -162,9 +167,9 @@
             </dependency>
 
             <!-- Collection 增强Java集合框架 -->
-            <dependency> 
-                <groupId>commons-collections</groupId> 
-                <artifactId>commons-collections</artifactId> 
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
 
@@ -273,7 +278,13 @@
         </dependency>
     </dependencies>
 
+
     <build>
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <targetPath></targetPath>-->
+<!--            </resource>-->
+<!--        </resources>-->
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -284,6 +295,46 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>register-root-location-var</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>rootlocation</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <!--拷贝私有配置-->
+                    <execution>
+                        <id>copy-private-config</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${publish.dir}/${jardir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}</directory>
+                                    <targetPath>${project.build.directory}/*.jar</targetPath>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index aa8ccde0..b4db8741 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -19,4 +19,7 @@
         ruoyi-api系统接口
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/api</publish.dir>
+    </properties>
 </project>
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 7b3a4649..85fe0d95 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -15,6 +15,10 @@
         ruoyi-api-system系统接口模块
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/api/system</publish.dir>
+    </properties>
+
     <dependencies>
 		
         <!-- RuoYi Common Core-->
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index f0459836..9e32c2d3 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -13,6 +13,10 @@
     <description>
         ruoyi-auth认证授权中心
     </description>
+
+    <properties>
+        <publish.dir>${publish.root}/auth</publish.dir>
+    </properties>
     
     <dependencies>
         
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 96ecdf98..0429558e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -25,4 +25,14 @@
 	    ruoyi-common通用模块
     </description>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 50bf4875..4ef87fc8 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -14,6 +14,10 @@
         ruoyi-gateway网关模块
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/gateway</publish.dir>
+    </properties>
+
     <dependencies>
 
         <!-- SpringCloud Gateway -->
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index abc49192..96a6633d 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -22,4 +22,7 @@
         ruoyi-modules业务模块
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/modules</publish.dir>
+    </properties>
 </project>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index e335dadb..370e1eb2 100644
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -15,6 +15,10 @@
         ruoyi-modules-file文件服务
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/modules/file</publish.dir>
+    </properties>
+
     <dependencies>
     	
     	<!-- SpringCloud Alibaba Nacos -->
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index 21d5b7e9..329a4b7f 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -15,6 +15,10 @@
         ruoyi-modules-gen代码生成
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/modules/gen</publish.dir>
+    </properties>
+
     <dependencies>
     	
     	<!-- SpringCloud Alibaba Nacos -->
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 9a831648..95c49fa9 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -15,6 +15,10 @@
         ruoyi-modules-job定时任务
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/modules/job</publish.dir>
+    </properties>
+
     <dependencies>
     	
     	<!-- SpringCloud Alibaba Nacos -->
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 6411fb32..003b10e1 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -14,6 +14,10 @@
     <description>
         ruoyi-modules-system系统模块
     </description>
+
+    <properties>
+        <publish.dir>${publish.root}/modules/system</publish.dir>
+    </properties>
 	
     <dependencies>
     	
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index ee76ddeb..d52a14dc 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -12,6 +12,11 @@
         <module>ruoyi-monitor</module>
     </modules>
 
+    <properties>
+        <publish.dir>${publish.root}/visual</publish.dir>
+    </properties>
+
+
     <artifactId>ruoyi-visual</artifactId>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index 63c57ea6..61fe7d26 100644
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -14,6 +14,10 @@
         ruoyi-visual-monitor监控中心
     </description>
 
+    <properties>
+        <publish.dir>${publish.root}/visual/monitor</publish.dir>
+    </properties>
+
     <dependencies>
         
         <!-- SpringBoot Admin -->

From 6131d608ede4a08a7bf7d318978e042dcef1143b Mon Sep 17 00:00:00 2001
From: "he.xinyu" <1355670147@qq.com>
Date: Tue, 9 Nov 2021 23:10:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(maven):=20=E5=AE=8C=E5=96=84maven=20in?=
 =?UTF-8?q?stall=E5=90=8E=E5=A4=8D=E5=88=B6jar=E5=8C=85=E5=88=B0docker/ruo?=
 =?UTF-8?q?yi=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E4=B8=94=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81mvn=20clean=E6=B8=85=E9=99=A4=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=9A=84jar=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        |  4 +++-
 pom.xml           | 47 +++++++++++++++++++++++++++++++++++------------
 ruoyi-api/pom.xml | 10 ++++++++++
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4916f7a2..02b099d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,6 @@ nbdist/
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml
+
+docker/**/jar/*.jar
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c3bb3652..d781f67d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ruoyi</groupId>
-    <artifactId>${root.id}</artifactId>
+    <artifactId>ruoyi</artifactId>
     <version>3.2.0</version>
 
     <name>ruoyi</name>
@@ -13,7 +13,6 @@
     <description>若依微服务系统</description>
 
     <properties>
-        <root.id>ruoyi</root.id>
         <ruoyi.version>3.2.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -41,7 +40,7 @@
         <common-pool.version>2.10.0</common-pool.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
-        <publish.root>${rootlocation}/docker-test/ruoyi</publish.root>
+        <publish.root>${rootlocation}/docker/ruoyi</publish.root>
         <!-- 将配置文件打包到指定目录 -->
         <publish.dir>${publish.root}</publish.dir>
         <jardir>${project.artifactId}</jardir>
@@ -280,11 +279,6 @@
 
 
     <build>
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <targetPath></targetPath>-->
-<!--            </resource>-->
-<!--        </resources>-->
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -301,6 +295,7 @@
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>3.2.0</version>
                 <executions>
+<!--                    mvn install 时根目录 rootlocation变量注入-->
                     <execution>
                         <id>register-root-location-var</id>
                         <phase>validate</phase>
@@ -308,6 +303,14 @@
                             <goal>rootlocation</goal>
                         </goals>
                     </execution>
+<!--                    mvn clean 时根目录 rootlocation变量注入-->
+                    <execution>
+                        <id>register-root-location-var-clean</id>
+                        <phase>pre-clean</phase>
+                        <goals>
+                            <goal>rootlocation</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -315,26 +318,46 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
-                    <!--拷贝私有配置-->
+                    <!--拷贝jar到docker目录下-->
                     <execution>
-                        <id>copy-private-config</id>
+                        <id>copy-jar</id>
                         <phase>package</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <outputDirectory>${publish.dir}/${jardir}</outputDirectory>
+                            <outputDirectory>${publish.dir}/jar</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${project.build.directory}</directory>
-                                    <targetPath>${project.build.directory}/*.jar</targetPath>
+                                    <includes>
+                                        <include>*.jar</include>
+                                    </includes>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+<!--                    清除生成到docker/ruoyi下的jar包-->
+                    <filesets>
+                        <fileset>
+                            <directory>${publish.dir}/jar</directory>
+                            <includes>
+                                <include>*.jar</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index b4db8741..5ca22def 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -22,4 +22,14 @@
     <properties>
         <publish.dir>${publish.root}/api</publish.dir>
     </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+        </plugins>
+    </build>
 </project>