⬆️ 适配 spring cloud alibaba 2021.0.1.0 config.import 导入配置文件

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@

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 {
 

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@

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@

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@

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@
 

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@

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@

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:

pigx-visual/pigx-sentinel-dashboard/src/main/resources/bootstrap.yml

@@ -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@

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@

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@

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

pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml

@@ -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@

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@

pom.xml

@@ -35,7 +35,7 @@
 	<properties>
 		<spring-boot.version>2.6.4</spring-boot.version>
 		<spring-cloud.version>2021.0.1</spring-cloud.version>
-		<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+		<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -67,11 +67,6 @@
 	</properties>
 
 	<dependencies>
-		<!--bootstrap 启动器-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bootstrap</artifactId>
-		</dependency>
 		<!--配置文件处理器-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>