yohoops / auto_deploy_test · Commits

Go to a project

Authored by chunhua.zhang
Commit 5560affc5c92ba622208871bfea5d7e315c0d7a2 1 parent 8efe2165

commit autoconfig.

Inline Side-by-side
Showing 1 changed file with 11 additions and 6 deletions
@@ -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/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/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
@@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202 @@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202
22 22
23 execute.update_product_price.host = 192.168.102.202 23 execute.update_product_price.host = 192.168.102.202
24 24
25 -file.image.size = 512000  
26 -  
27 -zkAddress=192.168.102.56:2181 25 +file.image.gif.size = 2621440
  26 +file.image.size = 512000
28 27
29 file.maxsize = 104857600 28 file.maxsize = 104857600
30 file.uploadTempDir = /home/test 29 file.uploadTempDir = /home/test
@@ -46,6 +45,11 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -46,6 +45,11 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
46 jdbc.mysql.platform.yhb_account.slave = 192.168.103.36:3306 45 jdbc.mysql.platform.yhb_account.slave = 192.168.103.36:3306
47 jdbc.mysql.platform.yhb_account.username = yh_test 46 jdbc.mysql.platform.yhb_account.username = yh_test
48 47
  48 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
  49 +
  50 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  51 +
  52 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
49 53
50 offline.shops.url = http://192.168.102.47:8098/shops/ 54 offline.shops.url = http://192.168.102.47:8098/shops/
51 55
@@ -55,6 +59,8 @@ price.audit.firstRoleName = Ʒ @@ -55,6 +59,8 @@ price.audit.firstRoleName = Ʒ
55 price.audit.secondPid = 100476 59 price.audit.secondPid = 100476
56 price.audit.thirdPid = 100478 60 price.audit.thirdPid = 100478
57 61
  62 +resources_https_enable = true
  63 +
58 search.server.address = http://192.168.103.52:8080/yohosearch/ 64 search.server.address = http://192.168.103.52:8080/yohosearch/
59 65
60 watchService.waitInterval = 60 66 watchService.waitInterval = 60
@@ -64,5 +70,4 @@ yohobuy.platform.env.namespace = platform @@ -64,5 +70,4 @@ yohobuy.platform.env.namespace = platform
64 yohobuy.platform.env.serverport = 8 70 yohobuy.platform.env.serverport = 8
65 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
66 72
67 -file.image.gif.size=2621440  
68 -resources_https_enable=true  
  73 +zkAddress = 192.168.102.56:2181