dev分支适用seata+sentinel

sckw-modules/sckw-example/src/main/resources/bootstrap-dev.yml

@@ -17,7 +17,12 @@ spring:
         namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
-
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
   data:
     # sentinel降级配置
     sentinel:
@@ -38,10 +43,11 @@ spring:
         flow:
           nacos:
             # 设置Nacos的连接地址、命名空间和Group ID
-            namespace:  sckw-service-platform-dev
-            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+#            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             # 设置Nacos中配置文件的命名规则
-            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            # data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-example-sentinel-flow-rules
             group-id: SENTINEL_GROUP
             data-type: json
@@ -50,8 +56,9 @@ spring:
         #熔断
         degrade:
           nacos:
-            namespace:  sckw-service-platform-dev
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             #data-id: ${spring.application.name}-sentinel-degrade-rules
             data-id: sckw-example-sentinel-degrade-rules
             group-id: SENTINEL_GROUP
@@ -78,17 +85,23 @@ seata:
     # 指定nacos作为注册中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      #group: SEATA_GROUP为默认分组
-      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      #group: SEATA_GROUP为默认分组
+#      group: ${spring.cloud.nacos.discovery.group}
   config:
     # 指定nacos作为配置中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   application-id: ${spring.application.name}
   #  当前不生效，使用驼峰
   enabled: true

sckw-modules/sckw-file/src/main/resources/bootstrap-dev.yml

@@ -17,7 +17,12 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
   data:
     # sentinel降级配置
     sentinel:
@@ -38,8 +43,9 @@ spring:
         flow:
           nacos:
             # 设置Nacos的连接地址、命名空间和Group ID
-            namespace:  sckw-service-platform-dev
-            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             # 设置Nacos中配置文件的命名规则
             #            data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-file-sentinel-flow-rules
@@ -50,8 +56,9 @@ spring:
         #熔断
         degrade:
           nacos:
-            namespace:  sckw-service-platform-dev
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             #data-id: ${spring.application.name}-sentinel-degrade-rules
             data-id: sckw-file-sentinel-degrade-rules
             group-id: SENTINEL_GROUP
@@ -80,17 +87,20 @@ seata:
     # 指定nacos作为注册中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
       #group: SEATA_GROUP为默认分组
-      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   config:
     # 指定nacos作为配置中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   application-id: ${spring.application.name}
   #  当前不生效，使用驼峰
   enabled: true

sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml

@@ -18,6 +18,13 @@ spring:
         # 共享配置
         group: sckw-service-platform
 
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
+
   data:
     # sentinel降级配置
     sentinel:
@@ -38,8 +45,10 @@ spring:
         flow:
           nacos:
             # 设置Nacos的连接地址、命名空间和Group ID
-            namespace:  sckw-service-platform-dev
-            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+#            namespace:  sckw-service-platform-dev
+#            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             # 设置Nacos中配置文件的命名规则
             #            data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-message-sentinel-flow-rules
@@ -50,8 +59,10 @@ spring:
         #熔断
         degrade:
           nacos:
-            namespace:  sckw-service-platform-dev
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#            namespace:  sckw-service-platform-dev
+#            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             #data-id: ${spring.application.name}-sentinel-degrade-rules
             data-id: sckw-message-sentinel-degrade-rules
             group-id: SENTINEL_GROUP
@@ -78,17 +89,20 @@ seata:
     # 指定nacos作为注册中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
       #group: SEATA_GROUP为默认分组
-      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   config:
     # 指定nacos作为配置中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   application-id: ${spring.application.name}
   #  当前不生效，使用驼峰
   enabled: true

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -18,6 +18,13 @@ spring:
         # 共享配置
         group: sckw-service-platform
 
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
+
   data:
     # sentinel降级配置
     sentinel:
@@ -38,8 +45,8 @@ spring:
         flow:
           nacos:
             # 设置Nacos的连接地址、命名空间和Group ID
-            namespace:  sckw-service-platform-dev
-            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             # 设置Nacos中配置文件的命名规则
             #            data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-system-sentinel-flow-rules
@@ -50,8 +57,8 @@ spring:
         #熔断
         degrade:
           nacos:
-            namespace:  sckw-service-platform-dev
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            server-addr: ${lfdc.nacos.server-addr}
+            namespace: ${lfdc.nacos.namespace}
             #data-id: ${spring.application.name}-sentinel-degrade-rules
             data-id: sckw-system-sentinel-degrade-rules
             group-id: SENTINEL_GROUP
@@ -61,7 +68,7 @@ spring:
       eager: true
   datasource:
     dynamic:
-      seata: false
+      seata: true
   main:
     allow-circular-references: true
 
@@ -77,17 +84,17 @@ seata:
     # 指定nacos作为注册中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
       #group: SEATA_GROUP为默认分组
-      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   config:
     # 指定nacos作为配置中心
     type: nacos
     nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
+      server-addr: ${lfdc.nacos.server-addr}
+      namespace: ${lfdc.nacos.namespace}
+      group: ${lfdc.nacos.group}
   application-id: ${spring.application.name}
   #  当前不生效，使用驼峰
   enabled: true