From 976450917c6b525c8fae427b896c7ce7572c02ed Mon Sep 17 00:00:00 2001 From: lishangbu Date: Mon, 17 Sep 2018 13:35:31 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=E4=BC=98=E5=8C=96POM=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-auth/pom.xml | 19 ------- pigx-common/pigx-common-core/pom.xml | 2 +- .../pigx/common/core/datascope/DataScope.java | 2 + pigx-common/pigx-common-job/pom.xml | 2 +- pigx-common/pigx-common-log/pom.xml | 2 +- pigx-common/pigx-common-security/pom.xml | 2 +- pigx-common/pigx-common-swagger/pom.xml | 2 +- pigx-common/pigx-common-transaction/pom.xml | 2 +- pigx-common/pom.xml | 2 +- pigx-config/pom.xml | 19 ------- pigx-eureka/pom.xml | 19 ------- pigx-gateway/pom.xml | 20 +------ pigx-upms/pigx-upms-api/pom.xml | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 25 --------- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-codegen/pom.xml | 20 +------ pigx-visual/pigx-daemon/pom.xml | 20 +------ pigx-visual/pigx-monitor/pom.xml | 19 ------- pigx-visual/pigx-tx-manager/pom.xml | 4 -- pigx-visual/pom.xml | 1 - pom.xml | 55 ++++++++++++------- 21 files changed, 50 insertions(+), 191 deletions(-) diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index f56777e51..84db1e3dd 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -30,7 +30,6 @@ pigx-auth jar - pigx-auth pigx 认证授权中心，基于 spring security oAuth2 @@ -101,28 +100,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index a74dc9f6d..d95b0daec 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -29,7 +29,7 @@ pigx-common-core jar - pigx-common-core + pigx 公共工具类核心包 diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScope.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScope.java index 758fb6a66..f5a5461a6 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScope.java +++ b/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 { /** * 限制范围的字段名称 diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 5b8c1c582..f9650cb69 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -29,7 +29,7 @@ pigx-common-job jar - pigx-common-job + pigx 定时任务 diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 152a9cdee..eca18bad8 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -29,7 +29,7 @@ pigx-common-log jar - pigx-common-log + pigx 日志服务 diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 5d60b469a..89154956b 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -29,7 +29,7 @@ pigx-common-security jar - pigx-common-security + pigx 安全工具类 diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 968243246..597c7bb98 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -29,7 +29,7 @@ pigx-common-swagger jar - pigx-common-swagger + pigx 接口文档 diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 4c8b915d1..9062d1adb 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -10,7 +10,7 @@ pigx-common-transaction jar - pigx-common-transaction + pigx lcn transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 3712e08ba..99bc4a584 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -29,7 +29,7 @@ pigx-common pom - pigx-common + pigx 公共聚合模块 diff --git a/pigx-config/pom.xml b/pigx-config/pom.xml index 9c0fd73ea..c40548009 100644 --- a/pigx-config/pom.xml +++ b/pigx-config/pom.xml @@ -30,7 +30,6 @@ pigx-config jar - pigx-config pigx 配置中心，基于spring cloud config @@ -64,28 +63,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-eureka/pom.xml b/pigx-eureka/pom.xml index 468bce4aa..f4253b057 100644 --- a/pigx-eureka/pom.xml +++ b/pigx-eureka/pom.xml @@ -30,7 +30,6 @@ pigx-eureka jar - pigx-eureka pigx 服务中心，基于eureka @@ -73,28 +72,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 7e14aa5cf..1e518691f 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -29,7 +29,7 @@ pigx-gateway jar - pigx-gateway + pigx 服务网关，基于 spring cloud gateway @@ -77,28 +77,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index a12866ec3..1e421ba1d 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -29,7 +29,7 @@ pigx-upms-api jar - pigx-upms-api + pigx 通用用户权限管理系统公共api模块 diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 1ca23796c..939ffbf1e 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -30,7 +30,6 @@ pigx-upms-biz jar - pigx-upms-biz pigx 通用用户权限管理系统业务处理模块 @@ -67,12 +66,6 @@ org.springframework.cloud spring-cloud-starter-security - - - de.codecentric - spring-boot-admin-starter-client - ${monitor.version} - com.baomidou @@ -108,28 +101,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 7543b5d67..3767fb208 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -28,7 +28,7 @@ pigx-upms - pigx-upms + pigx 通用用户权限管理聚合模块 pom diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index b1563f6c4..32a13d2de 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -11,7 +11,7 @@ pigx-codegen jar - pigx-codegen + 代码生成模块 @@ -72,28 +72,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml index 15402729b..04b1a8872 100644 --- a/pigx-visual/pigx-daemon/pom.xml +++ b/pigx-visual/pigx-daemon/pom.xml @@ -28,7 +28,7 @@ pigx-daemon jar - pigx-daemon + 后台跑批定时任务模块 @@ -94,28 +94,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 07d40ba9f..b1359ca98 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -30,7 +30,6 @@ pigx-monitor jar - pigx-monitor pigx 监控模块，基于 spring boot admin @@ -69,28 +68,10 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - com.spotify docker-maven-plugin - 0.4.12 - - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ - diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index af43cea3b..fa2557769 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -11,7 +11,6 @@ pigx-tx-manager jar - pigx-tx-manager pigx lcn tx manager @@ -72,9 +71,6 @@ org.springframework.boot spring-boot-maven-plugin - - ${project.name} - diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 79d365b11..3c86f6da5 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -28,7 +28,6 @@ pigx-visual - pigx-visual pigx 图形化功能模块 pom diff --git a/pom.xml b/pom.xml index d541a868c..7df61152f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.pig4cloud pigx ${pigx.version} - pigx + ${project.artifactId} pom https://www.pig4cloud.com @@ -40,11 +40,12 @@ 1.6.1 2.0.4.RELEASE Finchley.SR1 + Cairo-SR2 UTF-8 1.8 1.8 2.0.2 - 4.1.7 + 4.1.13 2.3 0.0.9 2.9.2 @@ -61,11 +62,6 @@ - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - org.springframework.boot @@ -105,7 +101,6 @@ spring-boot-starter-test test - @@ -123,7 +118,7 @@ io.spring.platform platform-bom - Cairo-SR2 + ${spring-platform.version} pom import @@ -144,6 +139,9 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} + + ${project.build.finalName} + @@ -153,16 +151,35 @@ - maven-compiler-plugin + com.spotify + docker-maven-plugin + 0.4.12 - ${java.version} - ${java.version} - UTF-8 + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + maven-compiler-plugin + + ${java.version} + ${java.version} + UTF-8 + + pl.project13.maven git-commit-id-plugin @@ -170,17 +187,17 @@ - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone - + aliyun aliyun http://maven.aliyun.com/nexus/content/groups/public/ + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone +