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] =?UTF-8?q?feat(maven):=20=E5=AE=8C=E5=96=84maven=20instal?=
 =?UTF-8?q?l=E5=90=8E=E5=A4=8D=E5=88=B6jar=E5=8C=85=E5=88=B0docker/ruoyi?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E4=B8=94=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?mvn=20clean=E6=B8=85=E9=99=A4=E5=A4=8D=E5=88=B6=E7=9A=84jar?=
 =?UTF-8?q?=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>