:recycle:优化POM依赖

pigx-auth/pom.xml

@@ -30,7 +30,6 @@
 	<artifactId>pigx-auth</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-auth</name>
 	<description>pigx 认证授权中心，基于 spring security oAuth2</description>
 
 	<dependencies>
@@ -101,28 +100,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-common/pigx-common-core/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common-core</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-core</name>
+
 	<description>pigx 公共工具类核心包</description>
 
 

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScope.java

@@ -18,6 +18,7 @@
 package com.pig4cloud.pigx.common.core.datascope;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +29,7 @@ import java.util.List;
  * 数据权限查询参数
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class DataScope extends HashMap {
 	/**
 	 * 限制范围的字段名称

pigx-common/pigx-common-job/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common-job</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-job</name>
+
 	<description>pigx 定时任务</description>
 
 	<dependencies>

pigx-common/pigx-common-log/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common-log</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-log</name>
+
 	<description>pigx 日志服务</description>
 
 

pigx-common/pigx-common-security/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common-security</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-security</name>
+
 	<description>pigx 安全工具类</description>
 
 

pigx-common/pigx-common-swagger/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common-swagger</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-swagger</name>
+
 	<description>pigx 接口文档</description>
 
 

pigx-common/pigx-common-transaction/pom.xml

@@ -10,7 +10,7 @@
 
 	<artifactId>pigx-common-transaction</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-common-transaction</name>
+
 	<description>pigx lcn transaction</description>
 
 	<dependencies>

pigx-common/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-common</artifactId>
 	<packaging>pom</packaging>
-	<name>pigx-common</name>
+
 	<description>pigx 公共聚合模块</description>
 
 	<modules>

pigx-config/pom.xml

@@ -30,7 +30,6 @@
 	<artifactId>pigx-config</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-config</name>
 	<description>pigx 配置中心，基于spring cloud config</description>
 
 	<dependencies>
@@ -64,28 +63,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-eureka/pom.xml

@@ -30,7 +30,6 @@
 	<artifactId>pigx-eureka</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-eureka</name>
 	<description>pigx 服务中心，基于eureka</description>
 
 	<dependencies>
@@ -73,28 +72,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-gateway/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-gateway</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-gateway</name>
+
 	<description>pigx 服务网关，基于 spring cloud gateway</description>
 
 	<dependencies>
@@ -77,28 +77,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-upms/pigx-upms-api/pom.xml

@@ -29,7 +29,7 @@
 
 	<artifactId>pigx-upms-api</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-upms-api</name>
+
 	<description>pigx 通用用户权限管理系统公共api模块</description>
 
 

pigx-upms/pigx-upms-biz/pom.xml

@@ -30,7 +30,6 @@
 	<artifactId>pigx-upms-biz</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-upms-biz</name>
 	<description>pigx 通用用户权限管理系统业务处理模块</description>
 
 	<dependencies>
@@ -67,12 +66,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-security</artifactId>
 		</dependency>
-		<!--监控客户端-->
-		<dependency>
-			<groupId>de.codecentric</groupId>
-			<artifactId>spring-boot-admin-starter-client</artifactId>
-			<version>${monitor.version}</version>
-		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
@@ -108,28 +101,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-upms/pom.xml

@@ -28,7 +28,7 @@
 	</parent>
 
 	<artifactId>pigx-upms</artifactId>
-	<name>pigx-upms</name>
+
 	<description>pigx 通用用户权限管理聚合模块</description>
 	<packaging>pom</packaging>
 

pigx-visual/pigx-codegen/pom.xml

@@ -11,7 +11,7 @@
 
 	<artifactId>pigx-codegen</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-codegen</name>
+
 	<description>代码生成模块</description>
 
 	<dependencies>
@@ -72,28 +72,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-daemon/pom.xml

@@ -28,7 +28,7 @@
 
 	<artifactId>pigx-daemon</artifactId>
 	<packaging>jar</packaging>
-	<name>pigx-daemon</name>
+
 	<description>后台跑批定时任务模块</description>
 
 	<dependencies>
@@ -94,28 +94,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-monitor/pom.xml

@@ -30,7 +30,6 @@
 	<artifactId>pigx-monitor</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-monitor</name>
 	<description>pigx 监控模块，基于 spring boot admin</description>
 
 	<dependencies>
@@ -69,28 +68,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.12</version>
-				<configuration>
-					<imageName>${registry.url}/${project.name}:0.0.1</imageName>
-					<dockerHost>${docker.url}</dockerHost>
-					<dockerDirectory>${project.basedir}</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-					<serverId>docker-hub</serverId>
-					<registryUrl>https://index.docker.io/v1/</registryUrl>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-tx-manager/pom.xml

@@ -11,7 +11,6 @@
 	<artifactId>pigx-tx-manager</artifactId>
 	<packaging>jar</packaging>
 
-	<name>pigx-tx-manager</name>
 	<description>pigx lcn tx manager</description>
 
 	<dependencies>
@@ -72,9 +71,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<finalName>${project.name}</finalName>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pom.xml

@@ -28,7 +28,6 @@
 	</parent>
 
 	<artifactId>pigx-visual</artifactId>
-	<name>pigx-visual</name>
 	<description>pigx 图形化功能模块</description>
 	<packaging>pom</packaging>
 

pom.xml

@@ -25,7 +25,7 @@
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pigx</artifactId>
 	<version>${pigx.version}</version>
-	<name>pigx</name>
+	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>
 
@@ -40,11 +40,12 @@
 		<pigx.version>1.6.1</pigx.version>
 		<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
 		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+		<spring-platform.version>Cairo-SR2</spring-platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<monitor.version>2.0.2</monitor.version>
-		<hutool.version>4.1.7</hutool.version>
+		<hutool.version>4.1.13</hutool.version>
 		<mbp.boot.version>2.3</mbp.boot.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.version>2.9.2</swagger.version>
@@ -61,11 +62,6 @@
 	</properties>
 
 	<dependencies>
-		<!--eureka 客户端-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
 		<!--配置文件处理器-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -105,7 +101,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<modules>
@@ -123,7 +118,7 @@
 			<dependency>
 				<groupId>io.spring.platform</groupId>
 				<artifactId>platform-bom</artifactId>
-				<version>Cairo-SR2</version>
+				<version>${spring-platform.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -144,6 +139,9 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<version>${spring-boot.version}</version>
+					<configuration>
+						<finalName>${project.build.finalName}</finalName>
+					</configuration>
 					<executions>
 						<execution>
 							<goals>
@@ -153,16 +151,35 @@
 					</executions>
 				</plugin>
 				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
+					<groupId>com.spotify</groupId>
+					<artifactId>docker-maven-plugin</artifactId>
+					<version>0.4.12</version>
 					<configuration>
-						<target>${java.version}</target>
-						<source>${java.version}</source>
-						<encoding>UTF-8</encoding>
+						<imageName>${registry.url}/${project.name}:0.0.1</imageName>
+						<dockerHost>${docker.url}</dockerHost>
+						<dockerDirectory>${project.basedir}</dockerDirectory>
+						<resources>
+							<resource>
+								<targetPath>/</targetPath>
+								<directory>${project.build.directory}</directory>
+								<include>${project.build.finalName}.jar</include>
+							</resource>
+						</resources>
+						<serverId>docker-hub</serverId>
+						<registryUrl>https://index.docker.io/v1/</registryUrl>
 					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<target>${java.version}</target>
+					<source>${java.version}</source>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
@@ -170,17 +187,17 @@
 		</plugins>
 	</build>
 
-	<!-- 使用aliyun镜像 -->
 	<repositories>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone</url>
-		</repository>
+		<!--使用阿里云镜像-->
 		<repository>
 			<id>aliyun</id>
 			<name>aliyun</name>
 			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
 		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone</url>
+		</repository>
 	</repositories>
 </project>