commit autoconfig.

@@ -10,6 +10,23 @@ 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/global-autoconfig.properties
 
 
+bigData.analytics.transfer.url  = http://analytics.m.yohobuy.com/yas.gif/web/
+
+bigDataRedis.pool.maxIdle        = 100
+bigDataRedis.pool.maxTotal       = 100
+bigDataRedis.pool.maxWaitMillis  = 2000
+bigDataRedis.pool.minIdle        = 50
+bigDataRedis.pool.testOnBorrow   = false
+bigDataRedis.pool.testWhileIdle  = true
+
+bigdata.ad.userid  = 9999
+
+bigdata.qiniu.accesskey  = 11111
+bigdata.qiniu.bucket     = db-backup
+bigdata.qiniu.secretkey  = 333333
+
+crawler.host  = http://172.31.21.144:9100
+
 erp.domain  = http://192.168.102.47:9098/erp-gateway-web
 erp.domain  = http://192.168.102.47:9098/erp-gateway-web
 
 
 erp.platform.shops.url  = http://api.erp.yohobuy.com
 erp.platform.shops.url  = http://api.erp.yohobuy.com
@@ -33,8 +50,9 @@ execute.update_product_price.host  = 192.168.102.202
 file.image.gif.size  = 2621440
 file.image.gif.size  = 2621440
 file.image.size      = 512000
 file.image.size      = 512000
 
 
-file.maxsize        = 5400000
-file.uploadTempDir  = /home/test
+file.maxsize             = 5400000
+file.uploadMalongImgDir  = /Data/malong
+file.uploadTempDir       = /home/test
 
 
 jdbc.mysql.platform.erp_account.master  = 192.168.102.219:3306
 jdbc.mysql.platform.erp_account.master  = 192.168.102.219:3306
 jdbc.mysql.platform.erp_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.erp_account.password  = 9nm0icOwt6bMHjMusIfMLw==
@@ -53,69 +71,49 @@ jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
 jdbc.mysql.platform.yhb_account.username  = yh_test
 
 
+malongApi.accessKeyId  = 7343a192140f25a59c53dab5652f5f47
+malongApi.imageSetId   = 7tm74zfv
+malongApi.paiUserId    = 1714
+malongApi.secretKey    = 45c1ce98ee6b4701d55802989ba240f4
+
 mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 
 
+mkt.app.download.url  = http://m.yohobuy.com/app
+
+mkt.pcwap.domain.url  = http://union.yoho.cn/union/go
+
+mkt.resource.code.url  = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
+
 offline.shops.url  = http://192.168.102.47:8098/shops/
 offline.shops.url  = http://192.168.102.47:8098/shops/
 
 
 platform.login.salt  = yoho9646yoho9646
 platform.login.salt  = yoho9646yoho9646
 
 
-price.audit.firstRoleName  = zuzhang1
-price.audit.secondPid      = 100476
-price.audit.thirdPid       = 100478
+price.audit.firstRoleName        = zuzhang1
+price.audit.secondCheckRoleName  = secondCheck
+price.audit.secondPid            = 100476
+price.audit.thirdPid             = 100478
 
 
 price.changed.notice.phone  = 13512519156
 price.changed.notice.phone  = 13512519156
 
 
 price.selltype.url  = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
 price.selltype.url  = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
 
 
+qiniu.bigdata.skndada.fileName  = /Users/apple/Documents/tmp/sknData.xml
+
 resources_https_enable  = true
 resources_https_enable  = true
 
 
 search.server.address  = http://192.168.102.216:8080/yohosearch/
 search.server.address  = http://192.168.102.216:8080/yohosearch/
 
 
 service.yoho.url  = http://service-test3.yohops.com:9999
 service.yoho.url  = http://service-test3.yohops.com:9999
 
 
+shop.status.change.phone  = 17895010543
+
+upload.tencent.bid           = b_teg_openrecom_opq68unpsix93dy2zjco
+upload.tencent.product.mark  = 9.99
+upload.tencent.url           = http://data.dm.qcloud.com1:8088
+
 watchService.waitInterval  = 60
 watchService.waitInterval  = 60
 watchService.watchDir      = /Data/ftpdir
 watchService.watchDir      = /Data/ftpdir
 
 
 yohobuy.platform.env.namespace   = platform
 yohobuy.platform.env.namespace   = platform
 yohobuy.platform.env.serverport  = 8
 yohobuy.platform.env.serverport  = 8
 yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
-
-
-shop.status.change.phone= 17895010543
-
-bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/
-file.uploadMalongImgDir=/Data/malong
-##图像搜索对接api参数 码隆科技配置信息
-malongApi.accessKeyId=7343a192140f25a59c53dab5652f5f47
-malongApi.secretKey=45c1ce98ee6b4701d55802989ba240f4
-malongApi.paiUserId=1714
-malongApi.imageSetId=7tm74zfv
-mkt.activity.domain.url=http://union.yoho.cn/union/tencentMkt/index.html
-
-crawler.host=http://172.31.21.144:9100
-
-# ********************  bigdata upload skn data  ********************  
-bigdata.qiniu.accesskey=11111
-bigdata.qiniu.secretkey=333333
-bigdata.qiniu.bucket=db-backup
-qiniu.bigdata.skndada.fileName=/Users/apple/Documents/tmp/sknData.xml
-bigdata.ad.userid=9999
-# ********************  bigdata upload skn data  ********************  
-# ********************  bigData redis servers start ********************
-
-bigDataRedis.pool.maxTotal=100
-bigDataRedis.pool.maxIdle=100
-bigDataRedis.pool.maxWaitMillis=2000
-bigDataRedis.pool.minIdle=50
-bigDataRedis.pool.testOnBorrow=false
-bigDataRedis.pool.testWhileIdle=true
-# ********************  bigData redis servers end ********************
-
-# ********************  tencent upload skn data  ********************  
-upload.tencent.url=http://data.dm.qcloud.com1:8088
-upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco
-upload.tencent.product.mark=9.99
-# ********************  tencent upload skn data  ********************
-price.audit.secondCheckRoleName=secondCheck
-
-mkt.app.download.url=http://m.yohobuy.com/app