Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-app/xx-app-server/pom.xml

@@ -8,13 +8,8 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-app-server</artifactId>
-
-    <properties>
-        <mapper.version>3.4.0</mapper.version>
-    </properties>
-
     <dependencies>
         <!-- 自己项目 -->
         <dependency>
@@ -26,7 +21,6 @@
     </dependencies>
 
     <build>
-        <finalName>app-server</finalName>
         <plugins>
             <!-- 此插件用来生成通用mapper的代码 -->
             <plugin>
@@ -66,30 +60,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <!--<plugin>-->
-            <!--<groupId>com.spotify</groupId>-->
-            <!--<artifactId>docker-maven-plugin</artifactId>-->
-            <!--<version>${docker.plugin.version}</version>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<phase>package</phase>-->
-            <!--<goals>-->
-            <!--<goal>build</goal>-->
-            <!--</goals>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--<configuration>-->
-            <!--<imageName>${docker.image.prefix}/${project.build.finalName}</imageName>-->
-            <!--<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>-->
-            <!--<resources>-->
-            <!--<resource>-->
-            <!--<targetPath>/</targetPath>-->
-            <!--<directory>${project.build.directory}</directory>-->
-            <!--<include>${project.build.finalName}.jar</include>-->
-            <!--</resource>-->
-            <!--</resources>-->
-            <!--</configuration>-->
-            <!--</plugin>-->
         </plugins>
     </build>