杜凯玲 / 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 64 min-idle: 10
65 65 max-active: 1000
66 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 72 mybatis:
... ... @@ -122,7 +122,7 @@ ribbon:
122 122  
123 123 # 一些公共的常量配置
124 124 apiConfig:
125   - resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
  125 + resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com/
126 126 usrLocalTomcatTempLocation: /usr/local/tomcat/temp
127 127 gxbApiUrl: http://gxb-api:8080/gxb-api
128 128 gxbBiApiUrl: http://bi-api:8080/bi-api
... ... @@ -198,9 +198,9 @@ spring:
198 198 min-idle: 10
199 199 max-active: 1000
200 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 205 mybatis:
206 206 mapperLocations: classpath:/mybatis/*.xml
... ... @@ -268,7 +268,7 @@ spring:
268 268 coreDatasource:
269 269 write:
270 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 272 username: postgres
273 273 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
274 274 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -282,7 +282,7 @@ spring:
282 282 test-while-idle: true
283 283 read1:
284 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 286 username: postgres
287 287 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
288 288 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -297,7 +297,7 @@ spring:
297 297  
298 298 secondDatasource:
299 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 301 username: postgres
302 302 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
303 303 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -311,17 +311,17 @@ spring:
311 311 test-while-idle: true
312 312 redis:
313 313 database: 0
314   - host: redis1
  314 + host: gxb-app-20180706.redis.rds.aliyuncs.com
315 315 port: 6379
316   - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050)
  316 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
317 317 pool:
318 318 max-idle: 100
319 319 min-idle: 10
320 320 max-active: 1000
321 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 326 mybatis:
327 327 mapperLocations: classpath:/mybatis/*.xml
... ...
cxcy-service.yml
  View file @19d4c29
... ... @@ -64,9 +64,9 @@ spring:
64 64 min-idle: 10
65 65 max-active: 1000
66 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 mybatis:
72 72 mapperLocations: classpath:/mybatis/*.xml
... ... @@ -189,9 +189,9 @@ spring:
189 189 min-idle: 10
190 190 max-active: 1000
191 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 196 mybatis:
197 197 mapperLocations: classpath:/mybatis/*.xml
... ... @@ -257,7 +257,7 @@ spring:
257 257 coreDatasource:
258 258 write:
259 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 261 username: postgres
262 262 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
263 263 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -271,7 +271,7 @@ spring:
271 271 test-while-idle: true
272 272 read1:
273 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 275 username: postgres
276 276 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
277 277 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -286,7 +286,7 @@ spring:
286 286  
287 287 secondDatasource:
288 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 290 username: postgres
291 291 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
292 292 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -300,17 +300,17 @@ spring:
300 300 test-while-idle: true
301 301 redis:
302 302 database: 0
303   - host: redis1
  303 + host: gxb-app-20180706.redis.rds.aliyuncs.com
304 304 port: 6379
305   - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050)
  305 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
306 306 pool:
307 307 max-idle: 100
308 308 min-idle: 10
309 309 max-active: 1000
310 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 315 mybatis:
316 316 mapperLocations: classpath:/mybatis/*.xml
... ...
gateway.yml
  View file @19d4c29
... ... @@ -18,9 +18,9 @@ spring:
18 18 min-idle: 10
19 19 max-active: 1000
20 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 25 endpoints:
26 26 restart:
... ... @@ -134,9 +134,9 @@ spring:
134 134 min-idle: 10
135 135 max-active: 1000
136 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 141 endpoints:
142 142 restart:
... ... @@ -225,17 +225,17 @@ spring:
225 225  
226 226 redis:
227 227 database: 0
228   - host: redis1
  228 + host: gxb-app-20180706.redis.rds.aliyuncs.com
229 229 port: 6379
230   - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050)
  230 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
231 231 pool:
232 232 max-idle: 100
233 233 min-idle: 10
234 234 max-active: 1000
235 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 240 endpoints:
241 241 restart:
... ...
user-service.yml
  View file @19d4c29
... ... @@ -31,12 +31,12 @@ spring:
31 31 min-idle: 10
32 32 max-active: 1000
33 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 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 40 inMemory: true
41 41 pool:
42 42 enabled: true
... ... @@ -120,9 +120,9 @@ spring:
120 120 min-idle: 10
121 121 max-active: 1000
122 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 127 mybatis:
128 128 mapperLocations: classpath:/mybatis/*.xml
... ... @@ -171,7 +171,7 @@ spring:
171 171 enabled: true
172 172 datasource:
173 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 175 username: postgres
176 176 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
177 177 driver-class-name: com.mysql.jdbc.Driver
... ... @@ -185,20 +185,20 @@ spring:
185 185 test-while-idle: true
186 186 redis:
187 187 database: 0
188   - host: redis1
  188 + host: gxb-app-20180706.redis.rds.aliyuncs.com
189 189 port: 6379
190   - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050)
  190 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
191 191 pool:
192 192 max-idle: 100
193 193 min-idle: 10
194 194 max-active: 1000
195 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 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 202 inMemory: true
203 203 pool:
204 204 enabled: true
... ...