YPT / auto_deploy_test · Commits

Go to a project

Authored by lingmin
Commit 71a7c2bc567990a56548b32d75ad4f3b107b85e7 2 parents 93d0797d 0ee2e1a0

Merge branch 'master' of http://git.yoho.cn/yohoops/auto_deploy_test

Inline Side-by-side
Showing 74 changed files with 382 additions and 217 deletions
1 ##########111111111111111111111111111 1 ##########111111111111111111111111111
2 -yoho.logs.level = ERROR 2 +yoho.logs.level = INFO
3 yoho.logs.basedir = /Data/logs 3 yoho.logs.basedir = /Data/logs
4 yoho.logs.maxHistory = 7 4 yoho.logs.maxHistory = 7
5 yoho.logs.maxFileSize = 10MB 5 yoho.logs.maxFileSize = 10MB
@@ -122,6 +122,11 @@ jdbc.mysql.yhinbox.slave=192.168.102.219:3306 @@ -122,6 +122,11 @@ jdbc.mysql.yhinbox.slave=192.168.102.219:3306
122 jdbc.mysql.yhinbox.username=yh_test 122 jdbc.mysql.yhinbox.username=yh_test
123 jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw== 123 jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw==
124 124
  125 +jdbc.mysql.yhmessage.master=192.168.102.219:3306
  126 +jdbc.mysql.yhmessage.slave=192.168.102.219:3306
  127 +jdbc.mysql.yhmessage.username=yh_test
  128 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  129 +
125 #yoho_logs 130 #yoho_logs
126 jdbc.mysql.yohologs.master=192.168.102.219:3306 131 jdbc.mysql.yohologs.master=192.168.102.219:3306
127 jdbc.mysql.yohologs.username=yh_test 132 jdbc.mysql.yohologs.username=yh_test
@@ -320,6 +325,7 @@ cache.servers.gateway.level1.address = 192.168.102.211:11211 @@ -320,6 +325,7 @@ cache.servers.gateway.level1.address = 192.168.102.211:11211
320 cache.servers.gateway.level1.expire = 1800 325 cache.servers.gateway.level1.expire = 1800
321 cache.servers.gateway.level2.address = 192.168.102.211:11211 326 cache.servers.gateway.level2.address = 192.168.102.211:11211
322 cache.servers.gateway.level2.expire = 43200 327 cache.servers.gateway.level2.expire = 43200
  328 +yoho.service.domain.url=http://192.168.103.60:8094/
323 329
324 ip.port.search.server = 192.168.102.216:8080 330 ip.port.search.server = 192.168.102.216:8080
325 331
@@ -433,4 +439,22 @@ rabbit_message_center_vhost = yoho @@ -433,4 +439,22 @@ rabbit_message_center_vhost = yoho
433 jdbc.mysql.yhwechat.master=192.168.102.219:3306 439 jdbc.mysql.yhwechat.master=192.168.102.219:3306
434 jdbc.mysql.yhwechat.slave=192.168.102.219:3306 440 jdbc.mysql.yhwechat.slave=192.168.102.219:3306
435 jdbc.mysql.yhwechat.username=yh_test 441 jdbc.mysql.yhwechat.username=yh_test
436 -jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==  
  442 +jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
  443 +
  444 +
  445 +
  446 +#redis config
  447 +redis.sync.address1=192.168.103.58:6379
  448 +redis.sync.address2=192.168.103.58:6379
  449 +redis.sync.address3=192.168.103.58:6379
  450 +redis.sync.auth=
  451 +
  452 +redis.sync.readonly.address1=192.168.103.58:6379
  453 +redis.sync.readonly.address2=192.168.103.58:6379
  454 +redis.sync.readonly.address3=192.168.103.58:6379
  455 +
  456 +
  457 +redis.nosync.address1=192.168.103.58:6379
  458 +redis.nosync.auth=
  459 +
  460 +erp.shop.web.url=http://192.168.103.82:9098
@@ -40,4 +40,11 @@ wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify @@ -40,4 +40,11 @@ wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify
40 yoho.gateway.env.namespace = gateway 40 yoho.gateway.env.namespace = gateway
41 yoho.gateway.env.serverport = 0 41 yoho.gateway.env.serverport = 0
42 yoho.gateway.env.webapphome = /home/dev/yoho-gateway/deploy 42 yoho.gateway.env.webapphome = /home/dev/yoho-gateway/deploy
43 -platform.service.url=http://api.platform.yohoops.org:8088/platform  
  43 +platform.service.url=http://api.platform.yohoops.org:8088/platform
  44 +line.shops.url = http://192.168.102.47:8098/shops/
  45 +erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
  46 +erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
  47 +
  48 +portalGateway.service.url = http://192.168.102.47:8080/portal-gateway
  49 +erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
  50 +erp.shops.batch.center.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_center_stock
@@ -69,3 +69,5 @@ exhibition.ticket.couponid=13272 @@ -69,3 +69,5 @@ exhibition.ticket.couponid=13272
69 package.ticket.couponid=13270 69 package.ticket.couponid=13270
70 # 套票 大金额的券ID 70 # 套票 大金额的券ID
71 package.ticket.more.couponid=13268 71 package.ticket.more.couponid=13268
  72 +
  73 +offline.erp.portal.url = http://192.168.102.210:8080/portal-gateway
@@ -119,4 +119,6 @@ jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== @@ -119,4 +119,6 @@ jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
119 aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf 119 aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf
120 mkt.pcwap.domain.url = http://union.yoho.cn/union/go 120 mkt.pcwap.domain.url = http://union.yoho.cn/union/go
121 mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1 121 mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
122 -sync.product.isPromotion.advance.minutes = 5  
  122 +sync.product.isPromotion.advance.minutes = 5
  123 +
  124 +erp.rms.domain=http://192.168.13.15:8081/erp-rms-web
@@ -16,4 +16,3 @@ yohobuy.portal.gateway.env.namespace = portal-gateway @@ -16,4 +16,3 @@ yohobuy.portal.gateway.env.namespace = portal-gateway
16 yohobuy.portal.gateway.env.serverport = 0 16 yohobuy.portal.gateway.env.serverport = 0
17 yohobuy.portal.gateway.env.webapphome = /home/dev/yohobuy-portal-gateway/deploy 17 yohobuy.portal.gateway.env.webapphome = /home/dev/yohobuy-portal-gateway/deploy
18 18
19 -offline.shops.qrcodeurl=http://192.168.102.210:8080/portal-gateway  
@@ -17,6 +17,12 @@ storemanageruser.role.id=88 @@ -17,6 +17,12 @@ storemanageruser.role.id=88
17 #线下店超级管理员角色 17 #线下店超级管理员角色
18 supermanageruser.role.id=110 18 supermanageruser.role.id=110
19 19
  20 +#线下店格子管理员角色
  21 +storeLockerManager.role.id=182
  22 +
  23 +#线下店跑男角色
  24 +storeRunner.role.id=108
  25 +
20 #系统上线时间 时间戳 26 #系统上线时间 时间戳
21 trend.tour.online.time=1480310438 27 trend.tour.online.time=1480310438
22 28
@@ -34,10 +40,12 @@ printer.ftp.url=172.16.2.243 @@ -34,10 +40,12 @@ printer.ftp.url=172.16.2.243
34 printer.ftp.username=yoho 40 printer.ftp.username=yoho
35 printer.ftp.password=123456 41 printer.ftp.password=123456
36 42
37 -protal.gateway.domain.url=http://192.168.102.47:8080/portal-gateway  
38 -  
39 43
40 shop.wifi.img.url=http://192.168.102.47/icons/ 44 shop.wifi.img.url=http://192.168.102.47/icons/
41 shop.wifi.img.path=/var/www/icons/ 45 shop.wifi.img.path=/var/www/icons/
42 #wifi登录验证url 46 #wifi登录验证url
43 -wifi.login.url=http://192.168.103.230:8080/am/controller/portal/external/login  
  47 +wifi.login.url=http://192.168.103.230:8080/am/controller/portal/external/login
  48 +
  49 +gateway.domain.url=http://192.168.102.202:8080/gateway
  50 +
  51 +offline.shops.qrcodeurl=http://192.168.102.210:8080/portal-gateway
@@ -59,6 +59,11 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066 @@ -59,6 +59,11 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
59 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test 59 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
60 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== 60 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
61 61
  62 +jdbc.mysql.yhfrontcobar.username=yh_test
  63 +jdbc.mysql.yhfrontcobar.password=9nm0icOwt6bMHjMusIfMLw==
  64 +
  65 +jdbc.mysql.yhplatformcobar.username=yh_test
  66 +jdbc.mysql.yhplatformcobar.password=9nm0icOwt6bMHjMusIfMLw==
62 # yh_sns 67 # yh_sns
63 jdbc.mysql.yhsns.master=192.168.102.219:3306 68 jdbc.mysql.yhsns.master=192.168.102.219:3306
64 jdbc.mysql.yhsns.slave=192.168.102.219:3306 69 jdbc.mysql.yhsns.slave=192.168.102.219:3306
@@ -101,6 +106,14 @@ jdbc.mysql.yhsetting.slave=192.168.102.219:3306 @@ -101,6 +106,14 @@ jdbc.mysql.yhsetting.slave=192.168.102.219:3306
101 jdbc.mysql.yhsetting.username=yh_test 106 jdbc.mysql.yhsetting.username=yh_test
102 jdbc.mysql.yhsetting.password=9nm0icOwt6bMHjMusIfMLw== 107 jdbc.mysql.yhsetting.password=9nm0icOwt6bMHjMusIfMLw==
103 108
  109 +#yoho-message配置读写分离
  110 +jdbc.mysql.yhmessage.master=192.168.102.219:3306
  111 +jdbc.mysql.yhmessage.slave=192.168.102.219:3306
  112 +jdbc.mysql.yhmessage.username=yh_test
  113 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  114 +
  115 +readOnlyInSlave=false
  116 +
104 #yoho_sms 117 #yoho_sms
105 jdbc.mysql.yohosms.master=192.168.102.219:3306 118 jdbc.mysql.yohosms.master=192.168.102.219:3306
106 jdbc.mysql.yohosms.slave=192.168.102.219:3306 119 jdbc.mysql.yohosms.slave=192.168.102.219:3306
@@ -225,6 +238,12 @@ jdbc.mysql.yh_cms.slave=192.168.102.219:3306 @@ -225,6 +238,12 @@ jdbc.mysql.yh_cms.slave=192.168.102.219:3306
225 jdbc.mysql.yh_cms.username=yh_test 238 jdbc.mysql.yh_cms.username=yh_test
226 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw== 239 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
227 240
  241 +#yoho-message配置读写分离
  242 +jdbc.mysql.yhmessage.master=192.168.102.219:3306
  243 +jdbc.mysql.yhmessage.slave=192.168.102.219:3306
  244 +jdbc.mysql.yhmessage.username=yh_test
  245 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  246 +
228 #search-db 247 #search-db
229 jdbc.mysql.yhbsearch.datasources = yhb_search_2016 248 jdbc.mysql.yhbsearch.datasources = yhb_search_2016
230 jdbc.mysql.yhbsearch.master = 192.168.102.216:3306 249 jdbc.mysql.yhbsearch.master = 192.168.102.216:3306
@@ -279,6 +298,7 @@ jdbc.mysql.yhcommunity.username=yh_test @@ -279,6 +298,7 @@ jdbc.mysql.yhcommunity.username=yh_test
279 jdbc.mysql.yhcommunity.password=9nm0icOwt6bMHjMusIfMLw== 298 jdbc.mysql.yhcommunity.password=9nm0icOwt6bMHjMusIfMLw==
280 299
281 300
  301 +
282 #yh social 302 #yh social
283 jdbc.mysql.yhsocial.master=192.168.102.219:3306 303 jdbc.mysql.yhsocial.master=192.168.102.219:3306
284 jdbc.mysql.yhsocial.slave=192.168.102.219:3306 304 jdbc.mysql.yhsocial.slave=192.168.102.219:3306
@@ -318,7 +338,7 @@ readOnlyInSlave=true @@ -318,7 +338,7 @@ readOnlyInSlave=true
318 users.browse.expire＝7776000 338 users.browse.expire＝7776000
319 339
320 is_debug_enable = true 340 is_debug_enable = true
321 - 341 +crf.service.url=https://osprec-ci.crfchina.com
322 342
323 aliyun.accessid = mkb5KaMTUeAnfHI5 343 aliyun.accessid = mkb5KaMTUeAnfHI5
324 aliyun.bucket = yohotest 344 aliyun.bucket = yohotest
@@ -28,6 +28,10 @@ ios.keystore=/yoho_developer.p12 @@ -28,6 +28,10 @@ ios.keystore=/yoho_developer.p12
28 ios.password=666666 28 ios.password=666666
29 push.ios.custom.key=custom_content 29 push.ios.custom.key=custom_content
30 30
  31 +huawei.appkey=s5qoek5zsohcut3ki4lr9shlosmb0rvu
  32 +huawei.appid=10273886
  33 +huawei.password=123456
  34 +
31 #mongo 35 #mongo
32 mongo.inbox.host=192.168.50.69 36 mongo.inbox.host=192.168.50.69
33 mongo.inbox.port=27017 37 mongo.inbox.port=27017
@@ -17,7 +17,7 @@ canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops. @@ -17,7 +17,7 @@ canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops.
17 17
18 ##canal-operation 18 ##canal-operation
19 canal.destination.operation=operations 19 canal.destination.operation=operations
20 -canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def,yhb_operations.score_rule 20 +canal.subscribeChannel.operation=yhb_operations.score_skn_rule,yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def,yhb_operations.score_rule
21 21
22 ##cancal-erpproduct 22 ##cancal-erpproduct
23 canal.destination.erpproduct=erpproduct 23 canal.destination.erpproduct=erpproduct
@@ -63,4 +63,6 @@ cmbnetpay.payNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbpay_notif @@ -63,4 +63,6 @@ cmbnetpay.payNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbpay_notif
63 cmbnetpay.signNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbsign_notify 63 cmbnetpay.signNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbsign_notify
64 64
65 # unionmpos env: 00,production enviroment; 01,test enviroment 65 # unionmpos env: 00,production enviroment; 01,test enviroment
66 -unionmpos.env=00  
  66 +unionmpos.env=00
  67 +
  68 +offline.erp.portal.url = http://192.168.102.47:8080/portal-gateway
@@ -86,9 +86,10 @@ mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567 @@ -86,9 +86,10 @@ mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567
86 86
87 offline.shops.url = http://192.168.102.47:8098/shops/ 87 offline.shops.url = http://192.168.102.47:8098/shops/
88 88
89 -erp.shop.url = http://192.168.103.48:9098/erp-shop-web/ 89 +erp.shop.url = http://192.168.103.82:9098/erp-shop-web/
90 90
91 stock.req.url = http://192.168.13.3:7070/erp-gateway-web/finance/calc/calcSknLowestPrice 91 stock.req.url = http://192.168.13.3:7070/erp-gateway-web/finance/calc/calcSknLowestPrice
  92 +auth.user.req.url = http://192.168.103.82:9098/erp-shop-web/account/profile/queryAllAuth
92 93
93 platform.login.salt = yoho9646yoho9646 94 platform.login.salt = yoho9646yoho9646
94 95
@@ -15,5 +15,3 @@ platform.host = http://192.168.102.75:8088/platform @@ -15,5 +15,3 @@ platform.host = http://192.168.102.75:8088/platform
15 yohobuy.portal.gateway.env.namespace = portal-gateway 15 yohobuy.portal.gateway.env.namespace = portal-gateway
16 yohobuy.portal.gateway.env.serverport = 0 16 yohobuy.portal.gateway.env.serverport = 0
17 yohobuy.portal.gateway.env.webapphome = /home/test/yohobuy-portal-gateway/deploy 17 yohobuy.portal.gateway.env.webapphome = /home/test/yohobuy-portal-gateway/deploy
18 -  
19 -offline.shops.qrcodeurl=http://192.168.102.47:8080/portal-gateway  
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
  4 +
  5 +jdbc.mysql.yhbpromotion.master.password = input_password
  6 +jdbc.mysql.yhbpromotion.master.username = guang_res
4 7
5 promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087} 8 promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087}
6 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20} 9 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20}
7 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ] 10 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ]
8 11
9 -yohobuy.promotion.env.namespace = promotion  
10 -yohobuy.promotion.env.serverport = 5  
11 -yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 12 +promotion.sendCounpon.broadcast.rate = 0.9
12 13
13 -jdbc.mysql.yhbpromotion.master.password = input_password  
14 -jdbc.mysql.yhbpromotion.master.username = guang_res 14 +share_coupon_expiredTime = 4
15 15
16 -wechat.coupons.operators.email=jie.pang@yoho.cn 16 +wechat.coupons.operators.email = jie.pang@yoho.cn
17 17
18 -promotion.sendCounpon.broadcast.rate=0.9 18 +yohobuy.promotion.env.namespace = promotion
  19 +yohobuy.promotion.env.serverport = 5
  20 +yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
  7 +service.online.type = 1
  8 +service.online.type.h5 = http://m.yohobuy.com/service/im
  9 +
7 yoho.env.serverhome = /usr/local/${yoho.env.servertype} 10 yoho.env.serverhome = /usr/local/${yoho.env.servertype}
8 11
9 yohobuy.resources.env.namespace = resources 12 yohobuy.resources.env.namespace = resources
@@ -2,7 +2,11 @@ autoconfig.properties = sharedAutoconfig @@ -2,7 +2,11 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
4 4
5 -erp.domain = http://192.168.102.47:9098/erp-gateway-web 5 +erp.domain = http://192.168.102.47:9098/erp-gateway-web
  6 +
  7 +erp.rms.domain = http://192.168.102.47:9098/erp-rms-web
  8 +
  9 +gateway.domain.url = http://192.168.102.202:8080/gateway
6 10
7 jdbc.mysql.readonlyinslave = true 11 jdbc.mysql.readonlyinslave = true
8 12
@@ -11,14 +15,10 @@ password.aes.key = yoho9646yoho9646 @@ -11,14 +15,10 @@ password.aes.key = yoho9646yoho9646
11 platform.host = http://192.168.102.75:8088/platform 15 platform.host = http://192.168.102.75:8088/platform
12 16
13 portal.shops.dept.id = 62 17 portal.shops.dept.id = 62
14 -#店长角色  
15 -storemanageruser.role.id=88  
16 18
17 -#线下店超级管理员角色  
18 -supermanageruser.role.id=110  
19 -  
20 -#系统上线时间 时间戳  
21 -trend.tour.online.time=1480310438 19 +printer.ftp.password = 123456
  20 +printer.ftp.url = 172.16.2.243
  21 +printer.ftp.username = yoho
22 22
23 private.key.ipad = ad9fcda2e679cf9229e37feae2cdcf80 23 private.key.ipad = ad9fcda2e679cf9229e37feae2cdcf80
24 24
@@ -26,19 +26,24 @@ private_key_ipad = ad9fcda2e679cf9229e37feae2cdcf80 @@ -26,19 +26,24 @@ private_key_ipad = ad9fcda2e679cf9229e37feae2cdcf80
26 26
27 shop.login.salt = yoho9646yoho9646 27 shop.login.salt = yoho9646yoho9646
28 28
29 -yohobuy.shops.env.namespace = shops  
30 -yohobuy.shops.env.serverport = 8  
31 -yohobuy.shops.env.webapphome = /home/test/yohobuy-shops/deploy 29 +shop.wifi.img.path = /var/www/icons/
  30 +shop.wifi.img.url = http://192.168.102.47/icons/
  31 +
  32 +storeLockerManager.role.id = 182
32 33
33 -printer.ftp.url=172.16.2.243  
34 -printer.ftp.username=yoho  
35 -printer.ftp.password=123456 34 +storeRunner.role.id = 108
36 35
37 -protal.gateway.domain.url=http://192.168.102.47:8080/portal-gateway  
38 -gateway.domain.url=http://192.168.102.202:8080/gateway 36 +storemanageruser.role.id = 88
39 37
  38 +supermanageruser.role.id = 110
  39 +
  40 +trend.tour.online.time = 1480310438
  41 +
  42 +wifi.login.url = http://192.168.103.230:8080/am/controller/portal/external/login
  43 +
  44 +offline.shops.qrcodeurl=http://192.168.102.47:8080/portal-gateway
  45 +
  46 +yohobuy.shops.env.namespace = shops
  47 +yohobuy.shops.env.serverport = 8
  48 +yohobuy.shops.env.webapphome = /home/test/yohobuy-shops/deploy
40 49
41 -shop.wifi.img.url=http://192.168.102.47/icons/  
42 -shop.wifi.img.path=/var/www/icons/  
43 -#wifi登录验证url  
44 -wifi.login.url=http://192.168.103.230:8080/am/controller/portal/external/login  
@@ -2,7 +2,7 @@ activeTime = 86400 @@ -2,7 +2,7 @@ activeTime = 86400
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
6 6
7 bigdate.db.password = 9nm0icOwt6bMHjMusIfMLw== 7 bigdate.db.password = 9nm0icOwt6bMHjMusIfMLw==
8 bigdate.db.url = 192.168.102.219:3306 8 bigdate.db.url = 192.168.102.219:3306
@@ -10,6 +10,10 @@ bigdate.db.username = yh_test @@ -10,6 +10,10 @@ bigdate.db.username = yh_test
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +exclude.union.type = 100000000000349
  14 +
  15 +gateway.url = http://api.yoho.cn
  16 +
13 jdbc.mysql.readonlyinslave = true 17 jdbc.mysql.readonlyinslave = true
14 18
15 rabbit.mq.host = 192.168.102.162 19 rabbit.mq.host = 192.168.102.162
@@ -18,6 +22,17 @@ rabbit.mq.port = 32810 @@ -18,6 +22,17 @@ rabbit.mq.port = 32810
18 rabbit.mq.username = yoho 22 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 23 rabbit.mq.virtualHost = /yoho
20 24
  25 +sendSMS.password = 7jVEde87bLffoTnt6tGxmw==
  26 +
  27 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  28 +
  29 +union.host = 172.31.16.99
  30 +
21 yoho.unions.env.namespace = union 31 yoho.unions.env.namespace = union
22 yoho.unions.env.serverport = 8 32 yoho.unions.env.serverport = 8
23 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 33 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
  34 +#baidu tp config
  35 +baidu.tp.push.url=http://hoteltest.baidu.com/business/article_publish
  36 +baidu.app.id=1566454424306679
  37 +baidu.app.token=spdtkn_test12
  38 +baidu.union.type=1100001
@@ -46,6 +46,8 @@ jdbc.mysql.yohosms.password=9nm0icOwt6bMHjMusIfMLw== @@ -46,6 +46,8 @@ jdbc.mysql.yohosms.password=9nm0icOwt6bMHjMusIfMLw==
46 #yh_inbox配置读写分离 46 #yh_inbox配置读写分离
47 jdbc.mysql.yhinbox.username=yh_test 47 jdbc.mysql.yhinbox.username=yh_test
48 jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw== 48 jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw==
  49 +jdbc.mysql.yhmessage.username=yh_test
  50 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
49 51
50 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中 52 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中
51 jdbc.mysql.yohologs.username=yh_test 53 jdbc.mysql.yohologs.username=yh_test
@@ -146,6 +148,15 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066 @@ -146,6 +148,15 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
146 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test 148 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
147 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== 149 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
148 150
  151 +#yhb_promotion cms split db
  152 +jdbc.mysql.dncmssplit.master=192.168.102.202:8066
  153 +jdbc.mysql.dncmssplit.slave=192.168.102.202:8066
  154 +jdbc.mysql.dncmssplit.slave2=192.168.102.202:8066
  155 +jdbc.mysql.dncmssplit.slave3=192.168.102.202:8066
  156 +jdbc.mysql.dncmssplit.username=yh_test
  157 +jdbc.mysql.dncmssplit.password=9nm0icOwt6bMHjMusIfMLw==
  158 +
  159 +
149 160
150 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 161 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
151 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 162 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
@@ -176,6 +187,8 @@ jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3306 @@ -176,6 +187,8 @@ jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3306
176 #yh_inbox配置读写分离 187 #yh_inbox配置读写分离
177 jdbc.mysql.yhinbox.master=write.passport.yohoops.org:3306 188 jdbc.mysql.yhinbox.master=write.passport.yohoops.org:3306
178 jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306 189 jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306
  190 +jdbc.mysql.yhmessage.master=write.passport.yohoops.org:3306
  191 +jdbc.mysql.yhmessage.slave=read.passport.yohoops.org:3306
179 192
180 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中 193 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中
181 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306 194 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306
@@ -288,6 +301,12 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306 @@ -288,6 +301,12 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306
288 jdbc.mysql.yhlottery.username=yh_test 301 jdbc.mysql.yhlottery.username=yh_test
289 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw== 302 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
290 303
  304 +#yoho-message配置读写分离
  305 +jdbc.mysql.yhmessage.master=192.168.102.219:3306
  306 +jdbc.mysql.yhmessage.slave=192.168.102.219:3306
  307 +jdbc.mysql.yhmessage.username=yh_test
  308 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  309 +
291 readOnlyInSlave=false 310 readOnlyInSlave=false
292 311
293 # monogdb 312 # monogdb
@@ -503,4 +522,6 @@ jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw== @@ -503,4 +522,6 @@ jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw==
503 jdbc.mysql.yhnow.master=192.168.102.17:3306 522 jdbc.mysql.yhnow.master=192.168.102.17:3306
504 jdbc.mysql.yhnow.slave=192.168.102.17:3306 523 jdbc.mysql.yhnow.slave=192.168.102.17:3306
505 jdbc.mysql.yhnow.username=root 524 jdbc.mysql.yhnow.username=root
506 -jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==  
  525 +jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==
  526 +
  527 +erp.shop.web.url=http://192.168.103.82:9098
@@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true @@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 yoho.message.env.webapphome = /home/test/yoho-message/deploy
  10 +
  11 +mobile.limit.sendTimes=50
@@ -56,3 +56,4 @@ package.ticket.couponid=13570 @@ -56,3 +56,4 @@ package.ticket.couponid=13570
56 56
57 browse.service.url = http://192.168.102.31:8092/brower/ 57 browse.service.url = http://192.168.102.31:8092/brower/
58 58
  59 +offline.erp.portal.url = http://192.168.102.47:8080/portal-gateway
@@ -144,6 +144,23 @@ jdbc.mysql.yohopassportsplit.slave3=cobar2.yohoops.org:8066 @@ -144,6 +144,23 @@ jdbc.mysql.yohopassportsplit.slave3=cobar2.yohoops.org:8066
144 jdbc.mysql.yohopassportsplit.username=yh_test 144 jdbc.mysql.yohopassportsplit.username=yh_test
145 jdbc.mysql.yohopassportsplit.password=9nm0icOwt6bMHjMusIfMLw== 145 jdbc.mysql.yohopassportsplit.password=9nm0icOwt6bMHjMusIfMLw==
146 146
  147 +
  148 +
  149 +#yhb_promotion cms split db
  150 +
  151 +jdbc.mysql.dncmssplit.mastercobar1.yohoops.org:8066
  152 +jdbc.mysql.dncmssplit.slave=cobar2.yohoops.org:8066
  153 +jdbc.mysql.dncmssplit.slave2=cobar2.yohoops.org:8066
  154 +jdbc.mysql.dncmssplit.slave3=cobar2.yohoops.org:8066
  155 +jdbc.mysql.dncmssplit.username=yh_test
  156 +jdbc.mysql.dncmssplit.password=9nm0icOwt6bMHjMusIfMLw==
  157 +
  158 +jdbc.mysql.yhfrontcobar.username=yh_test
  159 +jdbc.mysql.yhfrontcobar.password=9nm0icOwt6bMHjMusIfMLw==
  160 +
  161 +jdbc.mysql.yhplatformcobar.username=yh_test
  162 +jdbc.mysql.yhplatformcobar.password=9nm0icOwt6bMHjMusIfMLw==
  163 +
147 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 164 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
148 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 165 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
149 166
@@ -464,4 +481,6 @@ exhibition.ticket.couponid=13272 @@ -464,4 +481,6 @@ exhibition.ticket.couponid=13272
464 package.ticket.couponid=13270 481 package.ticket.couponid=13270
465 package.ticket.more.couponid=13268 482 package.ticket.more.couponid=13268
466 483
467 -default.http.type = http  
  484 +default.http.type = http
  485 +
  486 +erp.shop.web.url=http://192.168.103.82:9098
@@ -4,8 +4,6 @@ autoconfig.properties = sharedAutoconfig @@ -4,8 +4,6 @@ autoconfig.properties = sharedAutoconfig
4 4
5 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 5 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
6 6
7 -browse.service.url = http://192.168.102.27:8092/brower/  
8 -  
9 degrade_articleNotice_level = 0 7 degrade_articleNotice_level = 0
10 degrade_complaintsCount_level = 0 8 degrade_complaintsCount_level = 0
11 degrade_complaintsList_level = 0 9 degrade_complaintsList_level = 0
@@ -21,48 +19,23 @@ degrade_userHabits_level = 0 @@ -21,48 +19,23 @@ degrade_userHabits_level = 0
21 19
22 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 20 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
23 21
24 -erp.shops.url = http://192.168.10.131:8082/erp-gateway-web/stock/get_stock  
25 -  
26 -erp.shops.batch.url = http://192.168.10.131:8082/erp-gateway-web/stock/get_batch_stock  
27 -  
28 file.uploadTempDir = /Data 22 file.uploadTempDir = /Data
29 23
30 -is_checksession_enable = false 24 +is_checksession_enable = true
31 is_debug_enable = false 25 is_debug_enable = false
32 26
33 -message.inboxNum.expire = 120 27 +message.inboxNum.expire = 10
34 28
35 password.aes.key = yoho9646yoho9646 29 password.aes.key = yoho9646yoho9646
36 30
37 qq.notifyurl = http://service.yoho.cn/payment/qqpay_notify 31 qq.notifyurl = http://service.yoho.cn/payment/qqpay_notify
38 32
39 -shops.service.url = http://192.168.102.47:8098/shops/  
40 -  
41 unionpay.notifyurl = https://service.yoho.cn/payment/unionpay_newnotify 33 unionpay.notifyurl = https://service.yoho.cn/payment/unionpay_newnotify
42 34
43 -users.browse.appVersion = 4.1.0.***  
44 -users.browse.expire = 7776000  
45 -users.browse.numPerUser = 200  
46 -users.browse.sync = true  
47 -  
48 -wechat.app.newnotifyurl = http://service.yoho.cn/payment/weixin_notify  
49 -wechat.app.notifyurl = http://service.yoho.cn/payment/wechat_notify 35 +wechat.app.notifyurl = http://service.yoho.cn/payment/wechat_notify
50 36
51 wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify 37 wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify
52 38
53 yoho.gateway.env.namespace = gateway 39 yoho.gateway.env.namespace = gateway
54 yoho.gateway.env.serverport = 0 40 yoho.gateway.env.serverport = 0
55 yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy 41 yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
56 -  
57 -line.shops.url = http://192.168.102.47:8098/shops/  
58 -erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock  
59 -portalGateway.service.url = http://192.168.102.210:8080/portal-gateway  
60 -platform.service.url=http://192.1638.102.202:8088/platform  
61 -  
62 -#photoSearch  
63 -photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47  
64 -photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4  
65 -photoSearch.service.id=rdbehn3x  
66 -login.skip.modify.weakPwd=Y  
67 -  
68 -  
@@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true @@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 yoho.message.env.webapphome = /home/test/yoho-message/deploy
  10 +
  11 +mobile.limit.sendTimes=50
@@ -2,22 +2,27 @@ autoconfig.properties = sharedAutoconfig @@ -2,22 +2,27 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
5 -crf.service.url = https://osprec-ci.crfchina.com  
6 -  
7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
8 6
  7 +diff.base.flag = 1
  8 +
9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
10 10
  11 +invite.code.activity.id = 2024
  12 +invite.code.url = https://union.yoho.cn/union/app-downloads.html?union_type=100000000005441
  13 +
11 jdbc.mysql.readonlyinslave = true 14 jdbc.mysql.readonlyinslave = true
12 15
13 register.image.onoff = off 16 register.image.onoff = off
14 17
15 register.new.user.page.probability = 9 18 register.new.user.page.probability = 9
16 19
17 -uic.service.url = http://uic.yohoops.org:8096/uic 20 +uic.service.url = http://uic.yohoops.org/uic
18 21
19 union.domain.url = http://webunion_tl.yohobuy.com/union 22 union.domain.url = http://webunion_tl.yohobuy.com/union
20 23
  24 +user.diff.place.login.message = \\u5c0a\\u656c\\u7684\\u7528\\u6237\\uff0c\\u7cfb\\u7edf\\u68c0\\u6d4b\\u5230\\u60a8\\u7684\\u8d26\\u53f7\\u5df2\\u5728\\u5f02\\u5730\\u767b\\u5f55\\u3002\\u4e3a\\u4fdd\\u8bc1\\u5e10\\u53f7\\u5b89\\u5168\\uff0c\\u5982\\u975e\\u672c\\u4eba\\u64cd\\u4f5c\\uff0c\\u5efa\\u8bae\\u60a8\\u5c3d\\u5feb\\u4fee\\u6539\\u767b\\u5f55\\u5bc6\\u7801\\u3002\\u656c\\u8bf7\\u63d0\\u9ad8\\u8b66\\u60d5\\uff0c\\u8c28\\u9632\\u8bc8\\u9a97\\uff01
  25 +
21 user.session.expire = 10080 26 user.session.expire = 10080
22 27
23 users.base.isUic = false 28 users.base.isUic = false
@@ -25,12 +30,9 @@ users.base.isUic = false @@ -25,12 +30,9 @@ users.base.isUic = false
25 users.browse.sync = true 30 users.browse.sync = true
26 31
27 users.yoho.default_is_bind = Y 32 users.yoho.default_is_bind = Y
28 -users.yoho.redpacket = Y  
29 33
30 users.yohocoin = true 34 users.yohocoin = true
31 35
32 -users.yohocoin.dilute = true  
33 -  
34 verify_student_flag = false 36 verify_student_flag = false
35 37
36 yoho.users.env.namespace = users 38 yoho.users.env.namespace = users
@@ -42,6 +44,3 @@ zmxy_contract_flag = si201604080002520001 @@ -42,6 +44,3 @@ zmxy_contract_flag = si201604080002520001
42 zmxy_rsa_mySK = MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIjfNWUXqCNtlaBFpv4KrBTVQb4btX9Gi+UPuz7AMvwbSXmtIxV2awkz4Rg0Q3PtTkuAUpuW958u3uNxypcsCJD3o4qphgqSMVpe33bJ1bZaeL/h8WT9KNBiIxGsYQco44JbJkjrHTAI3Wt+RNhHyn+nKI9wCaeYPCY7ZipVpmL3AgMBAAECgYBn/BxWx1hIQjMQ5pnuGzGNSk9+HRMQtQoHZqI9FEwn2JtDw9QJtEOxZCa4+svcQQfguIcKCfHqj/NqHMNrglqmmJhKrut+ilUt8rqJCmvRSh8AdG7ZnqzxQYdTrrEEKgO932WqPOI98X2H+2cPzLfIOgxN7FhCDg+lVi4CBdfJ8QJBANosNf2b4f50AgAkstAKX1Hqqsb+k5L5reoF9e6eQufPXIpSrbME3cETyRMMLKX+YfhHpv66fpfg0X4JiHZIpdsCQQCgmmPNWs2nbvHY3Eo3xuYs/KJRIltgYaAd9+CCjpCTbU21afqyGkK7zibHfLADh+m5GOkOZ5IFn5Alhg1NQNgVAkBTX/PeEDVEPWcKUPv4nw4gSvKqi10wHLSGq3J5lwdweQEfZ0s0D5cDEyGTYuKpKNadwBwkWnbIacUFSnVY5phjAkAt4Ix73+F5X77kROFKl52u4if350mU+a5EgUd35AO2qXWWSgTcFZZUkaoQODULfSqtvkjs3Xcf9hm2LlnkZI6VAkEAl8+0+a6Rjz119mxJXy9JWKTbWirhja+ijyndLVEAmxTYjWTuNKbRdTYe59ekRYhmMWkiKzggP+PKjXHCHV6eRQ== 44 zmxy_rsa_mySK = MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIjfNWUXqCNtlaBFpv4KrBTVQb4btX9Gi+UPuz7AMvwbSXmtIxV2awkz4Rg0Q3PtTkuAUpuW958u3uNxypcsCJD3o4qphgqSMVpe33bJ1bZaeL/h8WT9KNBiIxGsYQco44JbJkjrHTAI3Wt+RNhHyn+nKI9wCaeYPCY7ZipVpmL3AgMBAAECgYBn/BxWx1hIQjMQ5pnuGzGNSk9+HRMQtQoHZqI9FEwn2JtDw9QJtEOxZCa4+svcQQfguIcKCfHqj/NqHMNrglqmmJhKrut+ilUt8rqJCmvRSh8AdG7ZnqzxQYdTrrEEKgO932WqPOI98X2H+2cPzLfIOgxN7FhCDg+lVi4CBdfJ8QJBANosNf2b4f50AgAkstAKX1Hqqsb+k5L5reoF9e6eQufPXIpSrbME3cETyRMMLKX+YfhHpv66fpfg0X4JiHZIpdsCQQCgmmPNWs2nbvHY3Eo3xuYs/KJRIltgYaAd9+CCjpCTbU21afqyGkK7zibHfLADh+m5GOkOZ5IFn5Alhg1NQNgVAkBTX/PeEDVEPWcKUPv4nw4gSvKqi10wHLSGq3J5lwdweQEfZ0s0D5cDEyGTYuKpKNadwBwkWnbIacUFSnVY5phjAkAt4Ix73+F5X77kROFKl52u4if350mU+a5EgUd35AO2qXWWSgTcFZZUkaoQODULfSqtvkjs3Xcf9hm2LlnkZI6VAkEAl8+0+a6Rjz119mxJXy9JWKTbWirhja+ijyndLVEAmxTYjWTuNKbRdTYe59ekRYhmMWkiKzggP+PKjXHCHV6eRQ==
43 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB 45 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
44 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do 46 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
45 -user.diff.place.login.message=\u5c0a\u656c\u7684\u7528\u6237\uff0c\u7cfb\u7edf\u68c0\u6d4b\u5230\u60a8\u7684\u8d26\u53f7\u5df2\u5728\u5f02\u5730\u767b\u5f55\u3002\u4e3a\u4fdd\u8bc1\u5e10\u53f7\u5b89\u5168\uff0c\u5982\u975e\u672c\u4eba\u64cd\u4f5c\uff0c\u5efa\u8bae\u60a8\u5c3d\u5feb\u4fee\u6539\u767b\u5f55\u5bc6\u7801\u3002\u656c\u8bf7\u63d0\u9ad8\u8b66\u60d5\uff0c\u8c28\u9632\u8bc8\u9a97\uff01  
46 -diff.base.flag=1  
47 -  
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties  
4 -  
5 -erp.order.change.sync.type = MQ  
6 -erp.order.close.sync.type = MQ  
7 -erp.order.create.url = http://portal.admin.yohobuy.com/api/orderform/create  
8 -erp.order.express.sync.type = MQ  
9 -erp.order.refund.sync.type = MQ  
10 -erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status  
11 -  
12 -applepay.notifyurl = http://service-test2.yohops.com:9999/payment/applepay_notify  
13 -qq.notifyurl = http://service-test2.yohops.com:9999/payment/qqpay_notify  
14 -unionpay.notifyurl = http://service-test2.yohops.com:9999/payment/unionpay_newnotify  
15 -wechat.app.newnotifyurl = http://service-test2.yohops.com:9999/payment/weixin_notify  
16 -wechat.app.notifyurl = http://service-test2.yohops.com:9999/payment/wechat_noti  
17 -alipay.notifyurl = http://service-test2.yohops.com:9999/payment/alipay_notify 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
18 4
19 java.logs.home = /Data/logs 5 java.logs.home = /Data/logs
20 6
21 -jdbc.mysql.readonlyinslave = true 7 +jdbc.mysql.readonlyinslave = false
22 8
23 order.codpay.lock.duration = 1440 9 order.codpay.lock.duration = 1440
24 10
25 yohobuy.order.env.namespace = order 11 yohobuy.order.env.namespace = order
26 yohobuy.order.env.serverport = 4 12 yohobuy.order.env.serverport = 4
27 yohobuy.order.env.webapphome = /home/test/yohobuy-order/deploy 13 yohobuy.order.env.webapphome = /home/test/yohobuy-order/deploy
28 -  
29 -  
30 -erp.order.autoCancel.switch.key = N  
31 -  
32 -sales.tax.payers = 9132010058047114XR  
33 -ws.fp.url=https://58.251.156.167:8999/fpt_dsqz/services/DZFPService?wsdl  
34 -invoice.appid = 1b518222b5bbb9c5abe17442d63150978609e5ad27fd594886e3b7a8bcd50e5a  
35 -seller.name = \u7535\u5b50\u53d1\u7968\u6d4b\u8bd5  
36 -seller.contact.info=\u5357\u4eac\u5e02\u5efa\u90ba\u533a\u5609\u9675\u6c5f\u4e1c\u8857\u0031\u0038\u53f7\u0030\u0035\u5e62\u0031\u0037\u3001\u0031\u0038\u5c42 025-87781000  
37 -invoice.soap.receiveTimeout = 300000  
38 -invoice.soap.connectionTimeout = 300000  
39 -  
40 -degrade.buylimit.query.enable=true  
41 -degrade.vip.query.enable=true  
42 -degrade.yohocoin.query.enable=true  
43 -degrade.redenvelopes.query.enable=true  
44 -degrade.coupons.queryNotUseCoupons.enable=true  
45 -degrade.product.query.enable=true  
46 -degrade.address.query.enable=false  
47 -  
48 -# 优惠券ID  
49 -# 展览票券ID  
50 -exhibition.ticket.couponid=13576  
51 -# 套票券ID  
52 -package.ticket.couponid=13570  
53 -  
54 -browse.service.url = http://192.168.102.27:8092/brower/  
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = false 5 jdbc.mysql.readonlyinslave = false
6 6
7 -rabbitAddress = 192.168.102.162:32810  
8 -  
9 yohobuy.product.env.namespace = product 7 yohobuy.product.env.namespace = product
10 yohobuy.product.env.serverport = 3 8 yohobuy.product.env.serverport = 3
11 yohobuy.product.env.webapphome = /home/test/yohobuy-product/deploy 9 yohobuy.product.env.webapphome = /home/test/yohobuy-product/deploy
@@ -2,20 +2,15 @@ autoconfig.properties = sharedAutoconfig @@ -2,20 +2,15 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
5 -jdbc.mysql.yhbpromotion.master.password = input_password  
6 -jdbc.mysql.yhbpromotion.master.username = guang_res  
7 -  
8 promoation.invite.failCoupon = {\\"old\\":17591,\\"fail\\":17595} 5 promoation.invite.failCoupon = {\\"old\\":17591,\\"fail\\":17595}
9 promoation.invite.newCouponMap = {\\"17593\\":15,\\"17597\\":15,\\"17599\\":15,\\"17601\\":15,\\"17603\\":15} 6 promoation.invite.newCouponMap = {\\"17593\\":15,\\"17597\\":15,\\"17599\\":15,\\"17601\\":15,\\"17603\\":15}
10 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ] 7 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ]
11 8
12 -promotion.sendCounpon.broadcast.rate = 0.9  
13 -  
14 share_coupon_expiredTime = 4 9 share_coupon_expiredTime = 4
15 10
16 -wechat.coupons.operators.email = chao.geng@yoho.cn  
17 -wechat.coupons.operators.mobile = 13770338135  
18 -  
19 yohobuy.promotion.env.namespace = promotion 11 yohobuy.promotion.env.namespace = promotion
20 yohobuy.promotion.env.serverport = 5 12 yohobuy.promotion.env.serverport = 5
21 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 13 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy
  14 +
  15 +
  16 +promotion.sendCounpon.broadcast.rate=0.5
@@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
  5 +invite.code.activity.id = 2024
  6 +
5 jdbc.mysql.readonlyinslave = false 7 jdbc.mysql.readonlyinslave = false
6 8
7 service.online.type = 1 9 service.online.type = 1
@@ -10,4 +12,3 @@ service.online.type.h5 = http://m.yohobuy.com/service/im @@ -10,4 +12,3 @@ service.online.type.h5 = http://m.yohobuy.com/service/im
10 yohobuy.resources.env.namespace = resources 12 yohobuy.resources.env.namespace = resources
11 yohobuy.resources.env.serverport = 7 13 yohobuy.resources.env.serverport = 7
12 yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy 14 yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy
13 -yoho.search.url = http://192.168.102.216:8080/yohosearch  
@@ -44,3 +44,9 @@ union.host = 172.31.16.99 @@ -44,3 +44,9 @@ union.host = 172.31.16.99
44 yoho.unions.env.namespace = union 44 yoho.unions.env.namespace = union
45 yoho.unions.env.serverport = 8 45 yoho.unions.env.serverport = 8
46 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 46 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
  47 +
  48 +#baidu tp config
  49 +baidu.tp.push.url=http://hoteltest.baidu.com/business/article_publish
  50 +baidu.app.id=1566454424306679
  51 +baidu.app.token=spdtkn_test12
  52 +baidu.union.type=1100001
@@ -121,32 +121,38 @@ jdbc.mysql.erppassport.password=9nm0icOwt6bMHjMusIfMLw== @@ -121,32 +121,38 @@ jdbc.mysql.erppassport.password=9nm0icOwt6bMHjMusIfMLw==
121 # ================ 121 # ================
122 122
123 # yh_orders db split 123 # yh_orders db split
124 -jdbc.mysql.yhorderssplit.master=192.168.102.202:8066  
125 -jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066  
126 -jdbc.mysql.yhorderssplit.slave2=192.168.102.202:8066  
127 -jdbc.mysql.yhorderssplit.slave3=192.168.102.202:8066 124 +jdbc.mysql.yhorderssplit.master=cobar1.yohoops.org:8066
  125 +jdbc.mysql.yhorderssplit.slave=cobar1.yohoops.org:8066
  126 +jdbc.mysql.yhorderssplit.slave2=cobar1.yohoops.org:8066
  127 +jdbc.mysql.yhorderssplit.slave3=cobar1.yohoops.org:8066
128 jdbc.mysql.yhorderssplit.username=yh_test 128 jdbc.mysql.yhorderssplit.username=yh_test
129 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw== 129 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
130 130
131 131
132 #yhb_promotion_split db split 132 #yhb_promotion_split db split
133 -jdbc.mysql.yhbpromotionsplit.master=192.168.102.202:8066  
134 -jdbc.mysql.yhbpromotionsplit.slave=192.168.102.202:8066  
135 -jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066  
136 -jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066 133 +jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
  134 +jdbc.mysql.yhbpromotionsplit.slave=cobar1.yohoops.org:8066
  135 +jdbc.mysql.yhbpromotionsplit.slave2=cobar1.yohoops.org:8066
  136 +jdbc.mysql.yhbpromotionsplit.slave3=cobar1.yohoops.org:8066
137 jdbc.mysql.yhbpromotionsplit.username=yh_test 137 jdbc.mysql.yhbpromotionsplit.username=yh_test
138 jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw== 138 jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
139 -jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066  
140 -jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066  
141 139
142 140
143 #yhb_promotion platform split db 141 #yhb_promotion platform split db
144 -jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066  
145 -jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066 142 +jdbc.mysql.yhbpromotionsplitplatform.master=cobar1.yohoops.org:8066
  143 +jdbc.mysql.yhbpromotionsplitplatform.slave=cobar1.yohoops.org:8066
146 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test 144 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
147 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== 145 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
148 146
149 147
  148 +
  149 +jdbc.mysql.yhfrontcobar.username=yh_test
  150 +jdbc.mysql.yhfrontcobar.password=9nm0icOwt6bMHjMusIfMLw==
  151 +
  152 +jdbc.mysql.yhplatformcobar.username=yh_test
  153 +jdbc.mysql.yhplatformcobar.password=9nm0icOwt6bMHjMusIfMLw==
  154 +
  155 +
150 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 156 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
151 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 157 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
152 158
@@ -288,6 +294,13 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306 @@ -288,6 +294,13 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306
288 jdbc.mysql.yhlottery.username=yh_test 294 jdbc.mysql.yhlottery.username=yh_test
289 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw== 295 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
290 296
  297 +
  298 +#yoho-message配置读写分离
  299 +jdbc.mysql.yhmessage.master=192.168.102.219:3306
  300 +jdbc.mysql.yhmessage.slave=192.168.102.219:3306
  301 +jdbc.mysql.yhmessage.username=yh_test
  302 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  303 +
291 readOnlyInSlave=false 304 readOnlyInSlave=false
292 305
293 # monogdb 306 # monogdb
@@ -516,4 +529,4 @@ jdbc.mysql.yhcms.slave=192.168.102.17:3306 @@ -516,4 +529,4 @@ jdbc.mysql.yhcms.slave=192.168.102.17:3306
516 jdbc.mysql.yhcms.username=root 529 jdbc.mysql.yhcms.username=root
517 jdbc.mysql.yhcms.password=Z5BMngayHLUxyWLSv6+koA== 530 jdbc.mysql.yhcms.password=Z5BMngayHLUxyWLSv6+koA==
518 531
519 - 532 +erp.shop.web.url=http://192.168.103.82:9098
@@ -55,7 +55,7 @@ erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock @@ -55,7 +55,7 @@ erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
55 portalGateway.service.url = http://192.168.102.210:8080/portal-gateway 55 portalGateway.service.url = http://192.168.102.210:8080/portal-gateway
56 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock 56 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
57 57
58 -platform.service.url=http://192.1638.102.48:8088/platform 58 +platform.service.url=http://192.168.102.48:8088/platform
59 59
60 #photoSearch 60 #photoSearch
61 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47 61 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
@@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true @@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 yoho.message.env.webapphome = /home/test/yoho-message/deploy
  10 +
  11 +mobile.limit.sendTimes=50
@@ -10,6 +10,10 @@ yohonow.env.namespace = yohonow @@ -10,6 +10,10 @@ yohonow.env.namespace = yohonow
10 yohonow.env.serverport = 1 10 yohonow.env.serverport = 1
11 yohonow.env.webapphome = /home/test/yoho-now/deploy 11 yohonow.env.webapphome = /home/test/yoho-now/deploy
12 12
  13 +qiniu.domain=http://img01.yohoboys.com
  14 +qiniu.accesskey=cY9B5ZgON_7McTS5zV5nTeRyQ98MOcVD7W4eGVbE
  15 +qiniu.secretkey=RduqgmK7cAtaQvdIa1ax_zzmMsnv9ac-Ka0uF6wG
  16 +qiniu.bucket=cmsimg01
13 17
14 boy.cn.site.url=http://newboys.test.yoho.cn 18 boy.cn.site.url=http://newboys.test.yoho.cn
15 girl.cn.site.url=http://newgirls.test.yoho.cn 19 girl.cn.site.url=http://newgirls.test.yoho.cn
@@ -10,7 +10,7 @@ is_debug_enable = false @@ -10,7 +10,7 @@ is_debug_enable = false
10 10
11 platform.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login 11 platform.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login
12 12
13 -social.post.shareUrl = http://social-test3.yohops.com:8095/social/share/index.html 13 +social.domain = http://social-test3.yohops.com:8095
14 uic.service.url = http://uic.yohoops.org:8096/uic/ 14 uic.service.url = http://uic.yohoops.org:8096/uic/
15 #uic.service.url = http://192.168.102.31:8096/uic/ 15 #uic.service.url = http://192.168.102.31:8096/uic/
16 16
@@ -12,7 +12,7 @@ execute.timetask.host = 192.168.90.9 @@ -12,7 +12,7 @@ execute.timetask.host = 192.168.90.9
12 12
13 gateway.url = http://api.yoho.cn 13 gateway.url = http://api.yoho.cn
14 14
15 -is_debug_enable = false 15 +is_debug_enable = true
16 16
17 jdbc.mysql.readonlyinslave = true 17 jdbc.mysql.readonlyinslave = true
18 18
@@ -33,3 +33,5 @@ userday.open.day = 24 @@ -33,3 +33,5 @@ userday.open.day = 24
33 yoho.activity.env.namespace = activity 33 yoho.activity.env.namespace = activity
34 yoho.activity.env.serverport = 0 34 yoho.activity.env.serverport = 0
35 yoho.activity.env.webapphome = /home/test/yohobuy-activity/deploy 35 yoho.activity.env.webapphome = /home/test/yohobuy-activity/deploy
  36 +
  37 +yoho.crm.online.dns=http://192.168.102.48:8093/crm/
@@ -56,3 +56,4 @@ package.ticket.couponid=13570 @@ -56,3 +56,4 @@ package.ticket.couponid=13570
56 56
57 browse.service.url = http://192.168.103.74:8092/brower/ 57 browse.service.url = http://192.168.103.74:8092/brower/
58 58
  59 +offline.erp.portal.url = http://192.168.102.47:8080/portal-gateway
@@ -52,7 +52,7 @@ execute.update_product_price.host = 192.168.102.48 @@ -52,7 +52,7 @@ execute.update_product_price.host = 192.168.102.48
52 file.image.gif.size = 2621440 52 file.image.gif.size = 2621440
53 file.image.size = 5120000 53 file.image.size = 5120000
54 54
55 -file.maxsize = 50000000 55 +file.maxsize = 209715200
56 file.saveDir = /Data/images 56 file.saveDir = /Data/images
57 file.uploadMalongImgDir = /Data/malong 57 file.uploadMalongImgDir = /Data/malong
58 file.uploadTempDir = /Data/images 58 file.uploadTempDir = /Data/images
@@ -32,3 +32,9 @@ union.host = 172.31.16.99 @@ -32,3 +32,9 @@ union.host = 172.31.16.99
32 yoho.unions.env.namespace = union 32 yoho.unions.env.namespace = union
33 yoho.unions.env.serverport = 8 33 yoho.unions.env.serverport = 8
34 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 34 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
  35 +
  36 +#baidu tp config
  37 +baidu.tp.push.url=http://hoteltest.baidu.com/business/article_publish
  38 +baidu.app.id=1566454424306679
  39 +baidu.app.token=spdtkn_test12
  40 +baidu.union.type=1100001
@@ -21,10 +21,11 @@ crontab.message.systemMsgProduce=15 */1 * * * ? @@ -21,10 +21,11 @@ crontab.message.systemMsgProduce=15 */1 * * * ?
21 crontab.majia.aotuAddMajia=30 */30 * * * ? 21 crontab.majia.aotuAddMajia=30 */30 * * * ?
22 mars.platform.task.switch=true 22 mars.platform.task.switch=true
23 crontab.majia.autoUpdateMajiaFavNum=0 */1 * * * ? 23 crontab.majia.autoUpdateMajiaFavNum=0 */1 * * * ?
  24 +crontab.message.crmMsgProduce=15 */1 * * * ?
24 25
25 #yoho social context 26 #yoho social context
26 yoho.social.context=http://192.168.102.52:8095/social 27 yoho.social.context=http://192.168.102.52:8095/social
27 28
28 -store.follower.push.message.period=30 29 +store.follower.push.message.period=600
29 30
30 -crontab.user.invite.checkStatus=0 0 */1 * * ?  
  31 +crontab.user.invite.checkStatus=0 0/1 * * * ?
  1 +yoho.logs.basedir=/Data/logs
  2 +
  3 +jdbc.mysql.readonlyinslave=true
  4 +autoconfig.properties = sharedAutoconfig
  5 +
  6 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  7 +
  8 +yoho.env.namespace = yohonow-platform
  9 +yoho.env.serverport = 61
  10 +yoho.env.webapphome = /home/test/yohonow-platform/deploy
  11 +
  12 +redis.proxy.address=192.168.102.17
  13 +redis.proxy.port=6380
  14 +redis.readonly.proxy.port=6380
  15 +redis.readonly.proxy.address=192.168.102.17
  16 +redis.notsync.twemproxy.addresses=192.168.102.17:6380
  17 +
  18 +qiniu.domain=http://img01.yohoboys.com
  19 +qiniu.accesskey=cY9B5ZgON_7McTS5zV5nTeRyQ98MOcVD7W4eGVbE
  20 +qiniu.secretkey=RduqgmK7cAtaQvdIa1ax_zzmMsnv9ac-Ka0uF6wG
  21 +qiniu.bucket=cmsimg01
  22 +
  23 +uic.api.host=http://192.168.102.48:8096/uic
  24 +now.platform.task.switch=true
  25 +
  26 +#yoho social context
  27 +yoho.social.context=http://192.168.102.52:8095/social
  28 +ezine.api.url=http://ezine.myoho.net/index.php
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 yoho.cms_push.env.namespace = cms_push 4 yoho.cms_push.env.namespace = cms_push
5 yoho.cms_push.env.serverport = 6 5 yoho.cms_push.env.serverport = 6
6 -yoho.cms_push.env.webapphome = /home/test/cms_push/deploy 6 +yoho.cms_push.env.webapphome = /home/test/deploy2/cms_push/deploy/target
7 7
8 #db_pool_config 8 #db_pool_config
9 db.default.initialSize=10 9 db.default.initialSize=10
@@ -471,3 +471,11 @@ package.ticket.couponid=13270 @@ -471,3 +471,11 @@ package.ticket.couponid=13270
471 package.ticket.more.couponid=13268 471 package.ticket.more.couponid=13268
472 472
473 default.http.type = http 473 default.http.type = http
  474 +
  475 +erp.shop.web.url=http://192.168.103.82:9098
  476 +
  477 +#yoho-message配置读写分离
  478 +jdbc.mysql.yhmessage.master=192.168.103.36:3306
  479 +jdbc.mysql.yhmessage.slave=192.168.103.36:3306
  480 +jdbc.mysql.yhmessage.username=yh_test
  481 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 is.do.rebuild.index = false 5 is.do.rebuild.index = false
6 is.do.rebuild.tbl.index = false 6 is.do.rebuild.tbl.index = false
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 gateway.api.url = http://api.gray.yohops.com/ 5 gateway.api.url = http://api.gray.yohops.com/
6 6
@@ -8,4 +8,4 @@ uic_userInfoRest_enable = false @@ -8,4 +8,4 @@ uic_userInfoRest_enable = false
8 8
9 yoho.uic.env.namespace = uic 9 yoho.uic.env.namespace = uic
10 yoho.uic.env.serverport = 6 10 yoho.uic.env.serverport = 6
11 -yoho.uic.env.webapphome = /home/test/uic/deploy 11 +yoho.uic.env.webapphome = /home/test/deploy2/uic/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 java.logs.home = /Data/logs 5 java.logs.home = /Data/logs
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.dashboard.env.namespace = yohodashboard 5 yoho.dashboard.env.namespace = yohodashboard
6 yoho.dashboard.env.productmode = PRODUCT 6 yoho.dashboard.env.productmode = PRODUCT
@@ -2,7 +2,7 @@ applepay.notifyurl = http://service-test4.yohops.com:9999/payment/applepay_noti @@ -2,7 +2,7 @@ applepay.notifyurl = http://service-test4.yohops.com:9999/payment/applepay_noti
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 browse.blockingqueue.maxSize = 20000 7 browse.blockingqueue.maxSize = 20000
8 8
@@ -55,5 +55,5 @@ wechat.wap.notifyurl = http://service-test4.yohops.com:9999/payment/wechatwap_n @@ -55,5 +55,5 @@ wechat.wap.notifyurl = http://service-test4.yohops.com:9999/payment/wechatwap_n
55 55
56 yoho.gateway.env.namespace = gateway 56 yoho.gateway.env.namespace = gateway
57 yoho.gateway.env.serverport = 0 57 yoho.gateway.env.serverport = 0
58 -yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy 58 +yoho.gateway.env.webapphome = /home/test/deploy2/yoho-gateway/deploy/target
59 platform.service.url=http://192.168.102.59:8088/platform 59 platform.service.url=http://192.168.102.59:8088/platform
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 -yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 +yoho.message.env.webapphome = /home/test/deploy2/yoho-message/deploy/target
  10 +
  11 +mobile.limit.sendTimes=5000
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 db.batch.size = 100000 4 db.batch.size = 100000
5 ios.default.size = 1000 5 ios.default.size = 1000
@@ -8,7 +8,7 @@ rabbit_vhost = yoho @@ -8,7 +8,7 @@ rabbit_vhost = yoho
8 8
9 yoho.push.env.namespace = push 9 yoho.push.env.namespace = push
10 yoho.push.env.serverport = 9 10 yoho.push.env.serverport = 9
11 -yoho.push.env.webapphome = /home/test/yoho-push/deploy 11 +yoho.push.env.webapphome = /home/test/deploy2/yoho-push/deploy/target
12 12
13 ##push redis 13 ##push redis
14 redis.push.address=192.168.102.211 14 redis.push.address=192.168.102.211
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.search.adaptor.env.serverport = 5 5 yoho.search.adaptor.env.serverport = 5
6 -yoho.search.adaptor.env.webapphome = /home/test/yoho-search-adaptor/deploy 6 +yoho.search.adaptor.env.webapphome = /home/test/deploy2/yoho-search-adaptor/deploy/target
7 yoho.search.adaptor.env.namespace = yoho-search-adaptor 7 yoho.search.adaptor.env.namespace = yoho-search-adaptor
8 8
9 tbl.product.url = http://test.soa.global.yohobuy.com/product/api/v1/detail/ 9 tbl.product.url = http://test.soa.global.yohobuy.com/product/api/v1/detail/
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/dev/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 yoho.search.consumer.env.namespace = search-consumer 4 yoho.search.consumer.env.namespace = search-consumer
5 yoho.search.consumer.env.serverport = 8 5 yoho.search.consumer.env.serverport = 8
6 -yoho.search.consumer.env.webapphome = /home/test/yoho-search-consumer/deploy 6 +yoho.search.consumer.env.webapphome = /home/test/deploy2/yoho-search-consumer/deploy/target
7 7
8 tpl.adaptor.valid=false 8 tpl.adaptor.valid=false
9 tpl.adaptor.domain=http://192.168.103.52:8085/search-adaptor 9 tpl.adaptor.domain=http://192.168.103.52:8085/search-adaptor
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 canal.destination.erpcustomerservice = erpcustomerservice 5 canal.destination.erpcustomerservice = erpcustomerservice
6 canal.destination.erpproduct = erpproduct 6 canal.destination.erpproduct = erpproduct
@@ -24,4 +24,4 @@ canal.subscribeChannel.yhgproduct = yhg_product.tbl_product,yhg_product.tbl_pro @@ -24,4 +24,4 @@ canal.subscribeChannel.yhgproduct = yhg_product.tbl_product,yhg_product.tbl_pro
24 24
25 yoho.search.producer.env.namespace = search-producer 25 yoho.search.producer.env.namespace = search-producer
26 yoho.search.producer.env.serverport = 9 26 yoho.search.producer.env.serverport = 9
27 -yoho.search.producer.env.webapphome = /home/test/yoho-search-producer/deploy 27 +yoho.search.producer.env.webapphome = /home/test/deploy2/yoho-search-producer/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.search.service.env.namespace = yohosearch 5 yoho.search.service.env.namespace = yohosearch
6 yoho.search.service.env.serverport = 0 6 yoho.search.service.env.serverport = 0
7 -yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy 7 +yoho.search.service.env.webapphome = /home/test/deploy2/yoho-search-service/deploy/target
8 8
9 ##tpl adaptor 9 ##tpl adaptor
10 tpl.adaptor.valid = false 10 tpl.adaptor.valid = false
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 browse.service.url = http://api.brower.yohoops.org:8092/brower/ 5 browse.service.url = http://api.brower.yohoops.org:8092/brower/
6 6
@@ -14,4 +14,4 @@ www.yohoblk.com = http://www.yohoblk.com @@ -14,4 +14,4 @@ www.yohoblk.com = http://www.yohoblk.com
14 14
15 yoho.sns.env.namespace = sns 15 yoho.sns.env.namespace = sns
16 yoho.sns.env.serverport = 2 16 yoho.sns.env.serverport = 2
17 -yoho.sns.env.webapphome = /home/test/yoho-sns/deploy 17 +yoho.sns.env.webapphome = /home/test/deploy2/yoho-sns/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 gateway.api.url = http://api-test4.yohops.com:9999 5 gateway.api.url = http://api-test4.yohops.com:9999
6 6
@@ -18,6 +18,6 @@ uic.service.url = http://192.168.103.54:8096/uic/ @@ -18,6 +18,6 @@ uic.service.url = http://192.168.103.54:8096/uic/
18 18
19 yoho.social.env.namespace = social 19 yoho.social.env.namespace = social
20 yoho.social.env.serverport = 5 20 yoho.social.env.serverport = 5
21 -yoho.social.env.webapphome = /home/test/yoho-social/deploy 21 +yoho.social.env.webapphome = /home/test/deploy2/yoho-social/deploy/target
22 22
23 yohoboy.service.url = http://newboys.test.yoho.cn/yohoboyins/v5/channel 23 yohoboy.service.url = http://newboys.test.yoho.cn/yohoboyins/v5/channel
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
@@ -36,7 +36,7 @@ verify_student_flag = true @@ -36,7 +36,7 @@ verify_student_flag = true
36 36
37 yoho.users.env.namespace = users 37 yoho.users.env.namespace = users
38 yoho.users.env.serverport = 1 38 yoho.users.env.serverport = 1
39 -yoho.users.env.webapphome = /home/test/yoho-users/deploy 39 +yoho.users.env.webapphome = /home/test/deploy2/yoho-users/deploy/target
40 40
41 zmxy_appId = 1000227 41 zmxy_appId = 1000227
42 zmxy_contract_flag = si201604080002520001 42 zmxy_contract_flag = si201604080002520001
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html 5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html
6 6
@@ -32,4 +32,4 @@ userday.open.day = 28 @@ -32,4 +32,4 @@ userday.open.day = 28
32 32
33 yoho.activity.env.namespace = activity 33 yoho.activity.env.namespace = activity
34 yoho.activity.env.serverport = 0 34 yoho.activity.env.serverport = 0
35 -yoho.activity.env.webapphome = /home/test/yohobuy-activity/deploy 35 +yoho.activity.env.webapphome = /home/test/deploy2/yohobuy-activity/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -#autoconfig.properties.sharedAutoconfig = file:/home/gray/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +#autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 5 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
6 6
@@ -20,7 +20,7 @@ users.browse.sync = true @@ -20,7 +20,7 @@ users.browse.sync = true
20 20
21 yoho.bigData.env.namespace = bigdata 21 yoho.bigData.env.namespace = bigdata
22 yoho.bigData.env.serverport = 1 22 yoho.bigData.env.serverport = 1
23 -yoho.bigData.env.webapphome = /home/test/yohobuy-bigdata/deploy 23 +yoho.bigData.env.webapphome = /home/test/deploy2/yohobuy-bigdata/deploy/target
24 24
25 jdbc.mysql.bigdata.master=192.168.103.36:3306 25 jdbc.mysql.bigdata.master=192.168.103.36:3306
26 jdbc.mysql.bigdata.username=yh_test 26 jdbc.mysql.bigdata.username=yh_test
@@ -2,7 +2,7 @@ api.yoho.url = http://api-test4.yohops.com:9999 @@ -2,7 +2,7 @@ api.yoho.url = http://api-test4.yohops.com:9999
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 sers.browse.expire = 7776000 7 sers.browse.expire = 7776000
8 8
@@ -12,4 +12,4 @@ users.browse.numPerUser = 100 @@ -12,4 +12,4 @@ users.browse.numPerUser = 100
12 12
13 yohobuy.brower.env.namespace = brower 13 yohobuy.brower.env.namespace = brower
14 yohobuy.brower.env.serverport = 2 14 yohobuy.brower.env.serverport = 2
15 -yohobuy.brower.env.webapphome = /home/test/yohobuy-brower/deploy 15 +yohobuy.brower.env.webapphome = /home/test/deploy2/yohobuy-brower/deploy/target
@@ -4,7 +4,7 @@ alarm.mobile = 18994021292 @@ -4,7 +4,7 @@ alarm.mobile = 18994021292
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
8 8
9 bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/ 9 bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/
10 10
@@ -28,7 +28,7 @@ sms.url = http://211.147.239.62:9050/cgi-bin/sendsms @@ -28,7 +28,7 @@ sms.url = http://211.147.239.62:9050/cgi-bin/sendsms
28 28
29 yohobuy.crm.env.namespace = crm 29 yohobuy.crm.env.namespace = crm
30 yohobuy.crm.env.serverport = 3 30 yohobuy.crm.env.serverport = 3
31 -yohobuy.crm.env.webapphome = /home/test/yohobuy-crm/deploy 31 +yohobuy.crm.env.webapphome = /home/test/deploy2/yohobuy-crm/deploy/target
32 32
33 sms.reprot.flag=false 33 sms.reprot.flag=false
34 34
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 erp.order.change.sync.type = MQ 5 erp.order.change.sync.type = MQ
6 erp.order.close.sync.type = MQ 6 erp.order.close.sync.type = MQ
@@ -24,7 +24,7 @@ order.codpay.lock.duration = 1440 @@ -24,7 +24,7 @@ order.codpay.lock.duration = 1440
24 24
25 yohobuy.order.env.namespace = order 25 yohobuy.order.env.namespace = order
26 yohobuy.order.env.serverport = 4 26 yohobuy.order.env.serverport = 4
27 -yohobuy.order.env.webapphome = /home/test/yohobuy-order/deploy 27 +yohobuy.order.env.webapphome = /home/test/deploy2/yohobuy-order/deploy/target
28 28
29 29
30 erp.order.autoCancel.switch.key = N 30 erp.order.autoCancel.switch.key = N
@@ -4,7 +4,7 @@ api.yoho.url = http://api-test4.yohops.com:9999 @@ -4,7 +4,7 @@ api.yoho.url = http://api-test4.yohops.com:9999
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
8 8
9 erp.domain = http://serve.yohobuy.com 9 erp.domain = http://serve.yohobuy.com
10 10
@@ -68,11 +68,14 @@ watchService.watchDir = /Data/ftpdir @@ -68,11 +68,14 @@ watchService.watchDir = /Data/ftpdir
68 68
69 yohobuy.platform.env.namespace = platform 69 yohobuy.platform.env.namespace = platform
70 yohobuy.platform.env.serverport = 8 70 yohobuy.platform.env.serverport = 8
71 -yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 71 +yohobuy.platform.env.webapphome = /home/test/deploy2/yohobuy-platform/deploy/target
72 72
73 zkAddress = 192.168.102.56:2181 73 zkAddress = 192.168.102.56:2181
74 74
75 #product isPromotion field plan sync config 75 #product isPromotion field plan sync config
76 sync.product.isPromotion.advance.minutes=5 76 sync.product.isPromotion.advance.minutes=5
77 77
  78 +unionRedis.proxy.address=192.168.102.56
  79 +unionRedis.proxy.port=6379
  80 +unionRedis.proxy.auth=
78 81
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
@@ -8,4 +8,4 @@ rabbitAddress = 192.168.102.56:5672 @@ -8,4 +8,4 @@ rabbitAddress = 192.168.102.56:5672
8 8
9 yohobuy.product.env.namespace = product 9 yohobuy.product.env.namespace = product
10 yohobuy.product.env.serverport = 3 10 yohobuy.product.env.serverport = 3
11 -yohobuy.product.env.webapphome = /home/test/yohobuy-product/deploy 11 +yohobuy.product.env.webapphome = /home/test/deploy2/yohobuy-product/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.yhbpromotion.master.password = input_password 5 jdbc.mysql.yhbpromotion.master.password = input_password
6 jdbc.mysql.yhbpromotion.master.username = guang_res 6 jdbc.mysql.yhbpromotion.master.username = guang_res
@@ -9,11 +9,13 @@ promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087} @@ -9,11 +9,13 @@ promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087}
9 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20} 9 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20}
10 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ] 10 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ]
11 11
12 -yohobuy.promotion.env.namespace = promotion  
13 -yohobuy.promotion.env.serverport = 5  
14 -yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 12 +promotion.sendCounpon.broadcast.rate = 0.9
  13 +
  14 +resource_coupon_contentcode = b78b32ed81b18dde8ac84fd33602b88b
  15 +share_coupon_expiredTime = 4
15 16
16 -wechat.coupons.operators.email=wanli.zhao@yoho.cn 17 +wechat.coupons.operators.email = wanli.zhao@yoho.cn
17 18
18 -resource_coupon_contentcode=b78b32ed81b18dde8ac84fd33602b88b  
19 -promotion.sendCounpon.broadcast.rate=0.9 19 +yohobuy.promotion.env.namespace = promotion
  20 +yohobuy.promotion.env.serverport = 5
  21 +yohobuy.promotion.env.webapphome = /home/test/deploy2/yohobuy-promotion/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
@@ -12,4 +12,4 @@ yoho.env.serverhome = /usr/local/${yoho.env.servertype} @@ -12,4 +12,4 @@ yoho.env.serverhome = /usr/local/${yoho.env.servertype}
12 yohobuy.resources.env.namespace = resources 12 yohobuy.resources.env.namespace = resources
13 yohobuy.resources.env.productmode = PRODUCT 13 yohobuy.resources.env.productmode = PRODUCT
14 yohobuy.resources.env.serverport = 7 14 yohobuy.resources.env.serverport = 7
15 -yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy 15 +yohobuy.resources.env.webapphome = /home/test/deploy2/yohobuy-resources/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 yohobuy.task.env.namespace = task 3 yohobuy.task.env.namespace = task
4 yohobuy.task.env.serverport = 4 4 yohobuy.task.env.serverport = 4
5 -yohobuy.task.env.webapphome = /home/test/yohobuy-task/deploy 5 +yohobuy.task.env.webapphome = /home/test/deploy2/yohobuy-task/deploy/target
6 web.context = task 6 web.context = task
7 7
8 # 8 #
@@ -2,7 +2,7 @@ activeTime = 86400 @@ -2,7 +2,7 @@ activeTime = 86400
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 192.168.103.36:3306 8 bigdate.db.url = 192.168.103.36:3306
@@ -35,4 +35,10 @@ union.host = 172.31.16.99 @@ -35,4 +35,10 @@ union.host = 172.31.16.99
35 35
36 yoho.unions.env.namespace = union 36 yoho.unions.env.namespace = union
37 yoho.unions.env.serverport = 8 37 yoho.unions.env.serverport = 8
38 -yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 38 +yoho.unions.env.webapphome = /home/test/deploy2/yohobuy-union/deploy/target
  39 +
  40 +#baidu tp config
  41 +baidu.tp.push.url=http://hoteltest.baidu.com/business/article_publish
  42 +baidu.app.id=1566454424306679
  43 +baidu.app.token=spdtkn_test12
  44 +baidu.union.type=1100001
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 wechat.access.appid = wx1e6997242bcfcdfb 5 wechat.access.appid = wx1e6997242bcfcdfb
6 wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd 6 wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
@@ -16,7 +16,7 @@ wechat.yohoshow.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd @@ -16,7 +16,7 @@ wechat.yohoshow.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
16 16
17 yohobuy.wechat.env.namespace = wechat 17 yohobuy.wechat.env.namespace = wechat
18 yohobuy.wechat.env.serverport = 4 18 yohobuy.wechat.env.serverport = 4
19 -yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy 19 +yohobuy.wechat.env.webapphome = /home/test/deploy2/yohobuy-wechat/deploy/target
20 20
21 wechat.subscription.access.appid=wx1e6997242bcfcdfb 21 wechat.subscription.access.appid=wx1e6997242bcfcdfb
22 wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd 22 wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
@@ -282,6 +282,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306 @@ -282,6 +282,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306
282 jdbc.mysql.yh_cms.username=yh_test 282 jdbc.mysql.yh_cms.username=yh_test
283 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw== 283 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
284 284
  285 +#yoho-message配置读写分离
  286 +jdbc.mysql.yhmessage.master=write.message.yohoops.org:3306
  287 +jdbc.mysql.yhmessage.slave=read.message.yohoops.org:3306
  288 +jdbc.mysql.yhmessage.username=yh_test
  289 +jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
  290 +
285 readOnlyInSlave=false 291 readOnlyInSlave=false
286 292
287 # monogdb 293 # monogdb
@@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true @@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 yoho.message.env.webapphome = /home/test/yoho-message/deploy
  10 +
  11 +mobile.limit.sendTimes=50
@@ -15,6 +15,7 @@ erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/ @@ -15,6 +15,7 @@ erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/
15 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login 15 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login
16 16
17 erp.storage = http://192.168.102.47:9098/erp-gateway-web 17 erp.storage = http://192.168.102.47:9098/erp-gateway-web
  18 +erp.rms.domain = http://192.168.102.47:9098/erp-rms-web
18 19
19 execute.limitcode.host = 192.168.102.202 20 execute.limitcode.host = 192.168.102.202
20 21
@@ -73,3 +74,7 @@ yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy @@ -73,3 +74,7 @@ yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
73 zkAddress = 192.168.102.211:2181 74 zkAddress = 192.168.102.211:2181
74 75
75 sync.product.isPromotion.advance.minutes=5 76 sync.product.isPromotion.advance.minutes=5
  77 +
  78 +unionRedis.proxy.address=172.31.16.99
  79 +unionRedis.proxy.port=6379
  80 +unionRedis.proxy.auth=
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_5/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
  7 +service.online.type = 1
  8 +service.online.type.h5 = http://m.yohobuy.com/service/im
  9 +
7 yoho.env.serverhome = /usr/local/${yoho.env.servertype} 10 yoho.env.serverhome = /usr/local/${yoho.env.servertype}
8 11
9 yohobuy.resources.env.namespace = resources 12 yohobuy.resources.env.namespace = resources
@@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true @@ -7,3 +7,5 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yoho-message/deploy 9 yoho.message.env.webapphome = /home/test/yoho-message/deploy
  10 +
  11 +mobile.limit.sendTimes=50
@@ -44,5 +44,5 @@ yohomars_search_service_test_ips=(test@192.168.102.17) @@ -44,5 +44,5 @@ yohomars_search_service_test_ips=(test@192.168.102.17)
44 yoho_message_controller_test_ips=(test@192.168.102.202) 44 yoho_message_controller_test_ips=(test@192.168.102.202)
45 yoho_message_sender_test_ips=(test@192.168.102.202) 45 yoho_message_sender_test_ips=(test@192.168.102.202)
46 yoho_push_test_ips=(test@192.168.102.202) 46 yoho_push_test_ips=(test@192.168.102.202)
47 -cms_push_test_ips=(test@192.168.102.202) 47 +cms_push_test_ips=(test@192.168.102.202 test@192.168.102.207)
48 yohobuy_task_test_ips=(test@192.168.102.202) 48 yohobuy_task_test_ips=(test@192.168.102.202)
@@ -34,6 +34,7 @@ yoho_now_test_nj_3_ips=(test@192.168.102.52) @@ -34,6 +34,7 @@ yoho_now_test_nj_3_ips=(test@192.168.102.52)
34 #yohobuy_task_test_nj_3_ips=(test@192.168.102.52) 34 #yohobuy_task_test_nj_3_ips=(test@192.168.102.52)
35 yoho_mars_test_nj_3_ips=(test@192.168.102.52) 35 yoho_mars_test_nj_3_ips=(test@192.168.102.52)
36 yohomars_platform_test_nj_3_ips=(test@192.168.102.52) 36 yohomars_platform_test_nj_3_ips=(test@192.168.102.52)
  37 +yohonow_platform_test_nj_3_ips=(test@192.168.102.52)
37 38
38 # 192.168.102.46 39 # 192.168.102.46
39 yoho_search_producer_test_nj_3_ips=(test@192.168.102.46) 40 yoho_search_producer_test_nj_3_ips=(test@192.168.102.46)