diff --git a/pigx-auth/src/main/resources/application.yml b/pigx-auth/src/main/resources/application.yml
index 1e29aa216..ba232cd41 100644
--- a/pigx-auth/src/main/resources/application.yml
+++ b/pigx-auth/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
\ No newline at end of file
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
\ No newline at end of file
diff --git a/pigx-gateway/src/main/resources/application.yml b/pigx-gateway/src/main/resources/application.yml
index 8f560f3aa..184492e17 100644
--- a/pigx-gateway/src/main/resources/application.yml
+++ b/pigx-gateway/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
\ No newline at end of file
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
\ No newline at end of file
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index a8e0d4cae..562998458 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -33,6 +33,11 @@
pigx 通用用户权限管理系统业务处理模块
+
mysql
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
index 1ba79d58f..959c5409f 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
@@ -12,10 +12,8 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-bi-platform/src/main/resources/application.yml b/pigx-visual/pigx-bi-platform/src/main/resources/application.yml
index 27d537641..a81f90a14 100644
--- a/pigx-visual/pigx-bi-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-bi-platform/src/main/resources/application.yml
@@ -13,7 +13,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index 431046404..b60c29706 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -21,6 +21,11 @@
+
+ com.pig4cloud
+ pigx-common-seata
+ 4.3.0
+
com.alibaba.cloud
diff --git a/pigx-visual/pigx-codegen/src/main/resources/application.yml b/pigx-visual/pigx-codegen/src/main/resources/application.yml
index 4e030f035..67d2202f2 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/application.yml
+++ b/pigx-visual/pigx-codegen/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
index 6b1e93f0a..513b466f0 100644
--- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
+++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
\ No newline at end of file
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
\ No newline at end of file
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
index 95664b161..14ab80f36 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
+++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
@@ -15,7 +15,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
index 98050e988..10a58c711 100644
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
@@ -13,7 +13,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-monitor/src/main/resources/application.yml b/pigx-visual/pigx-monitor/src/main/resources/application.yml
index bdd8ae355..1f678a709 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/application.yml
+++ b/pigx-visual/pigx-monitor/src/main/resources/application.yml
@@ -12,8 +12,6 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
index 671c31fa6..b60c628fc 100644
--- a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
index 7838d6323..b78e4df42 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
index 72336d989..868829ec6 100644
--- a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
@@ -12,7 +12,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-report-platform/src/main/resources/application.yml b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
index a4f4bb2ff..dc1fa375f 100644
--- a/pigx-visual/pigx-report-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
@@ -10,7 +10,5 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
index 577d4eb4c..1e6e6edf2 100755
--- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
+++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
@@ -10,8 +10,6 @@ spring:
nacos:
discovery:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
- profiles:
- active: @profiles.active@
management:
endpoints:
diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/application.yml b/pigx-visual/pigx-tx-manager/src/main/resources/application.yml
index 0fc029f84..7ed346eac 100644
--- a/pigx-visual/pigx-tx-manager/src/main/resources/application.yml
+++ b/pigx-visual/pigx-tx-manager/src/main/resources/application.yml
@@ -13,9 +13,7 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
main:
allow-circular-references: true
\ No newline at end of file
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
index 4b5e69820..e60dd1eb1 100644
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
+++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
@@ -17,7 +17,5 @@ spring:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
config:
import:
- - optional:nacos:application-${spring.profiles.active}.yml
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
- profiles:
- active: @profiles.active@
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml