Merge branch 'master' of git.dev.yoho.cn:yohoops/deploy-test
Showing
1 changed file
with
17 additions
and
0 deletions
@@ -132,6 +132,10 @@ jdbc.mysql.yohopushcenter.password=9nm0icOwt6bMHjMusIfMLw== | @@ -132,6 +132,10 @@ jdbc.mysql.yohopushcenter.password=9nm0icOwt6bMHjMusIfMLw== | ||
132 | jdbc.mysql.yohoactivity.username=yh_test | 132 | jdbc.mysql.yohoactivity.username=yh_test |
133 | jdbc.mysql.yohoactivity.password=9nm0icOwt6bMHjMusIfMLw== | 133 | jdbc.mysql.yohoactivity.password=9nm0icOwt6bMHjMusIfMLw== |
134 | 134 | ||
135 | +#yh_special | ||
136 | +jdbc.mysql.yhspecial.username=yh_test | ||
137 | +jdbc.mysql.yhspecial.password=9nm0icOwt6bMHjMusIfMLw== | ||
138 | + | ||
135 | 139 | ||
136 | ### ****************************** database new *********************************** | 140 | ### ****************************** database new *********************************** |
137 | 141 | ||
@@ -215,6 +219,10 @@ jdbc.mysql.yohopushcenter.slave=192.168.102.219:3306 | @@ -215,6 +219,10 @@ jdbc.mysql.yohopushcenter.slave=192.168.102.219:3306 | ||
215 | jdbc.mysql.yohoactivity.master=192.168.50.69:9980 | 219 | jdbc.mysql.yohoactivity.master=192.168.50.69:9980 |
216 | jdbc.mysql.yohoactivity.slave=192.168.102.219:3306 | 220 | jdbc.mysql.yohoactivity.slave=192.168.102.219:3306 |
217 | 221 | ||
222 | +#yh_special | ||
223 | +jdbc.mysql.yhspecial.master=192.168.50.69:9980 | ||
224 | +jdbc.mysql.yhspecial.slave=192.168.102.219:3306 | ||
225 | + | ||
218 | 226 | ||
219 | ## mq or call erp | 227 | ## mq or call erp |
220 | erp.message.sync.type=MQ | 228 | erp.message.sync.type=MQ |
@@ -270,6 +278,13 @@ redis.union.readonly.proxy.address=192.168.102.211 | @@ -270,6 +278,13 @@ redis.union.readonly.proxy.address=192.168.102.211 | ||
270 | redis.union.readonly.proxy.port=6379 | 278 | redis.union.readonly.proxy.port=6379 |
271 | redis.union.readonly.proxy.auth= | 279 | redis.union.readonly.proxy.auth= |
272 | 280 | ||
281 | +# outter big data redis | ||
282 | +bigDataRedis.proxy.address=192.168.102.162 | ||
283 | +bigDataRedis.proxy.port=6379 | ||
284 | +bigDataRedis.proxy.auth | ||
285 | + | ||
286 | + | ||
287 | + | ||
273 | gateway.domain.url=http://testapi.yoho.cn:28078 | 288 | gateway.domain.url=http://testapi.yoho.cn:28078 |
274 | 289 | ||
275 | zkAddress=192.168.102.211:2181 | 290 | zkAddress=192.168.102.211:2181 |
@@ -292,6 +307,8 @@ rabbit_host = 192.168.102.162:35672 | @@ -292,6 +307,8 @@ rabbit_host = 192.168.102.162:35672 | ||
292 | rabbit_user = yoho | 307 | rabbit_user = yoho |
293 | rabbit_password = yoho | 308 | rabbit_password = yoho |
294 | 309 | ||
310 | + | ||
311 | + | ||
295 | ##### **************************************** services.yml ****************************************************** | 312 | ##### **************************************** services.yml ****************************************************** |
296 | 313 | ||
297 | message.server.a = 192.168.102.211 | 314 | message.server.a = 192.168.102.211 |
-
Please register or login to post a comment