commit autoconfig.

@@ -4,7 +4,7 @@ api.yoho.url  = http://api-test3.yohops.com:9999
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_5/global-autoconfig.properties
 
 erp.domain  = http://serve.yohobuy.com
 
@@ -22,9 +22,8 @@ execute.shopmessage.host  = 192.168.102.202
 
 execute.update_product_price.host  = 192.168.102.202
 
-file.image.size  = 512000
-
-zkAddress=192.168.102.211:2181
+file.image.gif.size  = 2621440
+file.image.size      = 512000
 
 file.maxsize        = 104857600
 file.uploadTempDir  = /home/test
@@ -46,6 +45,7 @@ jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
 
+mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 
 offline.shops.url  = http://192.168.102.47:8098/shops/
 
@@ -55,6 +55,8 @@ price.audit.firstRoleName  = Ʒ
 price.audit.secondPid      = 100476
 price.audit.thirdPid       = 100478
 
+resources_https_enable  = true
+
 search.server.address  = http://192.168.102.216:8080/yohosearch/
 
 watchService.waitInterval  = 60
@@ -64,5 +66,4 @@ yohobuy.platform.env.namespace   = platform
 yohobuy.platform.env.serverport  = 8
 yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 
-file.image.gif.size=2621440
-resources_https_enable=true
\ No newline at end of file
+zkAddress  = 192.168.102.211:2181