diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/application.yml
similarity index 57%
rename from pigx-auth/src/main/resources/bootstrap.yml
rename to pigx-auth/src/main/resources/application.yml
index f2c880673..1e29aa216 100644
--- a/pigx-auth/src/main/resources/bootstrap.yml
+++ b/pigx-auth/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ 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
diff --git a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/config/PigxXssProperties.java b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/config/PigxXssProperties.java
index bd8db354f..c8d97fa61 100644
--- a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/config/PigxXssProperties.java
+++ b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/config/PigxXssProperties.java
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.common.xss.config;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +30,6 @@ import java.util.List;
*/
@Getter
@Setter
-@RefreshScope
@ConfigurationProperties(PigxXssProperties.PREFIX)
public class PigxXssProperties {
diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/application.yml
similarity index 57%
rename from pigx-gateway/src/main/resources/bootstrap.yml
rename to pigx-gateway/src/main/resources/application.yml
index afd6b6fa2..8f560f3aa 100644
--- a/pigx-gateway/src/main/resources/bootstrap.yml
+++ b/pigx-gateway/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
- active: @profiles.active@
+ active: @profiles.active@
\ No newline at end of file
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
similarity index 100%
rename from pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
rename to pigx-upms/pigx-upms-biz/src/main/resources/application.yml
diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/application.yml
similarity index 63%
rename from pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-codegen/src/main/resources/application.yml
index ee9135cb6..4e030f035 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-codegen/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
similarity index 65%
rename from pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
index 66c493c5f..95664b161 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
@@ -13,8 +13,9 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/application.yml
similarity index 63%
rename from pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-monitor/src/main/resources/application.yml
index 2641bc8fe..bdd8ae355 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-monitor/src/main/resources/application.yml
@@ -10,9 +10,10 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
similarity index 100%
rename from pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-mp-platform/src/main/resources/application.yml
diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
similarity index 100%
rename from pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-oa-platform/src/main/resources/application.yml
diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
similarity index 63%
rename from pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-pay-platform/src/main/resources/application.yml
index 189fc64ea..72336d989 100644
--- a/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
diff --git a/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
similarity index 55%
rename from pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-report-platform/src/main/resources/application.yml
index c5044af08..a4f4bb2ff 100644
--- a/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
@@ -8,8 +8,9 @@ spring:
nacos:
config:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
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 8cea8bd13..577d4eb4c 100755
--- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
+++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
@@ -3,6 +3,15 @@ server:
servlet:
encoding:
force: true
+spring:
+ application:
+ name: @artifactId@
+ cloud:
+ nacos:
+ discovery:
+ server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
+ profiles:
+ active: @profiles.active@
management:
endpoints:
diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/bootstrap.yml
deleted file mode 100644
index 0e47b57b1..000000000
--- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-server:
- port: 5020
- servlet:
- encoding:
- force: true
-
-spring:
- application:
- name: @artifactId@
- cloud:
- nacos:
- discovery:
- server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
- profiles:
- active: @profiles.active@
\ No newline at end of file
diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/application.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/application.yml
new file mode 100644
index 000000000..b4f29dceb
--- /dev/null
+++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/application.yml
@@ -0,0 +1,20 @@
+server:
+ port: 4040
+ servlet:
+ context-path: /sso1
+
+security:
+ oauth2:
+ client:
+ client-id: pig
+ client-secret: pig
+ user-authorization-uri: http://localhost:3000/oauth/authorize
+ access-token-uri: http://localhost:3000/oauth/token
+ scope: server
+ resource:
+ loadBalanced: true
+ token-info-uri: http://localhost:3000/oauth/check_token
+
+spring:
+ application:
+ name: @artifactId@
diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
index b4f29dceb..528471596 100644
--- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
@@ -1,20 +1,20 @@
-server:
- port: 4040
- servlet:
- context-path: /sso1
-
-security:
- oauth2:
- client:
- client-id: pig
- client-secret: pig
- user-authorization-uri: http://localhost:3000/oauth/authorize
- access-token-uri: http://localhost:3000/oauth/token
- scope: server
- resource:
- loadBalanced: true
- token-info-uri: http://localhost:3000/oauth/check_token
-
-spring:
- application:
- name: @artifactId@
+#server:
+# port: 4040
+# servlet:
+# context-path: /sso1
+#
+#security:
+# oauth2:
+# client:
+# client-id: pig
+# client-secret: pig
+# user-authorization-uri: http://localhost:3000/oauth/authorize
+# access-token-uri: http://localhost:3000/oauth/token
+# scope: server
+# resource:
+# loadBalanced: true
+# token-info-uri: http://localhost:3000/oauth/check_token
+#
+#spring:
+# application:
+# name: @artifactId@
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 ac4fd1924..0fc029f84 100644
--- a/pigx-visual/pigx-tx-manager/src/main/resources/application.yml
+++ b/pigx-visual/pigx-tx-manager/src/main/resources/application.yml
@@ -1,3 +1,21 @@
+
+server:
+ port: 5004
+
spring:
+ application:
+ name: @artifactId@
+ cloud:
+ nacos:
+ discovery:
+ server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
+ config:
+ 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@
main:
- allow-circular-references: true
+ allow-circular-references: true
\ No newline at end of file
diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
deleted file mode 100644
index 4b3889708..000000000
--- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-server:
- port: 5004
-
-spring:
- application:
- name: @artifactId@
- cloud:
- nacos:
- discovery:
- server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
- config:
- server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- profiles:
- active: @profiles.active@
\ No newline at end of file
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
similarity index 75%
rename from pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
index 8b5b407e8..4b5e69820 100644
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
@@ -15,8 +15,9 @@ spring:
management.context-path: ${server.servlet.context-path}/actuator
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
- file-extension: yml
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ config:
+ import:
+ - optional:nacos:application-${spring.profiles.active}.yml
+ - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
profiles:
active: @profiles.active@
diff --git a/pom.xml b/pom.xml
index a395745f6..c21c20db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
2.6.4
2021.0.1
- 2021.1
+ 2021.0.1.0
UTF-8
1.8
1.8
@@ -67,11 +67,6 @@
-
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.boot