Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
32fa0275 by 肖初晴
Options

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

2 parents c461f7c0 763be8d7
Inline Side-by-side
Showing 2 changed files with 27 additions and 22 deletions
src/main/resources/release-test/lt/application.yml
...@@ -14,10 +14,10 @@ spring: ...@@ -14,10 +14,10 @@ spring:
14 compatibility-verifier: 14 compatibility-verifier:
15 enabled: false 15 enabled: false
16 gateway: 16 gateway:
17 gatewayServiceName: gateway-server 17 gatewayServiceName: ms-daop-gateway-server
18 host: 114.115.131.96 18 host: https://daop-lt-test.zgsjzc.com/api
19 kafka: 19 kafka:
20 bootstrap-servers: kafka-cs-develop.daop:9092 20 bootstrap-servers: kafka-cs-test.zk-kafka:9092
21 producer: 21 producer:
22 retries: 3 22 retries: 3
23 main: 23 main:
...@@ -52,16 +52,16 @@ spring: ...@@ -52,16 +52,16 @@ spring:
52 ##由mycat管理读写分离 不用代码控制(填写mycat的链接库) 52 ##由mycat管理读写分离 不用代码控制(填写mycat的链接库)
53 datasource: 53 datasource:
54 master: 54 master:
55 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 55 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
56 username: prg 56 username: sharding
57 password: E5t391s349wT@3 57 password: dJ5xF7qC
58 driver-class-name: com.mysql.cj.jdbc.Driver 58 driver-class-name: com.mysql.cj.jdbc.Driver
59 druid: 59 druid:
60 initial-size: 5 60 initial-size: 5
61 slave: 61 slave:
62 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 62 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
63 username: prg 63 username: sharding
64 password: E5t391s349wT@3 64 password: dJ5xF7qC
65 driver-class-name: com.mysql.cj.jdbc.Driver 65 driver-class-name: com.mysql.cj.jdbc.Driver
66 druid: 66 druid:
67 initial-size: 5 67 initial-size: 5
...@@ -72,11 +72,11 @@ spring: ...@@ -72,11 +72,11 @@ spring:
72 #cluster: 72 #cluster:
73 # nodes: redis-service.redis:6379 73 # nodes: redis-service.redis:6379
74 # 单节点 74 # 单节点
75 host: redis-service.daop 75 host: redis-service.daop-test
76 port: 6379 76 port: 6379
77 password: "J7e411m693cA9" 77 password: "J7e411m693cA9"
78 timeout: 1000 78 timeout: 1000
79 prefix: daop-test 79 prefix: daop-develop
80 jedis: 80 jedis:
81 pool: 81 pool:
82 max-idle: 8 82 max-idle: 8
...@@ -91,7 +91,7 @@ spring: ...@@ -91,7 +91,7 @@ spring:
91 encoding: UTF-8 91 encoding: UTF-8
92 mode: never 92 mode: never
93 redisson: 93 redisson:
94 address: redis://redis-service.daop:6379 94 address: redis://redis-service.daop-test:6379
95 password: "J7e411m693cA9" 95 password: "J7e411m693cA9"
96 96
97 seata: 97 seata:
...@@ -101,12 +101,12 @@ seata: ...@@ -101,12 +101,12 @@ seata:
101 registry: 101 registry:
102 type: nacos 102 type: nacos
103 nacos: 103 nacos:
104 application: seata-server 104 application: ms-daop-seata-service
105 cluster: seata-cluster 105 cluster: seata-cluster
106 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 106 server-addr: nacos-cluster-service.nacos-cluster:8848
107 password: U9u457p155vH@8 107 password: Q1p534i9
108 username: nacos 108 username: nacos
109 namespace: daop-lt 109 namespace: daop-master
110 group: test 110 group: test
111 service: 111 service:
112 vgroupMapping: 112 vgroupMapping:
...@@ -139,13 +139,13 @@ pagehelper: ...@@ -139,13 +139,13 @@ pagehelper:
139 139
140 csbr: 140 csbr:
141 kafka: 141 kafka:
142 topic-prefix: DAOP-LT-TEST 142 topic-prefix: DAOP-LT-DEVELOP
143 consumer: 143 consumer:
144 # 开启kafka消费者 144 # 开启kafka消费者
145 enable: true 145 enable: true
146 # kafka 服务集群地址，格式：HOST:PORT ,用逗号隔开 146 # kafka 服务集群地址，格式：HOST:PORT ,用逗号隔开
147 # bootstrap-servers: 210.12.100.201:9092 147 # bootstrap-servers: 210.12.100.201:9092
148 bootstrap-servers: kafka-cs-develop.daop:9092 148 bootstrap-servers: kafka-cs-test.zk-kafka:9092
149 # bootstrap-servers: 192.168.3.120:9092 149 # bootstrap-servers: 192.168.3.120:9092
150 # 是否启用自动提交 offset 150 # 是否启用自动提交 offset
151 enable-auto-commit: false 151 enable-auto-commit: false
...@@ -170,7 +170,7 @@ csbr: ...@@ -170,7 +170,7 @@ csbr:
170 enable: true 170 enable: true
171 # kafka 服务集群地址，格式：HOST:PORT ,多地址用逗号隔开 171 # kafka 服务集群地址，格式：HOST:PORT ,多地址用逗号隔开
172 # bootstrap-servers: 210.12.100.201:9092 172 # bootstrap-servers: 210.12.100.201:9092
173 bootstrap-servers: kafka-cs-develop.daop:9092 173 bootstrap-servers: kafka-cs-test.zk-kafka:9092
174 # bootstrap-servers: 192.168.3.120:9092 174 # bootstrap-servers: 192.168.3.120:9092
175 # 失败后的重发次数 175 # 失败后的重发次数
176 retries: 0 176 retries: 0
...@@ -187,3 +187,8 @@ feign: ...@@ -187,3 +187,8 @@ feign:
187 query-limit: 187 query-limit:
188 white: TrTaskValid 188 white: TrTaskValid
189 189
190 csbrcloud:
191 shardingFlag: true
192
193 logging:
194 config: classpath:logback.xml
...\ No newline at end of file ...\ No newline at end of file
......
src/main/resources/release-test/lt/bootstrap.yml
...@@ -5,7 +5,7 @@ spring: ...@@ -5,7 +5,7 @@ spring:
5 nacos: 5 nacos:
6 #配置中心 6 #配置中心
7 config: 7 config:
8 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 8 server-addr: nacos-cluster-service.nacos-cluster:8848
9 file-extension: yaml 9 file-extension: yaml
10 group: test 10 group: test
11 namespace: daop-lt 11 namespace: daop-lt
...@@ -16,14 +16,14 @@ spring: ...@@ -16,14 +16,14 @@ spring:
16 #注册中心 16 #注册中心
17 discovery: 17 discovery:
18 enabled: true 18 enabled: true
19 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 19 server-addr: nacos-cluster-service.nacos-cluster:8848
20 group: test 20 group: test
21 namespace: daop-lt 21 namespace: daop-lt
22 metadata: 22 metadata:
23 code: "006" 23 code: "006"
24 user: 24 user:
25 name: nacos 25 name: nacos
26 password: nacos 26 password: Q1p534i9
27 management: 27 management:
28 context-path: /actuator 28 context-path: /actuator
29 #接口限流 29 #接口限流
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!