杜凯玲 / huike-eaas-config · Commits

Commit 906a6778882f04a3962395c9b41605c6f8a7507e

Authored by sunninghai
1 parent 70f02fc0

服务标准化 redis 单机化

Inline Side-by-side
Showing 4 changed files with 76 additions and 76 deletions
class-service.yml
  View file @906a677
@@ -13,7 +13,7 @@ spring: @@ -13,7 +13,7 @@ spring:
13 coreDatasource: 13 coreDatasource:
14 write: 14 write:
15 name: gxb_core 15 name: gxb_core
16 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 16 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
17 username: test 17 username: test
18 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 18 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
19 driver-class-name: com.mysql.jdbc.Driver 19 driver-class-name: com.mysql.jdbc.Driver
@@ -27,7 +27,7 @@ spring: @@ -27,7 +27,7 @@ spring:
27 test-while-idle: true 27 test-while-idle: true
28 read1: 28 read1:
29 name: gxb_core 29 name: gxb_core
30 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 30 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
31 username: test 31 username: test
32 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 32 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
33 driver-class-name: com.mysql.jdbc.Driver 33 driver-class-name: com.mysql.jdbc.Driver
@@ -42,7 +42,7 @@ spring: @@ -42,7 +42,7 @@ spring:
42 42
43 secondDatasource: 43 secondDatasource:
44 name: gxb_core 44 name: gxb_core
45 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 45 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
46 username: test 46 username: test
47 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 47 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
48 driver-class-name: com.mysql.jdbc.Driver 48 driver-class-name: com.mysql.jdbc.Driver
@@ -56,7 +56,7 @@ spring: @@ -56,7 +56,7 @@ spring:
56 test-while-idle: true 56 test-while-idle: true
57 redis: 57 redis:
58 database: 0 58 database: 0
59 - host: redis-server 59 + host: gxb-app-20180706.redis.rds.aliyuncs.com
60 port: 6379 60 port: 6379
61 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 61 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
62 pool: 62 pool:
@@ -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/12344444
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
@@ -142,7 +142,7 @@ spring: @@ -142,7 +142,7 @@ spring:
142 coreDatasource: 142 coreDatasource:
143 write: 143 write:
144 name: gxb_core 144 name: gxb_core
145 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 145 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
146 username: test 146 username: test
147 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 147 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
148 driver-class-name: com.mysql.jdbc.Driver 148 driver-class-name: com.mysql.jdbc.Driver
@@ -156,7 +156,7 @@ spring: @@ -156,7 +156,7 @@ spring:
156 test-while-idle: true 156 test-while-idle: true
157 read1: 157 read1:
158 name: gxb_core 158 name: gxb_core
159 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 159 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
160 username: test 160 username: test
161 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 161 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
162 driver-class-name: com.mysql.jdbc.Driver 162 driver-class-name: com.mysql.jdbc.Driver
@@ -171,7 +171,7 @@ spring: @@ -171,7 +171,7 @@ spring:
171 171
172 secondDatasource: 172 secondDatasource:
173 name: gxb_core 173 name: gxb_core
174 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 174 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
175 username: rd 175 username: rd
176 password: ENC(5860760736a5c5fbbcbeab1cf6c72b38) 176 password: ENC(5860760736a5c5fbbcbeab1cf6c72b38)
177 driver-class-name: com.mysql.jdbc.Driver 177 driver-class-name: com.mysql.jdbc.Driver
@@ -185,7 +185,7 @@ spring: @@ -185,7 +185,7 @@ spring:
185 test-while-idle: true 185 test-while-idle: true
186 redis: 186 redis:
187 database: 0 187 database: 0
188 - host: redis-server 188 + host: gxb-app-20180706.redis.rds.aliyuncs.com
189 port: 6379 189 port: 6379
190 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 190 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
191 pool: 191 pool:
@@ -193,9 +193,9 @@ spring: @@ -193,9 +193,9 @@ spring:
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: redis-server:16379,redis-server:16379 196 + #sentinel:
  197 + #master: mymaster1
  198 + #nodes: redis-server:16379,redis-server:16379
199 199
200 mybatis: 200 mybatis:
201 mapperLocations: classpath:/mybatis/*.xml 201 mapperLocations: classpath:/mybatis/*.xml
@@ -263,7 +263,7 @@ spring: @@ -263,7 +263,7 @@ spring:
263 coreDatasource: 263 coreDatasource:
264 write: 264 write:
265 name: gxb_core 265 name: gxb_core
266 - url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 266 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
267 username: postgres 267 username: postgres
268 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 268 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
269 driver-class-name: com.mysql.jdbc.Driver 269 driver-class-name: com.mysql.jdbc.Driver
@@ -277,7 +277,7 @@ spring: @@ -277,7 +277,7 @@ spring:
277 test-while-idle: true 277 test-while-idle: true
278 read1: 278 read1:
279 name: gxb_core 279 name: gxb_core
280 - url: jdbc:mysql://db3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 280 + url: jdbc:mysql://db-slave.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
281 username: postgres 281 username: postgres
282 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 282 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
283 driver-class-name: com.mysql.jdbc.Driver 283 driver-class-name: com.mysql.jdbc.Driver
@@ -292,7 +292,7 @@ spring: @@ -292,7 +292,7 @@ spring:
292 292
293 secondDatasource: 293 secondDatasource:
294 name: gxb_core 294 name: gxb_core
295 - url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 295 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
296 username: postgres 296 username: postgres
297 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a) 297 password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
298 driver-class-name: com.mysql.jdbc.Driver 298 driver-class-name: com.mysql.jdbc.Driver
@@ -306,17 +306,17 @@ spring: @@ -306,17 +306,17 @@ spring:
306 test-while-idle: true 306 test-while-idle: true
307 redis: 307 redis:
308 database: 0 308 database: 0
309 - host: redis1 309 + host: gxb-app-20180706.redis.rds.aliyuncs.com
310 port: 6379 310 port: 6379
311 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 311 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
312 pool: 312 pool:
313 max-idle: 100 313 max-idle: 100
314 min-idle: 10 314 min-idle: 10
315 max-active: 1000 315 max-active: 1000
316 max-wait: 100000 316 max-wait: 100000
317 - sentinel:  
318 - master: mymaster1  
319 - nodes: redis1:16379,redis2:16379 317 + #sentinel:
  318 + #master: mymaster1
  319 + #nodes: redis1:16379,redis2:16379
320 320
321 mybatis: 321 mybatis:
322 mapperLocations: classpath:/mybatis/*.xml 322 mapperLocations: classpath:/mybatis/*.xml
cxcy-service.yml
  View file @906a677
@@ -13,7 +13,7 @@ spring: @@ -13,7 +13,7 @@ spring:
13 coreDatasource: 13 coreDatasource:
14 write: 14 write:
15 name: cxcy 15 name: cxcy
16 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 16 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
17 username: test 17 username: test
18 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 18 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
19 driver-class-name: com.mysql.jdbc.Driver 19 driver-class-name: com.mysql.jdbc.Driver
@@ -27,7 +27,7 @@ spring: @@ -27,7 +27,7 @@ spring:
27 test-while-idle: true 27 test-while-idle: true
28 read1: 28 read1:
29 name: cxcy 29 name: cxcy
30 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 30 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
31 username: test 31 username: test
32 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 32 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
33 driver-class-name: com.mysql.jdbc.Driver 33 driver-class-name: com.mysql.jdbc.Driver
@@ -42,7 +42,7 @@ spring: @@ -42,7 +42,7 @@ spring:
42 42
43 secondDatasource: 43 secondDatasource:
44 name: cxcy 44 name: cxcy
45 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8 45 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8
46 username: test 46 username: test
47 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 47 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
48 driver-class-name: com.mysql.jdbc.Driver 48 driver-class-name: com.mysql.jdbc.Driver
@@ -56,7 +56,7 @@ spring: @@ -56,7 +56,7 @@ spring:
56 test-while-idle: true 56 test-while-idle: true
57 redis: 57 redis:
58 database: 0 58 database: 0
59 - host: redis-server 59 + host: gxb-app-20180706.redis.rds.aliyuncs.com
60 port: 6379 60 port: 6379
61 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 61 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
62 pool: 62 pool:
@@ -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
@@ -138,7 +138,7 @@ spring: @@ -138,7 +138,7 @@ spring:
138 coreDatasource: 138 coreDatasource:
139 write: 139 write:
140 name: cxcy 140 name: cxcy
141 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 141 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
142 username: test 142 username: test
143 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 143 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
144 driver-class-name: com.mysql.jdbc.Driver 144 driver-class-name: com.mysql.jdbc.Driver
@@ -152,7 +152,7 @@ spring: @@ -152,7 +152,7 @@ spring:
152 test-while-idle: true 152 test-while-idle: true
153 read1: 153 read1:
154 name: cxcy 154 name: cxcy
155 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 155 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
156 username: test 156 username: test
157 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 157 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
158 driver-class-name: com.mysql.jdbc.Driver 158 driver-class-name: com.mysql.jdbc.Driver
@@ -167,7 +167,7 @@ spring: @@ -167,7 +167,7 @@ spring:
167 167
168 secondDatasource: 168 secondDatasource:
169 name: cxcy 169 name: cxcy
170 - url: jdbc:mysql://testdb-master:3306/cxcy?useUnicode=true&characterEncoding=UTF-8 170 + url: jdbc:mysql://db-master.gxb-base:3306/cxcy?useUnicode=true&characterEncoding=UTF-8
171 username: rd 171 username: rd
172 password: ENC(5860760736a5c5fbbcbeab1cf6c72b38) 172 password: ENC(5860760736a5c5fbbcbeab1cf6c72b38)
173 driver-class-name: com.mysql.jdbc.Driver 173 driver-class-name: com.mysql.jdbc.Driver
@@ -181,7 +181,7 @@ spring: @@ -181,7 +181,7 @@ spring:
181 test-while-idle: true 181 test-while-idle: true
182 redis: 182 redis:
183 database: 0 183 database: 0
184 - host: redis-server 184 + host: gxb-app-20180706.redis.rds.aliyuncs.com
185 port: 6379 185 port: 6379
186 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 186 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
187 pool: 187 pool:
@@ -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 @906a677
@@ -10,7 +10,7 @@ spring: @@ -10,7 +10,7 @@ spring:
10 10
11 redis: 11 redis:
12 database: 0 12 database: 0
13 - host: redis-server 13 + host: gxb-app-20180706.redis.rds.aliyuncs.com
14 port: 6379 14 port: 6379
15 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 15 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
16 pool: 16 pool:
@@ -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:
@@ -121,7 +121,7 @@ spring: @@ -121,7 +121,7 @@ spring:
121 121
122 redis: 122 redis:
123 database: 0 123 database: 0
124 - host: redis-server 124 + host: gxb-app-20180706.redis.rds.aliyuncs.com
125 port: 6379 125 port: 6379
126 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 126 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
127 pool: 127 pool:
@@ -129,9 +129,9 @@ spring: @@ -129,9 +129,9 @@ spring:
129 min-idle: 10 129 min-idle: 10
130 max-active: 1000 130 max-active: 1000
131 max-wait: 100000 131 max-wait: 100000
132 - sentinel:  
133 - master: mymaster1  
134 - nodes: redis-server:16379,redis-server:16379 132 + #sentinel:
  133 + #master: mymaster1
  134 + #nodes: redis-server:16379,redis-server:16379
135 135
136 endpoints: 136 endpoints:
137 restart: 137 restart:
@@ -216,17 +216,17 @@ spring: @@ -216,17 +216,17 @@ spring:
216 216
217 redis: 217 redis:
218 database: 0 218 database: 0
219 - host: redis1 219 + host: gxb-app-20180706.redis.rds.aliyuncs.com
220 port: 6379 220 port: 6379
221 - password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050) 221 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
222 pool: 222 pool:
223 max-idle: 100 223 max-idle: 100
224 min-idle: 10 224 min-idle: 10
225 max-active: 1000 225 max-active: 1000
226 max-wait: 100000 226 max-wait: 100000
227 - sentinel:  
228 - master: mymaster1  
229 - nodes: redis1:16379,redis2:16379 227 + #sentinel:
  228 + #master: mymaster1
  229 + #nodes: redis1:16379,redis2:16379
230 230
231 endpoints: 231 endpoints:
232 restart: 232 restart:
user-service.yml
  View file @906a677
@@ -9,7 +9,7 @@ spring: @@ -9,7 +9,7 @@ spring:
9 enabled: true 9 enabled: true
10 datasource: 10 datasource:
11 name: gxb_core 11 name: gxb_core
12 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true 12 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
13 username: test 13 username: test
14 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 14 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
15 driver-class-name: com.mysql.jdbc.Driver 15 driver-class-name: com.mysql.jdbc.Driver
@@ -23,7 +23,7 @@ spring: @@ -23,7 +23,7 @@ spring:
23 test-while-idle: true 23 test-while-idle: true
24 redis: 24 redis:
25 database: 0 25 database: 0
26 - host: redis-server 26 + host: gxb-app-20180706.redis.rds.aliyuncs.com
27 port: 6379 27 port: 6379
28 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 28 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
29 pool: 29 pool:
@@ -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
@@ -98,7 +98,7 @@ spring: @@ -98,7 +98,7 @@ spring:
98 enabled: true 98 enabled: true
99 datasource: 99 datasource:
100 name: gxb_core 100 name: gxb_core
101 - url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true 101 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
102 username: test 102 username: test
103 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 103 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
104 driver-class-name: com.mysql.jdbc.Driver 104 driver-class-name: com.mysql.jdbc.Driver
@@ -112,7 +112,7 @@ spring: @@ -112,7 +112,7 @@ spring:
112 test-while-idle: true 112 test-while-idle: true
113 redis: 113 redis:
114 database: 0 114 database: 0
115 - host: redis-server 115 + host: gxb-app-20180706.redis.rds.aliyuncs.com
116 port: 6379 116 port: 6379
117 password: ENC(8aea42e66b0928c44cd8f861a9d558e6) 117 password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
118 pool: 118 pool:
@@ -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