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

@@ -304,9 +304,13 @@ jdbc.mysql.yhlottery.username=yh_test
 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
 
 #bigdataunion
-jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
-jdbc.mysql.bigdataunion.username=yh_vpc_bak
-jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
+#jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
+#jdbc.mysql.bigdataunion.username=yh_vpc_bak
+#jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
+
+jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
+jdbc.mysql.bigdataunion.username=yh_test_bigdata
+jdbc.mysql.bigdataunion.password=rALdkYPZCr4QyzBfVCGdXA==
 
 readOnlyInSlave=true
 

@@ -25,6 +25,8 @@ erp.order.status.url  = http://portal.admin.yohobuy.com/api/orders/status
 
 erp.shops.url  = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
 
+erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
+
 erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
 
 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
 	
 tpl.adaptor.valid = true
  
-##search.use.cache[ehCache/redisCache]
+##search.use.cache[ehCache/searchRedis/yohoRedis]
 search.use.cache = true
-search.cache.type = redisCache
+search.cache.type = searchRedis
  
 search.open.downgrade = true
 search.personalized.switch = true

@@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/aut
 
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
+diff.base.flag  = 1
+
 erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
 
 jdbc.mysql.readonlyinslave  = true
@@ -16,6 +18,8 @@ uic.service.url  = http://192.168.102.31:8096/uic
 
 union.domain.url  = http://webunion_tl.yohobuy.com/union
 
+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
+
 user.session.expire  = 10080
 
 users.base.isUic  = false

@@ -35,6 +35,7 @@ printer.ftp.username=yoho
 printer.ftp.password=123456
 
 protal.gateway.domain.url=http://192.168.102.47:8080/portal-gateway
+gateway.domain.url=http://192.168.102.202:8080/gateway
 
 
 shop.wifi.img.url=http://192.168.102.47/icons/

@@ -23,6 +23,8 @@ degrade_userHabits_level       = 0
 
 erp.order.status.url  = http://portal.admin.yohobuy.com/api/orders/status
 
+erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
+
 erp.shops.url  = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
 
 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
 yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 
 zkAddress  = 192.168.102.211:2181
+
+sync.product.isPromotion.advance.minutes=5