yohoops / auto_deploy_test · Commits

Go to a project

Authored by jimi
Commit e41069e8a4ba55d51933fcf3f684614e3ceb6c68 2 parents 36b2dd70 f0c5de36

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

Inline Side-by-side
Showing 9 changed files with 35 additions and 13 deletions
@@ -14,9 +14,9 @@ erp.shops.login.url = http://qrest.yohobuy.com:9098/erp-gateway-web/accoun @@ -14,9 +14,9 @@ erp.shops.login.url = http://qrest.yohobuy.com:9098/erp-gateway-web/accoun
14 14
15 erp.storage = http://192.168.10.131:8082/erp-gateway-web/stock 15 erp.storage = http://192.168.10.131:8082/erp-gateway-web/stock
16 16
17 -manager.zkAddress =192.168.104.246:2181 17 +manager.zkAddress =192.168.104.244:2181
18 18
19 -zkAddress=192.168.104.246:2181 19 +zkAddress=192.168.104.244:2181
20 20
21 execute.limitcode.host = 10.66.50.140 21 execute.limitcode.host = 10.66.50.140
22 22
@@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome = /home/test/platform-cms/deploy @@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome = /home/test/platform-cms/deploy
99 preview.url = http://yoho-community-web.test2.ingress.dev.yohocorp.com/grass/article/ 99 preview.url = http://yoho-community-web.test2.ingress.dev.yohocorp.com/grass/article/
100 100
101 file.excel.saveDir = /Data/excel 101 file.excel.saveDir = /Data/excel
  102 +
  103 +tencent.cloud.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
  104 +tencent.cloud.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
@@ -34,7 +34,7 @@ redis.pool.maxTotal=200 @@ -34,7 +34,7 @@ redis.pool.maxTotal=200
34 redis.pool.maxIdle=100 34 redis.pool.maxIdle=100
35 35
36 #redis.push.address=read.redis.yohoops.org 36 #redis.push.address=read.redis.yohoops.org
37 -redis.push.address=yohoops-redis-java-service 37 +redis.push.address=192.168.104.244
38 redis.push.port=6379 38 redis.push.port=6379
39 redis.pool.minIdle=30 39 redis.pool.minIdle=30
40 redis.pool.maxWaitMillis=10000 40 redis.pool.maxWaitMillis=10000
@@ -152,7 +152,7 @@ platformRedis.proxy.address=yohoops-redis-java-service @@ -152,7 +152,7 @@ platformRedis.proxy.address=yohoops-redis-java-service
152 platformRedis.proxy.port=6379 152 platformRedis.proxy.port=6379
153 platformRedis.proxy.auth= 153 platformRedis.proxy.auth=
154 154
155 -zkAddress=192.168.104.246:2181 155 +zkAddress=192.168.104.244:2181
156 156
157 erpYohops.domain = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway 157 erpYohops.domain = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway
158 158
@@ -43,8 +43,8 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er @@ -43,8 +43,8 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er
43 buyer.delivery.way.cost.sf=0 43 buyer.delivery.way.cost.sf=0
44 order.seller.earnestmoney.min=1 44 order.seller.earnestmoney.min=1
45 order.seller.earnestmoney.max=200 45 order.seller.earnestmoney.max=200
46 -order.seller.packageFee=6  
47 -order.seller.appraiseFee=15 46 +order.seller.packageFee=0.02
  47 +order.seller.appraiseFee=0.03
48 48
49 order.seller.goodsPaymentRate=0 49 order.seller.goodsPaymentRate=0
50 order.seller.earnestMoneyRate=0 50 order.seller.earnestMoneyRate=0
@@ -525,6 +525,10 @@ APP_KEY = 1392109259 @@ -525,6 +525,10 @@ APP_KEY = 1392109259
525 APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e 525 APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e
526 UUC_DOMAIN = http://sso-test.yohops.com:9999 526 UUC_DOMAIN = http://sso-test.yohops.com:9999
527 527
  528 +tencent.vod.subAppId =1400201211
  529 +tencent.vod.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
  530 +tencent.vod.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
  531 +
528 532
529 #single cloud not sync redis 533 #single cloud not sync redis
530 single.cloud.redis.proxy.address=yohoops-redis-java-service 534 single.cloud.redis.proxy.address=yohoops-redis-java-service
@@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome = /home/test/platform-cms/deploy @@ -99,3 +99,6 @@ yohobuy.pfcms.env.webapphome = /home/test/platform-cms/deploy
99 preview.url = http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/ 99 preview.url = http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/
100 100
101 file.excel.saveDir = /Data/excel 101 file.excel.saveDir = /Data/excel
  102 +
  103 +tencent.cloud.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
  104 +tencent.cloud.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
@@ -92,5 +92,6 @@ product.salecategory.blk=646 @@ -92,5 +92,6 @@ product.salecategory.blk=646
92 product.salecategory.lifestyle=714 92 product.salecategory.lifestyle=714
93 ufo.product.pool.id=143 93 ufo.product.pool.id=143
94 94
95 -tencent.secretId = AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc  
96 -tencent.secretKey = 2ub9aXEyb761QcbRBjFkEYmqphTSwY0C 95 +tencent.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
  96 +tencent.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
  97 +tencent.vodSubAppId =1400201211
@@ -17,4 +17,12 @@ social.service.url=http://social-test3.yohops.com:8095/social @@ -17,4 +17,12 @@ social.service.url=http://social-test3.yohops.com:8095/social
17 uic.service.url = http://java-yoho-uic-service:8096/uic 17 uic.service.url = http://java-yoho-uic-service:8096/uic
18 msgCenter.securityKey = 1a15a75d-b30f-4d74-a791-d654647a8c77 18 msgCenter.securityKey = 1a15a75d-b30f-4d74-a791-d654647a8c77
19 msgCenter.securityKey.publishReward=6131fe0b-2db8-4375-8433-cdc29fd89ef5 19 msgCenter.securityKey.publishReward=6131fe0b-2db8-4375-8433-cdc29fd89ef5
20 -msgCenter.securityKey.topicReward=3a60113a-044c-498f-9443-e2da3c2ada0f  
  20 +msgCenter.securityKey.topicReward=3a60113a-044c-498f-9443-e2da3c2ada0f
  21 +
  22 +tencent.vod.subAppId =1400201211
  23 +tencent.vod.secretId =AKIDf9SVSxWqBOVTG1aZHwQ7jATwGScdlBzc
  24 +tencent.vod.secretKey =2ub9aXEyb761QcbRBjFkEYmqphTSwY0C
  25 +tencent.vod.appId =1251943603
  26 +tencent.vod.url =https://video-cover.yohobuy.com
  27 +
  28 +tempImagePath =/Data/tempImages
@@ -43,12 +43,12 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er @@ -43,12 +43,12 @@ erp-gateway.url = http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/er
43 buyer.delivery.way.cost.sf=0 43 buyer.delivery.way.cost.sf=0
44 order.seller.earnestmoney.min=1 44 order.seller.earnestmoney.min=1
45 order.seller.earnestmoney.max=200 45 order.seller.earnestmoney.max=200
46 -order.seller.packageFee=6  
47 -order.seller.appraiseFee=15 46 +order.seller.packageFee=0.01
  47 +order.seller.appraiseFee=0.02
48 48
49 order.seller.goodsPaymentRate=0 49 order.seller.goodsPaymentRate=0
50 order.seller.earnestMoneyRate=0 50 order.seller.earnestMoneyRate=0
51 -order.seller.payChannelRate=0.01 51 +order.seller.payChannelRate=0.0001
52 52
53 redis.ufo.twemproxy.addresses = yohoops-redis-java-service:6379 53 redis.ufo.twemproxy.addresses = yohoops-redis-java-service:6379
54 redis.ufo.twemproxy.auth = 54 redis.ufo.twemproxy.auth =
@@ -96,4 +96,7 @@ ufo.nfc.syncBlockChain.url = http://yoho-ultrain-block-api.test3.ingress.dev.yoh @@ -96,4 +96,7 @@ ufo.nfc.syncBlockChain.url = http://yoho-ultrain-block-api.test3.ingress.dev.yoh
96 96
97 alipay.transfer.notifyurl=http://testapi.yohops.com/payment/ufo_alipay_transfer_notify 97 alipay.transfer.notifyurl=http://testapi.yohops.com/payment/ufo_alipay_transfer_notify
98 #身份证图片ocr验证 98 #身份证图片ocr验证
99 -yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed  
  99 +yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed
  100 +
  101 +
  102 +unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify