Authored by chunhua.zhang

add

Showing 27 changed files with 28 additions and 28 deletions
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 yoho.cms_push.env.namespace = cms_push 4 yoho.cms_push.env.namespace = cms_push
5 yoho.cms_push.env.serverport = 6 5 yoho.cms_push.env.serverport = 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 is.do.rebuild.index = false 5 is.do.rebuild.index = false
6 is.do.rebuild.tbl.index = false 6 is.do.rebuild.tbl.index = false
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 gateway.api.url = http://api.gray.yohops.com/ 5 gateway.api.url = http://api.gray.yohops.com/
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 java.logs.home = /Data/logs 5 java.logs.home = /Data/logs
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.dashboard.env.namespace = yohodashboard 5 yoho.dashboard.env.namespace = yohodashboard
6 yoho.dashboard.env.productmode = PRODUCT 6 yoho.dashboard.env.productmode = PRODUCT
@@ -2,7 +2,7 @@ applepay.notifyurl = http://service-test4.yohops.com:9999/payment/applepay_noti @@ -2,7 +2,7 @@ applepay.notifyurl = http://service-test4.yohops.com:9999/payment/applepay_noti
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 browse.blockingqueue.maxSize = 20000 7 browse.blockingqueue.maxSize = 20000
8 8
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 db.batch.size = 100000 4 db.batch.size = 100000
5 ios.default.size = 1000 5 ios.default.size = 1000
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.search.adaptor.env.serverport = 5 5 yoho.search.adaptor.env.serverport = 5
6 yoho.search.adaptor.env.webapphome = /home/test/deploy2/yoho-search-adaptor/deploy/target 6 yoho.search.adaptor.env.webapphome = /home/test/deploy2/yoho-search-adaptor/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 3
4 yoho.search.consumer.env.namespace = search-consumer 4 yoho.search.consumer.env.namespace = search-consumer
5 yoho.search.consumer.env.serverport = 8 5 yoho.search.consumer.env.serverport = 8
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 canal.destination.erpcustomerservice = erpcustomerservice 5 canal.destination.erpcustomerservice = erpcustomerservice
6 canal.destination.erpproduct = erpproduct 6 canal.destination.erpproduct = erpproduct
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 yoho.search.service.env.namespace = yohosearch 5 yoho.search.service.env.namespace = yohosearch
6 yoho.search.service.env.serverport = 0 6 yoho.search.service.env.serverport = 0
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 browse.service.url = http://api.brower.yohoops.org:8092/brower/ 5 browse.service.url = http://api.brower.yohoops.org:8092/brower/
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 gateway.api.url = http://api-test4.yohops.com:9999 5 gateway.api.url = http://api-test4.yohops.com:9999
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html 5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -#autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +#autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 5 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
6 6
@@ -2,7 +2,7 @@ api.yoho.url = http://api-test4.yohops.com:9999 @@ -2,7 +2,7 @@ api.yoho.url = http://api-test4.yohops.com:9999
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 sers.browse.expire = 7776000 7 sers.browse.expire = 7776000
8 8
@@ -4,7 +4,7 @@ alarm.mobile = 18994021292 @@ -4,7 +4,7 @@ alarm.mobile = 18994021292
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
8 8
9 bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/ 9 bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/
10 10
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 erp.order.change.sync.type = MQ 5 erp.order.change.sync.type = MQ
6 erp.order.close.sync.type = MQ 6 erp.order.close.sync.type = MQ
@@ -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/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/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
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.yhbpromotion.master.password = input_password 5 jdbc.mysql.yhbpromotion.master.password = input_password
6 jdbc.mysql.yhbpromotion.master.username = guang_res 6 jdbc.mysql.yhbpromotion.master.username = guang_res
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 jdbc.mysql.readonlyinslave = true 5 jdbc.mysql.readonlyinslave = true
6 6
@@ -12,4 +12,4 @@ yoho.env.serverhome = /usr/local/${yoho.env.servertype} @@ -12,4 +12,4 @@ yoho.env.serverhome = /usr/local/${yoho.env.servertype}
12 yohobuy.resources.env.namespace = resources 12 yohobuy.resources.env.namespace = resources
13 yohobuy.resources.env.productmode = PRODUCT 13 yohobuy.resources.env.productmode = PRODUCT
14 yohobuy.resources.env.serverport = 7 14 yohobuy.resources.env.serverport = 7
15 -yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy 15 +yohobuy.resources.env.webapphome = /home/test/deploy2/yohobuy-resources/deploy/target
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
3 yohobuy.task.env.namespace = task 3 yohobuy.task.env.namespace = task
4 yohobuy.task.env.serverport = 4 4 yohobuy.task.env.serverport = 4
5 yohobuy.task.env.webapphome = /home/test/deploy2/yohobuy-task/deploy/target 5 yohobuy.task.env.webapphome = /home/test/deploy2/yohobuy-task/deploy/target
@@ -2,7 +2,7 @@ activeTime = 86400 @@ -2,7 +2,7 @@ activeTime = 86400
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 192.168.103.36:3306 8 bigdate.db.url = 192.168.103.36:3306
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/config4deploy2/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_test/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 wechat.access.appid = wx1e6997242bcfcdfb 5 wechat.access.appid = wx1e6997242bcfcdfb
6 wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd 6 wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd