Merge remote-tracking branch 'origin/develop' into develop

@@ -14,10 +14,10 @@ spring:
     compatibility-verifier:
       enabled: false
     gateway:
-      gatewayServiceName: gateway-server
-      host: 114.115.131.96
+      gatewayServiceName: ms-daop-gateway-server
+      host: https://daop-lt-test.zgsjzc.com/api
   kafka:
-    bootstrap-servers: kafka-cs-develop.daop:9092
+    bootstrap-servers: kafka-cs-test.zk-kafka:9092
     producer:
       retries: 3
   main:
@@ -52,16 +52,16 @@ spring:
       ##由mycat管理读写分离 不用代码控制(填写mycat的链接库)
       datasource:
         master:
-          url: jdbc:mysql://192.168.6.21:3307/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
-          username: prg
-          password: E5t391s349wT@3
+          url: jdbc:mysql://192.168.5.28:3307/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+          username: sharding
+          password: dJ5xF7qC
           driver-class-name: com.mysql.cj.jdbc.Driver
           druid:
             initial-size: 5
         slave:
-          url: jdbc:mysql://192.168.6.21:3307/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
-          username: prg
-          password: E5t391s349wT@3
+          url: jdbc:mysql://192.168.5.28:3307/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+          username: sharding
+          password: dJ5xF7qC
           driver-class-name: com.mysql.cj.jdbc.Driver
           druid:
             initial-size: 5
@@ -72,11 +72,11 @@ spring:
       #cluster:
       #  nodes: redis-service.redis:6379
       # 单节点
-      host: redis-service.daop
+      host: redis-service.daop-test
       port: 6379
       password: "J7e411m693cA9"
       timeout: 1000
-      prefix: daop-test
+      prefix: daop-develop
       jedis:
         pool:
           max-idle: 8
@@ -91,7 +91,7 @@ spring:
         encoding: UTF-8
         mode: never
 redisson:
-  address: redis://redis-service.daop:6379
+  address: redis://redis-service.daop-test:6379
   password: "J7e411m693cA9"
 
 seata:
@@ -101,12 +101,12 @@ seata:
   registry:
     type: nacos
     nacos:
-      application: seata-server
+      application: ms-daop-seata-service
       cluster: seata-cluster
-      server-addr: nacos-cluster-service-develop.nacos-cluster:8848
-      password: U9u457p155vH@8
+      server-addr: nacos-cluster-service.nacos-cluster:8848
+      password: Q1p534i9
       username: nacos
-      namespace: daop-lt
+      namespace: daop-master
       group: test
   service:
     vgroupMapping:
@@ -139,13 +139,13 @@ pagehelper:
 
 csbr:
   kafka:
-    topic-prefix: DAOP-LT-TEST
+    topic-prefix: DAOP-LT-DEVELOP
     consumer:
       # 开启kafka消费者
       enable: true
       # kafka 服务集群地址，格式：HOST:PORT ,用逗号隔开
       #      bootstrap-servers: 210.12.100.201:9092
-      bootstrap-servers: kafka-cs-develop.daop:9092
+      bootstrap-servers: kafka-cs-test.zk-kafka:9092
       #      bootstrap-servers: 192.168.3.120:9092
       # 是否启用自动提交 offset
       enable-auto-commit: false
@@ -170,7 +170,7 @@ csbr:
       enable: true
       # kafka 服务集群地址，格式：HOST:PORT ,多地址用逗号隔开
       #      bootstrap-servers: 210.12.100.201:9092
-      bootstrap-servers: kafka-cs-develop.daop:9092
+      bootstrap-servers: kafka-cs-test.zk-kafka:9092
       #      bootstrap-servers: 192.168.3.120:9092
       # 失败后的重发次数
       retries: 0
@@ -187,3 +187,8 @@ feign:
 query-limit:
   white: TrTaskValid
 
+csbrcloud:
+  shardingFlag: true
+
+logging:
+  config: classpath:logback.xml
\ No newline at end of file

@@ -5,7 +5,7 @@ spring:
     nacos:
       #配置中心
       config:
-        server-addr: nacos-cluster-service-develop.nacos-cluster:8848
+        server-addr: nacos-cluster-service.nacos-cluster:8848
         file-extension: yaml
         group: test
         namespace: daop-lt
@@ -16,14 +16,14 @@ spring:
       #注册中心
       discovery:
         enabled: true
-        server-addr: nacos-cluster-service-develop.nacos-cluster:8848
+        server-addr: nacos-cluster-service.nacos-cluster:8848
         group: test
         namespace: daop-lt
         metadata:
           code: "006"
           user:
             name: nacos
-            password: nacos
+            password: Q1p534i9
           management:
             context-path: /actuator
     #接口限流