From 72d0fc82a9093cc2cbb5a56da72f6fa9d9e76cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E7=BB=AA=E5=A3=AE?= <2235602974@qq.com>
Date: Mon, 21 Mar 2022 21:40:23 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E9=80=82=E9=85=8D=20spring=20cl?=
 =?UTF-8?q?oud=20alibaba=202021.0.1.0=20=20config.import=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/{bootstrap.yml => application.yml}  |  2 +-
 .../pigx-upms-biz/src/main/resources/application.yml   | 10 +++++++---
 .../main/resources/{bootstrap.yml => application.yml}  |  7 ++++---
 .../main/resources/{bootstrap.yml => application.yml}  |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 6 files changed, 24 insertions(+), 16 deletions(-)
 rename pigx-register/src/main/resources/{bootstrap.yml => application.yml} (97%)
 mode change 100755 => 100644
 rename pigx-visual/pigx-bi-platform/src/main/resources/{bootstrap.yml => application.yml} (65%)
 rename pigx-visual/pigx-daemon-elastic-job/src/main/resources/{bootstrap.yml => application.yml} (57%)

diff --git a/pigx-register/src/main/resources/bootstrap.yml b/pigx-register/src/main/resources/application.yml
old mode 100755
new mode 100644
similarity index 97%
rename from pigx-register/src/main/resources/bootstrap.yml
rename to pigx-register/src/main/resources/application.yml
index 75fa88493..fc5b9998d
--- a/pigx-register/src/main/resources/bootstrap.yml
+++ b/pigx-register/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
 db:
   num: 1
   user: ${MYSQL_USER:root}
-  password: ${MYSQL_PWD:root}
+  password: ${MYSQL_PWD:123456}
   url:
     0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 
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 45d9e39ed..1ba79d58f 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
@@ -10,8 +10,12 @@ 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-bi-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-bi-platform/src/main/resources/application.yml
similarity index 65%
rename from pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-bi-platform/src/main/resources/application.yml
index 1975f75bd..27d537641 100644
--- a/pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-bi-platform/src/main/resources/application.yml
@@ -11,8 +11,9 @@ spring:
         service: @artifactId@
       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-elastic-job/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
similarity index 57%
rename from pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
rename to pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
index ab6b0c5b0..6b1e93f0a 100644
--- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-daemon-elastic-job/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-visual/pigx-mp-platform/src/main/resources/application.yml b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
index f26e3ca52..671c31fa6 100644
--- a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-mp-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-oa-platform/src/main/resources/application.yml b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
index e20bf773f..7838d6323 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-oa-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@