diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 47bbce472..2649ad193 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 846c4bdd8..45cdacd1e 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-dependencies-parent - org.springframework.cloud - 2.1.5.RELEASE + pigx-cloud-dependencies-parent + com.pig4cloud + Greenwich.RELEASE @@ -16,7 +16,7 @@ pigx 公共版本控制 - 3.4.0 + 3.5.0 3.1.0 1.1.18 8.0.16 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 4f2585b62..51a1363e2 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 1be202094..d2817882e 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 45d080038..c62963931 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 3.4.0 + 3.5.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index a4e136b67..3c245278e 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 6466ce3f2..24295d4d2 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 0380248be..96171673e 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-log diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml index 6d4c8224f..85c441bdb 100755 --- a/pigx-common/pigx-common-minio/pom.xml +++ b/pigx-common/pigx-common-minio/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-minio diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 7a8b64062..8fbbb03e5 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 213c65540..ee3f0c57e 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 91ca9a6c9..a17c0c1dc 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index a52d751a1..60692dee6 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 313f9335a..4ccaf52ed 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.4.0 + 3.5.0 pigx-common-transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index fbbb12ef3..92eca4c38 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 0d7a119b2..bc27bccbf 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 1a51727b8..f98ef3fde 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-register @@ -28,15 +28,20 @@ - com.alibaba.nacos + com.pig4cloud nacos-config 1.1.3 - com.alibaba.nacos + com.pig4cloud nacos-naming 1.1.3 + + com.alibaba + fastjson + 1.2.58 + org.springframework.boot diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 9686b35e9..49ef0ee12 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.4.0 + 3.5.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index a65915308..1d7a862d4 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.4.0 + 3.5.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index b16fd43a1..ba965d90c 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index a50503344..836dd87a3 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-codegen diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index f9927e76e..e7d01509b 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 7570b5a54..b90123a92 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 4.0.0 diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index c6bae9291..5c27a19c2 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-monitor @@ -36,7 +36,7 @@ com.pig4cloud pigx-common-core - 3.4.0 + 3.5.0 org.springframework.boot diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index cc731a025..53d14b3e7 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-mp-platform diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index 892d4470c..6a1126d35 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-oa-platform diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 8699b8e89..823cf41cb 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-pay-platform diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index f0b7bbe58..34ee5f75e 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-sentinel-dashboard @@ -92,7 +92,6 @@ com.alibaba.csp sentinel-datasource-nacos - test diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.properties b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.properties index fc3d80529..bc6b8264b 100755 --- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.properties +++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.properties @@ -13,5 +13,5 @@ logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - % #auth settings auth.filter.exclude-urls=/,/auth/login,/auth/logout,/registry/machine auth.filter.exclude-url-suffixes=htm,html,js,css,map,ico,ttf,woff,png -auth.username=sentinel1 -auth.password=sentinel1 \ No newline at end of file +auth.username=sentinel +auth.password=sentinel \ No newline at end of file diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index 58d7a6ff5..44d0d9998 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -29,7 +29,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index 1f258e793..edce577e6 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.4.0 + 3.5.0 pigx-tx-manager diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 455918bfb..20bcf2785 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 pigx-visual diff --git a/pom.xml b/pom.xml index 412e34458..b048e6a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.4.0 + 3.5.0 ${project.artifactId} pom @@ -51,7 +51,7 @@ 1.8 1.8 2.1.6 - 4.6.8 + 4.6.10 0.0.9 2.9.2 1.9.6 @@ -141,7 +141,7 @@ import - org.springframework.cloud + com.pig4cloud pigx-common-bom ${project.version} pom @@ -240,27 +240,13 @@ - + aliyun aliyun http://maven.aliyun.com/nexus/content/groups/public - - - gitee.wang - gitee.wang - http://nexus.gitee.wang/repository/maven-releases/ - - - - gitee.wang - gitee.wang - http://nexus.gitee.wang/repository/maven-releases/ - - -