فهرست منبع

1、nacos提取公共配置文件
2、调整本地配置文件

zk 2 سال پیش
والد
کامیت
62696531ce

+ 3 - 0
README.md

@@ -102,3 +102,6 @@ sckw-service-platform
 │       └── sckw-common-sentinel                // 分布式限流熔断
 │       └── sckw-common-sentinel                // 分布式限流熔断
 │       └── sckw-common-seata                   // 分布式事务
 │       └── sckw-common-seata                   // 分布式事务
 ~~~
 ~~~
+
+## 运行配置
+Run/Debug Configurations->Modify options->Add VM options->--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED

+ 5 - 63
sckw-auth/src/main/resources/bootstrap-dev.yml

@@ -17,66 +17,8 @@ spring:
         namespace: sckw_zk
         namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-
-  #redis
-  redis:
-    #redis机器ip
-    host: 10.10.10.230
-    #redis端口
-    port: 6379
-    #redis密码
-    password: test
-    #数据库
-    database: 1
-    #redis超时时间(毫秒),如果不设置,取默认值2000
-    timeout: 10000
-    #最大空闲数
-    maxIdle: 300
-    #连接池的最大数据库连接数。设为0表示无限制,如果是jedis 2.4以后用redis.maxTotal
-    #maxActive=600
-    #控制一个pool可分配多少个jedis实例,用来替换上面的redis.maxActive,如果是jedis 2.4以后用该属性
-    maxTotal: 1000
-    #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-    maxWaitMillis: 1000
-    #连接的最小空闲时间 默认1800000毫秒(30分钟)
-    minEvictableIdleTimeMillis: 300000
-    #每次释放连接的最大数目,默认3
-    numTestsPerEvictionRun: 1024
-    #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
-    timeBetweenEvictionRunsMillis: 30000
-    #是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个
-    testOnBorrow: true
-    #在空闲时检查有效性, 默认false
-    testWhileIdle: true
-    #连接池最大连接数(如果配置<=0,则没有限制)
-    jedis:
-      pool:
-        max-active: -1
-
-  data:
-    redis:
-      host: 10.10.10.230
-      password: test
-      port: 6379
-      database: 13
-      timeout: 10000
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: auth-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 0 - 6
sckw-auth/src/main/resources/bootstrap.yml

@@ -12,9 +12,3 @@ spring:
 logging:
 logging:
   level:
   level:
     root: info
     root: info
-
-#直接放行的请求链接
-links: /auth/login,/kwsUser/resetPassword,/kwsUser/updatePassword,/kwsUser/forgetPassword
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:

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

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -23,112 +17,8 @@ spring:
         namespace: sckw_zk
         namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        flow:
-          nacos:
-            # 设置Nacos的连接地址、命名空间和Group ID
-#            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-example-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        degrade:
-          nacos:
-#            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
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: example-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      example-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      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: ${lfdc.nacos.server-addr}
-      namespace: ${lfdc.nacos.namespace}
-      group: ${lfdc.nacos.group}
-  application-id: ${spring.application.name}
-  #  当前不生效,使用驼峰
-  enabled: true
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: example-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-example/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

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

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -11,7 +5,7 @@ spring:
         # 服务注册地址
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         server-addr: 10.10.10.230:8848
         # 命名空间
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
       config:
       config:
@@ -20,124 +14,11 @@ spring:
         # 配置文件格式
         # 配置文件格式
         file-extension: yaml
         file-extension: yaml
         # 命名空间
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        flow:
-          nacos:
-            # 设置Nacos的连接地址、命名空间和Group ID
-            # 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
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        degrade:
-          nacos:
-            #            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
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: file-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      file-seata-service-group: default
-    #    配置与nacos同ip
-    grouplist:
-      default: 10.10.10.230
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_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
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-  #限制上传文件大小
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: file-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-
-aliyun:
-  oss:
-    endpoint: oss-cn-chengdu.aliyuncs.com
-    accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
-    secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
-    bucket: kaiwu-saas
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-file/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

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

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -11,7 +5,7 @@ spring:
         # 服务注册地址
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         server-addr: 10.10.10.230:8848
         # 命名空间
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
       config:
       config:
@@ -20,114 +14,11 @@ spring:
         # 配置文件格式
         # 配置文件格式
         file-extension: yaml
         file-extension: yaml
         # 命名空间
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        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-message-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        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-message-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: message-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      message-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_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
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: message-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-message/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

+ 5 - 116
sckw-modules/sckw-order/src/main/resources/bootstrap-dev.yml

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -23,113 +17,8 @@ spring:
         namespace: sckw-service-platform-dev
         namespace: sckw-service-platform-dev
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        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-order-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        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-order-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: order-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      order-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_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
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: order-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-
-
-
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-order/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

+ 5 - 115
sckw-modules/sckw-product/src/main/resources/bootstrap-dev.yml

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -23,112 +17,8 @@ spring:
         namespace: sckw-service-platform-dev
         namespace: sckw-service-platform-dev
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        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-product-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        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-product-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: product-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      product-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_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
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: product-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
-
-
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-product/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

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

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -23,102 +17,8 @@ spring:
         namespace: sckw_zk
         namespace: sckw_zk
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        flow:
-          nacos:
-            # 设置Nacos的连接地址、命名空间和Group ID
-            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
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        degrade:
-          nacos:
-            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
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: system-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      system-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_GROUP为默认分组
-      server-addr: ${lfdc.nacos.server-addr}
-      namespace: ${lfdc.nacos.namespace}
-      group: ${lfdc.nacos.group}
-  config:
-    # 指定nacos作为配置中心
-    type: nacos
-    nacos:
-      server-addr: ${lfdc.nacos.server-addr}
-      namespace: ${lfdc.nacos.namespace}
-      group: ${lfdc.nacos.group}
-  application-id: ${spring.application.name}
-  #  当前不生效,使用驼峰
-  enabled: true
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: system-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 1 - 6
sckw-modules/sckw-system/src/main/resources/bootstrap.yml

@@ -8,9 +8,4 @@ spring:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true

+ 5 - 117
sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -1,9 +1,3 @@
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
 spring:
 spring:
   cloud:
   cloud:
     nacos:
     nacos:
@@ -23,114 +17,8 @@ spring:
         namespace: sckw-service-platform-dev
         namespace: sckw-service-platform-dev
         # 共享配置
         # 共享配置
         group: sckw-service-platform
         group: sckw-service-platform
-  data:
-    # sentinel降级配置
-    sentinel:
-      transport:
-        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
-        port: 8719  #默认8719端口,如果被占用会向上扫描。
-        #控制台地址
-        dashboard: 10.10.10.230:19527
-      log:
-        #日志路径
-        dir: logs/sentinel
-        # 默认将调用链路收敛,导致链路流控效果无效
-        web-context-unify: false
-        #持久化nacos配置中
-      datasource:
-        #sentinel-rule: 唯一名称可自定义
-        #限流
-        flow:
-          nacos:
-            # 设置Nacos的连接地址、命名空间和Group ID
-            # 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-transPort-sentinel-flow-rules
-            group-id: SENTINEL_GROUP
-            data-type: json
-            # 必填的重要字段,指定当前规则类型是"限流"
-            rule-type: flow
-        #熔断
-        degrade:
-          nacos:
-            #            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-transPort-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-  main:
-    allow-circular-references: true
-
-seata:
-  # seata 服务分组,要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称,要和服务端对应
-  tx-service-group: transPort-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      transPort-seata-service-group: default
-    #    配置与nacos同ip
-    grouplist:
-      default: 10.10.10.230
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      #group: SEATA_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
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-  #限制上传文件大小
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-# dubbo
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中,如果dubbo也延用相同的名称,在nacos服务里会看到注册的producer-server服务数为2
-    name: transPort-dubbo-server
-    parameters:
-      group: ${spring.cloud.nacos.discovery.group}
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-  protocol:
-    name: dubbo
-    port: -1
-  registry:
-    # 配置dubbo的注册中心为nacos
-    address: nacos://${spring.cloud.nacos.discovery.server-addr}
-    group: ${spring.cloud.nacos.discovery.group}
-    namespace: ${spring.cloud.nacos.discovery.namespace}
-    protocol: nacos
-    #use-as-config-center: false
-    #use-as-metadata-center: false
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

+ 2 - 7
sckw-modules/sckw-transport/src/main/resources/bootstrap.yml

@@ -3,14 +3,9 @@ server:
 
 
 spring:
 spring:
   application:
   application:
-    name: sckw-transPort
+    name: sckw-transport
   profiles:
   profiles:
     active: ${DEPLOY_MODE:dev}
     active: ${DEPLOY_MODE:dev}
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-
-#直接放行的请求链接
-links:
-
-#是否允许一个账号绑定多个角色
-isBindManyRole:
+    allow-circular-references: true