杜凯玲 / huike-eaas-config · Commits

Commit 19d4c2978e49bbc5713786bf85b307826e37fd13

Authored by sunninghai
2 parents b19773d5 c14cb879

Merge branch 'service_standard'

Inline Side-by-side
Showing 4 changed files with 54 additions and 54 deletions
class-service.yml
  View file @19d4c29
@@ -64,9 +64,9 @@ spring: @@ -64,9 +64,9 @@ spring:
64 min-idle: 10 64 min-idle: 10
65 max-active: 1000 65 max-active: 1000
66 max-wait: 100000 66 max-wait: 100000
67 - sentinel:  
68 - master: mymaster1  
69 - nodes: redis-server:16379,redis-server:16379 67 + #sentinel:
  68 + #master: mymaster1
  69 + #nodes: redis-server:16379,redis-server:16379
70 70
71 71
72 mybatis: 72 mybatis:
@@ -122,7 +122,7 @@ ribbon: @@ -122,7 +122,7 @@ ribbon:
122 122
123 # 一些公共的常量配置 123 # 一些公共的常量配置
124 apiConfig: 124 apiConfig:
125 - resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com 125 + resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com/
126 usrLocalTomcatTempLocation: /usr/local/tomcat/temp 126 usrLocalTomcatTempLocation: /usr/local/tomcat/temp
127 gxbApiUrl: http://gxb-api:8080/gxb-api 127 gxbApiUrl: http://gxb-api:8080/gxb-api
128 gxbBiApiUrl: http://bi-api:8080/bi-api 128 gxbBiApiUrl: http://bi-api:8080/bi-api
@@ -198,9 +198,9 @@ spring: @@ -198,9 +198,9 @@ spring:
198 min-idle: 10 198 min-idle: 10
199 max-active: 1000 199 max-active: 1000
200 max-wait: 100000 200 max-wait: 100000
201 - sentinel:  
202 - master: mymaster1  
203 - nodes: redis-server:16379,redis-server:16379 201 + #sentinel:
  202 + #master: mymaster1
  203 + #nodes: redis-server:16379,redis-server:16379
204 204
205 mybatis: 205 mybatis:
206 mapperLocations: classpath:/mybatis/*.xml 206 mapperLocations: classpath:/mybatis/*.xml
@@ -268,7 +268,7 @@ spring: @@ -268,7 +268,7 @@ spring:
268 coreDatasource: 268 coreDatasource:
269 write: 269 write:
270 name: gxb_core 270 name: gxb_core
271 - url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 271 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
272 username: postgres 272 username: postgres
273 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 273 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
274 driver-class-name: com.mysql.jdbc.Driver 274 driver-class-name: com.mysql.jdbc.Driver
@@ -282,7 +282,7 @@ spring: @@ -282,7 +282,7 @@ spring:
282 test-while-idle: true 282 test-while-idle: true
283 read1: 283 read1:
284 name: gxb_core 284 name: gxb_core
285 - url: jdbc:mysql://db3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 285 + url: jdbc:mysql://db-slave.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
286 username: postgres 286 username: postgres
287 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 287 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
288 driver-class-name: com.mysql.jdbc.Driver 288 driver-class-name: com.mysql.jdbc.Driver
@@ -297,7 +297,7 @@ spring: @@ -297,7 +297,7 @@ spring:
297 297
298 secondDatasource: 298 secondDatasource:
299 name: gxb_core 299 name: gxb_core
300 - url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 300 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
301 username: postgres 301 username: postgres
302 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 302 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
303 driver-class-name: com.mysql.jdbc.Driver 303 driver-class-name: com.mysql.jdbc.Driver
@@ -311,17 +311,17 @@ spring: @@ -311,17 +311,17 @@ spring:
311 test-while-idle: true 311 test-while-idle: true
312 redis: 312 redis:
313 database: 0 313 database: 0
314 - host: redis1 314 + host: gxb-app-20180706.redis.rds.aliyuncs.com
315 port: 6379 315 port: 6379
316 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 316 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
317 pool: 317 pool:
318 max-idle: 100 318 max-idle: 100
319 min-idle: 10 319 min-idle: 10
320 max-active: 1000 320 max-active: 1000
321 max-wait: 100000 321 max-wait: 100000
322 - sentinel:  
323 - master: mymaster1  
324 - nodes: redis1:16379,redis2:16379 322 + #sentinel:
  323 + #master: mymaster1
  324 + #nodes: redis1:16379,redis2:16379
325 325
326 mybatis: 326 mybatis:
327 mapperLocations: classpath:/mybatis/*.xml 327 mapperLocations: classpath:/mybatis/*.xml
cxcy-service.yml
  View file @19d4c29
@@ -64,9 +64,9 @@ spring: @@ -64,9 +64,9 @@ spring:
64 min-idle: 10 64 min-idle: 10
65 max-active: 1000 65 max-active: 1000
66 max-wait: 100000 66 max-wait: 100000
67 - sentinel:  
68 - master: mymaster1  
69 - nodes: redis-server:16379,redis-server:16379 67 + #sentinel:
  68 + #master: mymaster1
  69 + #nodes: redis-server:16379,redis-server:16379
70 70
71 mybatis: 71 mybatis:
72 mapperLocations: classpath:/mybatis/*.xml 72 mapperLocations: classpath:/mybatis/*.xml
@@ -189,9 +189,9 @@ spring: @@ -189,9 +189,9 @@ spring:
189 min-idle: 10 189 min-idle: 10
190 max-active: 1000 190 max-active: 1000
191 max-wait: 100000 191 max-wait: 100000
192 - sentinel:  
193 - master: mymaster1  
194 - nodes: redis-server:16379,redis-server:16379 192 + #sentinel:
  193 + #master: mymaster1
  194 + #nodes: redis-server:16379,redis-server:16379
195 195
196 mybatis: 196 mybatis:
197 mapperLocations: classpath:/mybatis/*.xml 197 mapperLocations: classpath:/mybatis/*.xml
@@ -257,7 +257,7 @@ spring: @@ -257,7 +257,7 @@ spring:
257 coreDatasource: 257 coreDatasource:
258 write: 258 write:
259 name: cxcy 259 name: cxcy
260 - url: jdbc:mysql://emysql3:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 260 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
261 username: postgres 261 username: postgres
262 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 262 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
263 driver-class-name: com.mysql.jdbc.Driver 263 driver-class-name: com.mysql.jdbc.Driver
@@ -271,7 +271,7 @@ spring: @@ -271,7 +271,7 @@ spring:
271 test-while-idle: true 271 test-while-idle: true
272 read1: 272 read1:
273 name: cxcy 273 name: cxcy
274 - url: jdbc:mysql://db3:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 274 + url: jdbc:mysql://db-slave.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
275 username: postgres 275 username: postgres
276 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 276 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
277 driver-class-name: com.mysql.jdbc.Driver 277 driver-class-name: com.mysql.jdbc.Driver
@@ -286,7 +286,7 @@ spring: @@ -286,7 +286,7 @@ spring:
286 286
287 secondDatasource: 287 secondDatasource:
288 name: cxcy 288 name: cxcy
289 - url: jdbc:mysql://emysql3:3306/cxcy?useUnicode=true&characterEncoding=UTF-8 289 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8
290 username: postgres 290 username: postgres
291 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 291 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
292 driver-class-name: com.mysql.jdbc.Driver 292 driver-class-name: com.mysql.jdbc.Driver
@@ -300,17 +300,17 @@ spring: @@ -300,17 +300,17 @@ spring:
300 test-while-idle: true 300 test-while-idle: true
301 redis: 301 redis:
302 database: 0 302 database: 0
303 - host: redis1 303 + host: gxb-app-20180706.redis.rds.aliyuncs.com
304 port: 6379 304 port: 6379
305 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 305 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
306 pool: 306 pool:
307 max-idle: 100 307 max-idle: 100
308 min-idle: 10 308 min-idle: 10
309 max-active: 1000 309 max-active: 1000
310 max-wait: 100000 310 max-wait: 100000
311 - sentinel:  
312 - master: mymaster1  
313 - nodes: redis1:16379,redis2:16379 311 + #sentinel:
  312 + #master: mymaster1
  313 + #nodes: redis1:16379,redis2:16379
314 314
315 mybatis: 315 mybatis:
316 mapperLocations: classpath:/mybatis/*.xml 316 mapperLocations: classpath:/mybatis/*.xml
gateway.yml
  View file @19d4c29
@@ -18,9 +18,9 @@ spring: @@ -18,9 +18,9 @@ spring:
18 min-idle: 10 18 min-idle: 10
19 max-active: 1000 19 max-active: 1000
20 max-wait: 100000 20 max-wait: 100000
21 - sentinel:  
22 - master: mymaster1  
23 - nodes: redis-server:16379,redis-server:16379 21 + #sentinel:
  22 + #master: mymaster1
  23 + #nodes: redis-server:16379,redis-server:16379
24 24
25 endpoints: 25 endpoints:
26 restart: 26 restart:
@@ -134,9 +134,9 @@ spring: @@ -134,9 +134,9 @@ spring:
134 min-idle: 10 134 min-idle: 10
135 max-active: 1000 135 max-active: 1000
136 max-wait: 100000 136 max-wait: 100000
137 - sentinel:  
138 - master: mymaster1  
139 - nodes: redis-server:16379,redis-server:16379 137 + #sentinel:
  138 + #master: mymaster1
  139 + #nodes: redis-server:16379,redis-server:16379
140 140
141 endpoints: 141 endpoints:
142 restart: 142 restart:
@@ -225,17 +225,17 @@ spring: @@ -225,17 +225,17 @@ spring:
225 225
226 redis: 226 redis:
227 database: 0 227 database: 0
228 - host: redis1 228 + host: gxb-app-20180706.redis.rds.aliyuncs.com
229 port: 6379 229 port: 6379
230 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 230 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
231 pool: 231 pool:
232 max-idle: 100 232 max-idle: 100
233 min-idle: 10 233 min-idle: 10
234 max-active: 1000 234 max-active: 1000
235 max-wait: 100000 235 max-wait: 100000
236 - sentinel:  
237 - master: mymaster1  
238 - nodes: redis1:16379,redis2:16379 236 + #sentinel:
  237 + #master: mymaster1
  238 + #nodes: redis1:16379,redis2:16379
239 239
240 endpoints: 240 endpoints:
241 restart: 241 restart:
user-service.yml
  View file @19d4c29
@@ -31,12 +31,12 @@ spring: @@ -31,12 +31,12 @@ spring:
31 min-idle: 10 31 min-idle: 10
32 max-active: 1000 32 max-active: 1000
33 max-wait: 100000 33 max-wait: 100000
34 - sentinel:  
35 - master: mymaster1  
36 - nodes: redis-server:16379,redis-server:16379 34 + #sentinel:
  35 + #master: mymaster1
  36 + #nodes: redis-server:16379,redis-server:16379
37 37
38 activemq: 38 activemq:
39 - broker-url: failover:(tcp://mqserver:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers 39 + broker-url: failover:(tcp://mq-server.gxb-base:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
40 inMemory: true 40 inMemory: true
41 pool: 41 pool:
42 enabled: true 42 enabled: true
@@ -120,9 +120,9 @@ spring: @@ -120,9 +120,9 @@ spring:
120 min-idle: 10 120 min-idle: 10
121 max-active: 1000 121 max-active: 1000
122 max-wait: 100000 122 max-wait: 100000
123 - sentinel:  
124 - master: mymaster1  
125 - nodes: redis-server:16379,redis-server:16379 123 + #sentinel:
  124 + #master: mymaster1
  125 + #nodes: redis-server:16379,redis-server:16379
126 126
127 mybatis: 127 mybatis:
128 mapperLocations: classpath:/mybatis/*.xml 128 mapperLocations: classpath:/mybatis/*.xml
@@ -171,7 +171,7 @@ spring: @@ -171,7 +171,7 @@ spring:
171 enabled: true 171 enabled: true
172 datasource: 172 datasource:
173 name: gxb_core 173 name: gxb_core
174 - url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true 174 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
175 username: postgres 175 username: postgres
176 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 176 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
177 driver-class-name: com.mysql.jdbc.Driver 177 driver-class-name: com.mysql.jdbc.Driver
@@ -185,20 +185,20 @@ spring: @@ -185,20 +185,20 @@ spring:
185 test-while-idle: true 185 test-while-idle: true
186 redis: 186 redis:
187 database: 0 187 database: 0
188 - host: redis1 188 + host: gxb-app-20180706.redis.rds.aliyuncs.com
189 port: 6379 189 port: 6379
190 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 190 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
191 pool: 191 pool:
192 max-idle: 100 192 max-idle: 100
193 min-idle: 10 193 min-idle: 10
194 max-active: 1000 194 max-active: 1000
195 max-wait: 100000 195 max-wait: 100000
196 - sentinel:  
197 - master: mymaster1  
198 - nodes: redis1:16379,redis2:16379 196 + #sentinel:
  197 + #master: mymaster1
  198 + #nodes: redis1:16379,redis2:16379
199 199
200 activemq: 200 activemq:
201 - broker-url: failover:(tcp://mqserver:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers 201 + broker-url: failover:(tcp://mq-server.gxb-base:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
202 inMemory: true 202 inMemory: true
203 pool: 203 pool:
204 enabled: true 204 enabled: true