全面升级适配 SpringCloudAlibaba 2021.0.1.0 配置方式大更改

nacos client 降级 2.0.2 高于此版本会有问题 不影响nacos服务端版本
nacos 配置文件 application.yml 重命名为 application-common.yml 解决命名冲突问题

pom.xml

@@ -265,11 +265,7 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <!-- bootstrap 启动器 -->
+
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

ruoyi-auth/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
     name: ruoyi-auth
@@ -28,9 +25,7 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:${spring.application.name}.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -14,14 +14,14 @@
     </description>
 
     <properties>
-        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <sentinel.version>1.8.3</sentinel.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
-        <nacos.client.version>2.0.4</nacos.client.version>
+        <nacos.client.version>2.0.2</nacos.client.version>
         <seata.version>1.4.2</seata.version>
         <dubbo.version>3.0.7</dubbo.version>
         <spring.context.support.version>1.0.11</spring.context.support.version>

ruoyi-common/ruoyi-common-dubbo/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>

ruoyi-common/ruoyi-common-job/pom.xml

@@ -16,6 +16,12 @@
     </description>
 
 	<dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
         <!-- xxl-job-core -->
         <dependency>
             <groupId>com.xuxueli</groupId>
@@ -27,5 +33,6 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+
     </dependencies>
 </project>

ruoyi-gateway/src/main/resources/application.yml

@@ -6,9 +6,6 @@ server:
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
     name: ruoyi-gateway
@@ -30,9 +27,7 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:${spring.application.name}.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-modules/ruoyi-gen/src/main/resources/application.yml

@@ -1,15 +1,12 @@
 # Tomcat
 server:
-  port: 18000
+  port: 9202
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
-    name: ruoyi-doc
+    name: ruoyi-gen
   profiles:
     # 环境配置
     active: @profiles.active@
@@ -28,9 +25,8 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:datasource.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
+      - optional:nacos:${spring.application.name}.yml
-            refresh: true

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9202
-
-# Spring
-spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
-  application:
-    # 应用名称
-    name: ruoyi-gen
-  profiles:
-    # 环境配置
-    active: @profiles.active@
-
---- # nacos 配置
-spring:
-  cloud:
-    nacos:
-      # nacos 服务地址
-      server-addr: @nacos.server@
-      discovery:
-        # 注册组
-        group: @nacos.discovery.group@
-        namespace: ${spring.profiles.active}
-      config:
-        # 配置组
-        group: @nacos.config.group@
-        namespace: ${spring.profiles.active}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-modules/ruoyi-job/src/main/resources/application.yml

@@ -0,0 +1,32 @@
+# Tomcat
+server:
+  port: 9203
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-job
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+  config:
+    import:
+      - optional:nacos:application-common.yml
+      - optional:nacos:datasource.yml
+      - optional:nacos:${spring.application.name}.yml

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9203
-
-# Spring
-spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
-  application:
-    # 应用名称
-    name: ruoyi-job
-  profiles:
-    # 环境配置
-    active: @profiles.active@
-
---- # nacos 配置
-spring:
-  cloud:
-    nacos:
-      # nacos 服务地址
-      server-addr: @nacos.server@
-      discovery:
-        # 注册组
-        group: @nacos.discovery.group@
-        namespace: ${spring.profiles.active}
-      config:
-        # 配置组
-        group: @nacos.config.group@
-        namespace: ${spring.profiles.active}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-modules/ruoyi-resource/src/main/resources/application.yml

@@ -0,0 +1,32 @@
+# Tomcat
+server:
+  port: 9300
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-resource
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+  config:
+    import:
+      - optional:nacos:application-common.yml
+      - optional:nacos:datasource.yml
+      - optional:nacos:${spring.application.name}.yml

ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml

@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
-  application:
-    # 应用名称
-    name: ruoyi-resource
-  profiles:
-    # 环境配置
-    active: @profiles.active@
-
---- # nacos 配置
-spring:
-  cloud:
-    nacos:
-      # nacos 服务地址
-      server-addr: @nacos.server@
-      discovery:
-        # 注册组
-        group: @nacos.discovery.group@
-        namespace: ${spring.profiles.active}
-      config:
-        # 配置组
-        group: @nacos.config.group@
-        namespace: ${spring.profiles.active}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-modules/ruoyi-system/src/main/resources/application.yml

@@ -0,0 +1,32 @@
+# Tomcat
+server:
+  port: 9201
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-system
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+  config:
+    import:
+      - optional:nacos:application-common.yml
+      - optional:nacos:datasource.yml
+      - optional:nacos:${spring.application.name}.yml

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -1,38 +0,0 @@
-# Tomcat
-server:
-  port: 9201
-
-# Spring
-spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
-  application:
-    # 应用名称
-    name: ruoyi-system
-  profiles:
-    # 环境配置
-    active: @profiles.active@
-
---- # nacos 配置
-spring:
-  cloud:
-    nacos:
-      # nacos 服务地址
-      server-addr: @nacos.server@
-      discovery:
-        # 注册组
-        group: @nacos.discovery.group@
-        namespace: ${spring.profiles.active}
-      config:
-        # 配置组
-        group: @nacos.config.group@
-        namespace: ${spring.profiles.active}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-visual/ruoyi-doc/src/main/resources/application.yml

@@ -1,4 +1,36 @@
-# knife4j聚合配置
+# Tomcat
+server:
+  port: 18000
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-doc
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+  config:
+    import:
+      - optional:nacos:application-common.yml
+      - optional:nacos:${spring.application.name}.yml
+
+--- # knife4j聚合配置
 knife4j:
   enableAggregation: true
   # cloud模式

ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
     name: ruoyi-monitor
@@ -28,9 +25,7 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:${spring.application.name}.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
     name: ruoyi-sentinel-dashboard
@@ -32,11 +29,8 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:datasource.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
+      - optional:nacos:${spring.application.name}.yml
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    # 此配置禁止放入 nacos 优先级不够
-    allow-circular-references: true
   application:
     # 应用名称
     name: ruoyi-xxl-job-admin
@@ -42,11 +39,8 @@ spring:
         # 配置组
         group: @nacos.config.group@
         namespace: ${spring.profiles.active}
-        # 配置文件格式
+  config:
-        file-extension: yml
+    import:
-        # 共享配置
+      - optional:nacos:application-common.yml
-        shared-configs:
+      - optional:nacos:datasource.yml
-          - data-id: application.${spring.cloud.nacos.config.file-extension}
+      - optional:nacos:${spring.application.name}.yml
-            refresh: true
-          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
-            refresh: true

sql/ry-config.sql

@@ -32,7 +32,7 @@ CREATE TABLE `config_info` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
 
 insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values
-(1, 'application.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:18:55', '2022-01-09 15:18:55', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '通用配置基础配置', NULL, NULL, 'yaml', NULL),
+(1, 'application-common.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:18:55', '2022-01-09 15:18:55', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '通用配置基础配置', NULL, NULL, 'yaml', NULL),
 (2, 'datasource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:07', '2022-01-09 15:19:07', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '数据源配置', NULL, NULL, 'yaml', NULL),
 (3, 'ruoyi-gateway.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:43', '2022-01-09 15:22:42', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '网关模块', NULL, NULL, 'yaml', NULL),
 (4, 'ruoyi-auth.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:43', '2022-01-09 15:22:29', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '认证中心', NULL, NULL, 'yaml', NULL),
@@ -46,7 +46,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod
 (12, 'seata-server.properties', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'seata配置文件', NULL, NULL, 'properties', NULL),
 (13, 'ruoyi-sentinel-dashboard.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'sentinel控制台配置文件', NULL, NULL, 'yaml', NULL),
 
-(101, 'application.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '通用配置基础配置', NULL, NULL, 'yaml', NULL),
+(101, 'application-common.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '通用配置基础配置', NULL, NULL, 'yaml', NULL),
 (102, 'datasource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '数据源配置', NULL, NULL, 'yaml', NULL),
 (103, 'ruoyi-gateway.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '网关模块', NULL, NULL, 'yaml', NULL),
 (104, 'ruoyi-auth.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '认证中心', NULL, NULL, 'yaml', NULL),