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

@@ -14,9 +14,9 @@ erp.shops.login.url       = http://qrest.yohobuy.com:9098/erp-gateway-web/accoun
 
 erp.storage  = http://192.168.10.131:8082/erp-gateway-web/stock
 
-manager.zkAddress =192.168.104.246:2181
+manager.zkAddress =192.168.104.244:2181
 
-zkAddress=192.168.104.246:2181
+zkAddress=192.168.104.244:2181
 
 execute.limitcode.host  = 10.66.50.140
 
@@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome  = /home/test/platform-cms/deploy
 preview.url = http://yoho-community-web.test2.ingress.dev.yohocorp.com/grass/article/
 
 file.excel.saveDir       = /Data/excel
+
+tencent.cloud.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
+tencent.cloud.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C

@@ -34,7 +34,7 @@ redis.pool.maxTotal=200
 redis.pool.maxIdle=100
 
 #redis.push.address=read.redis.yohoops.org
-redis.push.address=yohoops-redis-java-service
+redis.push.address=192.168.104.244
 redis.push.port=6379
 redis.pool.minIdle=30
 redis.pool.maxWaitMillis=10000

@@ -152,7 +152,7 @@ platformRedis.proxy.address=yohoops-redis-java-service
 platformRedis.proxy.port=6379
 platformRedis.proxy.auth=
 
-zkAddress=192.168.104.246:2181
+zkAddress=192.168.104.244:2181
 
 erpYohops.domain = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway
 

@@ -43,8 +43,8 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er
 buyer.delivery.way.cost.sf=0
 order.seller.earnestmoney.min=1
 order.seller.earnestmoney.max=200
-order.seller.packageFee=6
-order.seller.appraiseFee=15
+order.seller.packageFee=0.02
+order.seller.appraiseFee=0.03
 
 order.seller.goodsPaymentRate=0
 order.seller.earnestMoneyRate=0

@@ -525,6 +525,10 @@ APP_KEY     = 1392109259
 APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
 UUC_DOMAIN  =  http://sso-test.yohops.com:9999
 
+tencent.vod.subAppId =1400201211
+tencent.vod.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
+tencent.vod.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
+
 
 #single cloud not sync redis
 single.cloud.redis.proxy.address=yohoops-redis-java-service 

@@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome  = /home/test/platform-cms/deploy
 preview.url = http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/
 
 file.excel.saveDir       = /Data/excel
+
+tencent.cloud.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
+tencent.cloud.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C

@@ -92,5 +92,6 @@ product.salecategory.blk=646
 product.salecategory.lifestyle=714
 ufo.product.pool.id=143
 
-tencent.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
-tencent.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
+tencent.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
+tencent.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
+tencent.vodSubAppId =1400201211 

@@ -17,4 +17,12 @@ social.service.url=http://social-test3.yohops.com:8095/social
 uic.service.url  = http://java-yoho-uic-service:8096/uic
 msgCenter.securityKey = 1a15a75d-b30f-4d74-a791-d654647a8c77
 msgCenter.securityKey.publishReward=6131fe0b-2db8-4375-8433-cdc29fd89ef5
-msgCenter.securityKey.topicReward=3a60113a-044c-498f-9443-e2da3c2ada0f
\ No newline at end of file
+msgCenter.securityKey.topicReward=3a60113a-044c-498f-9443-e2da3c2ada0f
+
+tencent.vod.subAppId =1400201211
+tencent.vod.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
+tencent.vod.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
+tencent.vod.appId =1251943603
+tencent.vod.url =https://video-cover.yohobuy.com
+
+tempImagePath =/Data/tempImages
\ No newline at end of file

@@ -43,12 +43,12 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er
 buyer.delivery.way.cost.sf=0
 order.seller.earnestmoney.min=1
 order.seller.earnestmoney.max=200
-order.seller.packageFee=6
-order.seller.appraiseFee=15
+order.seller.packageFee=0.01
+order.seller.appraiseFee=0.02
 
 order.seller.goodsPaymentRate=0
 order.seller.earnestMoneyRate=0
-order.seller.payChannelRate=0.01
+order.seller.payChannelRate=0.0001
 
 redis.ufo.twemproxy.addresses = yohoops-redis-java-service:6379
 redis.ufo.twemproxy.auth      = 
@@ -96,4 +96,7 @@ ufo.nfc.syncBlockChain.url = http://yoho-ultrain-block-api.test3.ingress.dev.yoh
 
 alipay.transfer.notifyurl=http://testapi.yohops.com/payment/ufo_alipay_transfer_notify
 #身份证图片ocr验证
-yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed
\ No newline at end of file
+yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed
+
+
+unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify
\ No newline at end of file