YPT / auto_deploy_test · Commits

Go to a project

Authored by lingmin
Commit 0f5af14ac720d70080e745454983160e54436d2b 2 parents cd9e52c2 22d2f6ce

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

Inline Side-by-side
Showing 7 changed files with 20 additions and 5 deletions
@@ -304,9 +304,13 @@ jdbc.mysql.yhlottery.username=yh_test @@ -304,9 +304,13 @@ jdbc.mysql.yhlottery.username=yh_test
304 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw== 304 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
305 305
306 #bigdataunion 306 #bigdataunion
307 -jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306  
308 -jdbc.mysql.bigdataunion.username=yh_vpc_bak  
309 -jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA= 307 +#jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
  308 +#jdbc.mysql.bigdataunion.username=yh_vpc_bak
  309 +#jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
  310 +
  311 +jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
  312 +jdbc.mysql.bigdataunion.username=yh_test_bigdata
  313 +jdbc.mysql.bigdataunion.password=rALdkYPZCr4QyzBfVCGdXA==
310 314
311 readOnlyInSlave=true 315 readOnlyInSlave=true
312 316
@@ -25,6 +25,8 @@ erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status @@ -25,6 +25,8 @@ erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
25 25
26 erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock 26 erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
27 27
  28 +erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
  29 +
28 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock 30 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
29 31
30 erp.shops.batch.center.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_center_stock 32 erp.shops.batch.center.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_center_stock
@@ -10,9 +10,9 @@ yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy @@ -10,9 +10,9 @@ yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy
10 10
11 tpl.adaptor.valid = true 11 tpl.adaptor.valid = true
12 12
13 -##search.use.cache[ehCache/redisCache] 13 +##search.use.cache[ehCache/searchRedis/yohoRedis]
14 search.use.cache = true 14 search.use.cache = true
15 -search.cache.type = redisCache 15 +search.cache.type = searchRedis
16 16
17 search.open.downgrade = true 17 search.open.downgrade = true
18 search.personalized.switch = true 18 search.personalized.switch = true
@@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
  7 +diff.base.flag = 1
  8 +
7 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
8 10
9 jdbc.mysql.readonlyinslave = true 11 jdbc.mysql.readonlyinslave = true
@@ -16,6 +18,8 @@ uic.service.url = http://192.168.102.31:8096/uic @@ -16,6 +18,8 @@ uic.service.url = http://192.168.102.31:8096/uic
16 18
17 union.domain.url = http://webunion_tl.yohobuy.com/union 19 union.domain.url = http://webunion_tl.yohobuy.com/union
18 20
  21 +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
  22 +
19 user.session.expire = 10080 23 user.session.expire = 10080
20 24
21 users.base.isUic = false 25 users.base.isUic = false
@@ -35,6 +35,7 @@ printer.ftp.username=yoho @@ -35,6 +35,7 @@ printer.ftp.username=yoho
35 printer.ftp.password=123456 35 printer.ftp.password=123456
36 36
37 protal.gateway.domain.url=http://192.168.102.47:8080/portal-gateway 37 protal.gateway.domain.url=http://192.168.102.47:8080/portal-gateway
  38 +gateway.domain.url=http://192.168.102.202:8080/gateway
38 39
39 40
40 shop.wifi.img.url=http://192.168.102.47/icons/ 41 shop.wifi.img.url=http://192.168.102.47/icons/
@@ -23,6 +23,8 @@ degrade_userHabits_level = 0 @@ -23,6 +23,8 @@ degrade_userHabits_level = 0
23 23
24 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 24 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
25 25
  26 +erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
  27 +
26 erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock 28 erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
27 29
28 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock 30 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
@@ -71,3 +71,5 @@ yohobuy.platform.env.serverport = 8 @@ -71,3 +71,5 @@ yohobuy.platform.env.serverport = 8
71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
72 72
73 zkAddress = 192.168.102.211:2181 73 zkAddress = 192.168.102.211:2181
  74 +
  75 +sync.product.isPromotion.advance.minutes=5