From 3642f607c13d98951cc38f25d3b39bd5900ab8b2 Mon Sep 17 00:00:00 2001
From: cs <673849330@qq,com>
Date: Wed, 24 Nov 2021 13:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 133 -----------------
 .../service-wechat-applet-biz/pom.xml         | 141 +++++++++++++++++-
 2 files changed, 134 insertions(+), 140 deletions(-)

diff --git a/pom.xml b/pom.xml
index d539937..c93c434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,6 @@
         <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
         <hutool.version>5.7.4</hutool.version>
         <velocity-engine-core.version>2.3</velocity-engine-core.version>
-        <dockerfile-maven-version>1.4.0</dockerfile-maven-version>
-        <docker.host>192.168.0.181:2375</docker.host>
-        <docker.image.prefix>hncy</docker.image.prefix>
-        <docker.registry.url>192.168.2.99:5000</docker.registry.url>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
     <dependencies>
@@ -129,133 +125,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <addResources>true</addResources>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${dockerfile-maven-version}</version>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry.url}/${docker.image.prefix}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
-                    <dockerDirectory>${project.basedir}</dockerDirectory>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                    <dockerHost>http://${docker.host}</dockerHost>
-                    <registryUrl>${docker.registry.url}</registryUrl>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                    <layers>
-                        <enabled>true</enabled>
-                    </layers>
-                    <image>
-                        <name>cdhncy.com/arxj/${project.parent.artifactId}:${project.version}</name>
-                    </image>
-                </configuration>
-                <!--剔除pom-->
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>hncy-release</id>
-            <name>Release Repository</name>
-            <url>http://192.168.2.99:8081/repository/maven-releases/</url>
-        </repository>
-
-        <snapshotRepository>
-            <uniqueVersion>true</uniqueVersion>
-            <id>hncy-snapshot</id>
-            <name>Snapshot Repository</name>
-            <url>http://192.168.2.99:8081/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>hncy-repo</id>
-            <name>hncy repo</name>
-            <url>http://192.168.2.99:8081/repository/maven-public/</url>
-        </repository>
-
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <properties>
-                <spring.profiles.active>docker</spring.profiles.active>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/pom.xml b/service-biz/service-wechat-applet/service-wechat-applet-biz/pom.xml
index 5c45e32..b785c28 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/pom.xml
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/pom.xml
@@ -15,8 +15,15 @@
 
   <name>service-wechat-applet-biz</name>
 
-  <dependencies>
+  <properties>
+    <dockerfile-maven-version>1.4.0</dockerfile-maven-version>
+    <docker.host>192.168.0.181:2375</docker.host>
+    <docker.image.prefix>hncy</docker.image.prefix>
+    <docker.registry.url>192.168.2.99:5000</docker.registry.url>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>
 
+  <dependencies>
     <dependency>
       <groupId>com.hncy</groupId>
       <artifactId>hncy-lock-spring-boot-starter</artifactId>
@@ -105,21 +112,141 @@
       <artifactId>fastdfs-client</artifactId>
       <version>1.26.5</version>
     </dependency>
-      <dependency>
-          <groupId>com.hncy</groupId>
-          <artifactId>hncy-pageable-spring-boot-starter</artifactId>
-          <version>1.0</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+        <groupId>com.hncy</groupId>
+        <artifactId>hncy-pageable-spring-boot-starter</artifactId>
+        <version>1.0</version>
+        <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <addResources>true</addResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>dockerfile-maven-plugin</artifactId>
+        <version>${dockerfile-maven-version}</version>
+        <executions>
+          <execution>
+            <id>default</id>
+            <goals>
+              <goal>build</goal>
+              <goal>push</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <repository>${docker.registry.url}/${docker.image.prefix}/${project.artifactId}</repository>
+          <tag>${project.version}</tag>
+          <buildArgs>
+            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+          </buildArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>1.1.1</version>
+        <configuration>
+          <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
+          <dockerDirectory>${project.basedir}</dockerDirectory>
+          <buildArgs>
+            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+          </buildArgs>
+          <resources>
+            <resource>
+              <targetPath>/</targetPath>
+              <directory>${project.build.directory}</directory>
+              <include>${project.build.finalName}.jar</include>
+            </resource>
+          </resources>
+          <dockerHost>http://${docker.host}</dockerHost>
+          <registryUrl>${docker.registry.url}</registryUrl>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring-boot.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+            </exclude>
+          </excludes>
+          <layers>
+            <enabled>true</enabled>
+          </layers>
+          <image>
+            <name>cdhncy.com/arxj/${project.parent.artifactId}:${project.version}</name>
+          </image>
+        </configuration>
+        <!--剔除pom-->
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
 
+  <distributionManagement>
+    <repository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>hncy-release</id>
+      <name>Release Repository</name>
+      <url>http://192.168.2.99:8081/repository/maven-releases/</url>
+    </repository>
+
+    <snapshotRepository>
+      <uniqueVersion>true</uniqueVersion>
+      <id>hncy-snapshot</id>
+      <name>Snapshot Repository</name>
+      <url>http://192.168.2.99:8081/repository/maven-snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <repositories>
+    <repository>
+      <id>hncy-repo</id>
+      <name>hncy repo</name>
+      <url>http://192.168.2.99:8081/repository/maven-public/</url>
+    </repository>
+
+    <repository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <properties>
+        <spring.profiles.active>docker</spring.profiles.active>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>
-- 
GitLab