li.rongzheng / auto_deploy_test · Commits

Go to a project

Authored by lingmin
Commit 2d31f6dc7f6d95875df376fa8d7d0171cdd78c60 2 parents b28e96e6 21c88ebe

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

Inline Side-by-side
Showing 16 changed files with 64 additions and 25 deletions
1 ##########111111111111111111111111111 1 ##########111111111111111111111111111
2 -yoho.logs.level = INFO 2 +yoho.logs.level = ERROR
3 yoho.logs.basedir = /Data/logs 3 yoho.logs.basedir = /Data/logs
4 yoho.logs.maxHistory = 7 4 yoho.logs.maxHistory = 7
5 yoho.logs.maxFileSize = 10MB 5 yoho.logs.maxFileSize = 10MB
@@ -18,4 +18,9 @@ redis.readonly.proxy.port=6380 @@ -18,4 +18,9 @@ redis.readonly.proxy.port=6380
18 redis.readonly.proxy.address=192.168.102.17 18 redis.readonly.proxy.address=192.168.102.17
19 redis.notsync.twemproxy.addresses=192.168.102.17:6380 19 redis.notsync.twemproxy.addresses=192.168.102.17:6380
20 mars.task.switch=true 20 mars.task.switch=true
21 -exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7  
  21 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
  22 +
  23 +activity.save.msg=编辑团队会尽快审核，请留意系统通知
  24 +
  25 +WECHAT_APPID=wx9d0d7dfed5bbaa8b
  26 +WECHAT_APPSECRET=3d37f946bca59a8c082ee8111adf6c6c
@@ -92,7 +92,7 @@ price.changed.notice.phone=13512519156 @@ -92,7 +92,7 @@ price.changed.notice.phone=13512519156
92 92
93 93
94 shop.status.change.phone=123456 94 shop.status.change.phone=123456
95 -erp.storage=http://serve.yohobuy.com 95 +erp.storage=http://192.168.102.47:9098/erp-gateway-web
96 #\u5e73\u53f0\u7aef\u767b\u9646\u5d4c\u5957iframe\u7684salt 96 #\u5e73\u53f0\u7aef\u767b\u9646\u5d4c\u5957iframe\u7684salt
97 platform.login.salt=yoho9646yoho9646 97 platform.login.salt=yoho9646yoho9646
98 resources_https_enable=true 98 resources_https_enable=true
@@ -109,7 +109,7 @@ admin.login.url=http://192.168.102.211:30012 @@ -109,7 +109,7 @@ admin.login.url=http://192.168.102.211:30012
109 109
110 file.image.gif.size=2621440 110 file.image.gif.size=2621440
111 erp.realStorage.url=http://192.168.13.24:8099/erp-gateway-web/shift_logs/query_stock_num_by_sku 111 erp.realStorage.url=http://192.168.13.24:8099/erp-gateway-web/shift_logs/query_stock_num_by_sku
112 -erp.domain=http://192.168.102.47:9098/erp-gateway-web 112 +erp.domain=http://serve.yohobuy.com
113 113
114 jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066 114 jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066
115 jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066 115 jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
@@ -10,7 +10,7 @@ jdbc.mysql.readonlyinslave = true @@ -10,7 +10,7 @@ jdbc.mysql.readonlyinslave = true
10 10
11 offline.shops.url = http://192.168.102.210:8098/shops 11 offline.shops.url = http://192.168.102.210:8098/shops
12 12
13 -platform.host = http://192.168.102.75:8088/platform 13 +platform.host = http://192.168.102.210:8088/platform
14 14
15 yohobuy.portal.gateway.env.namespace = portal-gateway 15 yohobuy.portal.gateway.env.namespace = portal-gateway
16 yohobuy.portal.gateway.env.serverport = 0 16 yohobuy.portal.gateway.env.serverport = 0
@@ -88,6 +88,8 @@ offline.shops.url = http://192.168.102.47:8098/shops/ @@ -88,6 +88,8 @@ offline.shops.url = http://192.168.102.47:8098/shops/
88 88
89 erp.shop.url = http://192.168.103.48:9098/erp-shop-web/ 89 erp.shop.url = http://192.168.103.48:9098/erp-shop-web/
90 90
  91 +stock.req.url = http://192.168.13.3:7070/erp-gateway-web/finance/calc/calcSknLowestPrice
  92 +
91 platform.login.salt = yoho9646yoho9646 93 platform.login.salt = yoho9646yoho9646
92 94
93 price.audit.firstRoleName = zuzhang1 95 price.audit.firstRoleName = zuzhang1
@@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties
4 4
5 -wechat.access.appid = wx75e5a7c0c88e45c2  
6 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b 5 +wechat.access.appid = wx1e6997242bcfcdfb
  6 +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
7 7
8 wechat.user.get = /cgi-bin/user/get 8 wechat.user.get = /cgi-bin/user/get
9 wechat.user.info = /cgi-bin/user/info 9 wechat.user.info = /cgi-bin/user/info
@@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
4 4
5 -wechat.access.appid = wx75e5a7c0c88e45c2  
6 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b 5 +wechat.access.appid = wx1e6997242bcfcdfb
  6 +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
7 7
8 wechat.small.program.access.appid = wx084ab813d88c594b 8 wechat.small.program.access.appid = wx084ab813d88c594b
9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac 9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
@@ -137,6 +137,13 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=cobar2.yohoops.org:8066 @@ -137,6 +137,13 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=cobar2.yohoops.org:8066
137 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test 137 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
138 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== 138 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
139 139
  140 +jdbc.mysql.yohopassportsplit.master=cobar1.yohoops.org:8066
  141 +jdbc.mysql.yohopassportsplit.slave=cobar2.yohoops.org:8066
  142 +jdbc.mysql.yohopassportsplit.slave2=cobar2.yohoops.org:8066
  143 +jdbc.mysql.yohopassportsplit.slave3=cobar2.yohoops.org:8066
  144 +jdbc.mysql.yohopassportsplit.username=yh_test
  145 +jdbc.mysql.yohopassportsplit.password=9nm0icOwt6bMHjMusIfMLw==
  146 +
140 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 147 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
141 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 148 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
142 149
@@ -2,17 +2,21 @@ autoconfig.properties = sharedAutoconfig @@ -2,17 +2,21 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
5 -wechat.access.appid = wxa93ae0ebf9277248  
6 -wechat.access.secret = 871bd302c7d0603657b68a0354f36868 5 +wechat.access.appid = wx1e6997242bcfcdfb
  6 +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
7 7
8 wechat.small.program.access.appid = wx084ab813d88c594b 8 wechat.small.program.access.appid = wx084ab813d88c594b
9 -wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac 9 +wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948
  10 +
  11 +wechat.subscription.access.appid = wx1e6997242bcfcdfb
  12 +wechat.subscription.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
10 13
11 wechat.user.get = /cgi-bin/user/get 14 wechat.user.get = /cgi-bin/user/get
12 wechat.user.info = /cgi-bin/user/info 15 wechat.user.info = /cgi-bin/user/info
13 16
  17 +wechat.yohoshow.access.appid = wx1fe49f08f41b6c26
  18 +wechat.yohoshow.access.secret =
  19 +
14 yohobuy.wechat.env.namespace = wechat 20 yohobuy.wechat.env.namespace = wechat
15 yohobuy.wechat.env.serverport = 4 21 yohobuy.wechat.env.serverport = 4
16 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy 22 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy
17 -wechat.subscription.access.appid=wx1e6997242bcfcdfb  
18 -wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd  
@@ -181,16 +181,16 @@ jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306 @@ -181,16 +181,16 @@ jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306
181 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306 181 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306
182 182
183 #yoho_passport读写数据分离 183 #yoho_passport读写数据分离
184 -jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306  
185 -jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3306 184 +jdbc.mysql.yohopassport.master=192.168.102.219:3306
  185 +jdbc.mysql.yohopassport.slave=192.168.102.219:3306
186 186
187 #yh_operations配置读写分离 187 #yh_operations配置读写分离
188 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3306 188 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3306
189 jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3306 189 jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3306
190 190
191 #yh_passport读写分离 191 #yh_passport读写分离
192 -jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306  
193 -jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306 192 +jdbc.mysql.yhpassport.master=192.168.102.219:3306
  193 +jdbc.mysql.yhpassport.slave=192.168.102.219:3306
194 194
195 #yh_setting读写分离 195 #yh_setting读写分离
196 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3306 196 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3306
@@ -503,4 +503,17 @@ jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw== @@ -503,4 +503,17 @@ jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw==
503 jdbc.mysql.yhnow.master=192.168.102.17:3306 503 jdbc.mysql.yhnow.master=192.168.102.17:3306
504 jdbc.mysql.yhnow.slave=192.168.102.17:3306 504 jdbc.mysql.yhnow.slave=192.168.102.17:3306
505 jdbc.mysql.yhnow.username=root 505 jdbc.mysql.yhnow.username=root
506 -jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==  
  506 +jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==
  507 +
  508 +
  509 +jdbc.mysql.yhuuc.master=192.168.102.219:3306
  510 +jdbc.mysql.yhuuc.slave=192.168.102.219:3306
  511 +jdbc.mysql.yhuuc.username=yh_test
  512 +jdbc.mysql.yhuuc.password=9nm0icOwt6bMHjMusIfMLw==
  513 +
  514 +jdbc.mysql.yhcms.master=192.168.102.17:3306
  515 +jdbc.mysql.yhcms.slave=192.168.102.17:3306
  516 +jdbc.mysql.yhcms.username=root
  517 +jdbc.mysql.yhcms.password=Z5BMngayHLUxyWLSv6+koA==
  518 +
  519 +
@@ -22,3 +22,7 @@ redis.notsync.twemproxy.addresses=192.168.102.17:6380 @@ -22,3 +22,7 @@ redis.notsync.twemproxy.addresses=192.168.102.17:6380
22 mars.task.switch=true 22 mars.task.switch=true
23 exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7 23 exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
24 24
  25 +activity.save.msg=编辑团队会尽快审核，请留意系统通知
  26 +
  27 +WECHAT_APPID=wx9d0d7dfed5bbaa8b
  28 +WECHAT_APPSECRET=3d37f946bca59a8c082ee8111adf6c6c
@@ -23,4 +23,6 @@ redis.notsync.twemproxy.addresses = 192.168.102.17:6379 @@ -23,4 +23,6 @@ redis.notsync.twemproxy.addresses = 192.168.102.17:6379
23 redis.proxy.address = 192.168.102.17 23 redis.proxy.address = 192.168.102.17
24 redis.readonly.proxy.address = 192.168.102.17 24 redis.readonly.proxy.address = 192.168.102.17
25 25
26 -yohoboys.res.url=http://cmsres.test.yoho.cn  
  26 +yohoboys.res.url=http://cmsres.test.yoho.cn
  27 +
  28 +is_task_enbale=false
@@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
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
11 -crm.send.notice = true 11 +crm.send.notice = false
12 12
13 platform.host=http://192.168.102.48:8088/platform 13 platform.host=http://192.168.102.48:8088/platform
14 platform.coupon.userId=10964 14 platform.coupon.userId=10964
@@ -109,6 +109,8 @@ service.yoho.url = http://service-test3.yohops.com:9999 @@ -109,6 +109,8 @@ service.yoho.url = http://service-test3.yohops.com:9999
109 109
110 erp.shop.url = http://192.168.103.48:9098/erp-shop-web/ 110 erp.shop.url = http://192.168.103.48:9098/erp-shop-web/
111 111
  112 +stock.req.url = http://54.222.172.226:80/erp-gateway-web/finance/calc/calcSknLowestPrice
  113 +
112 shop.status.change.phone = 17895010543 114 shop.status.change.phone = 17895010543
113 115
114 upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco 116 upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
@@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
4 4
5 -wechat.access.appid = wx75e5a7c0c88e45c2  
6 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b 5 +wechat.access.appid = wx1e6997242bcfcdfb
  6 +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
7 7
8 wechat.small.program.access.appid = wx084ab813d88c594b 8 wechat.small.program.access.appid = wx084ab813d88c594b
9 wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948 9 wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948
@@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
4 4
5 -wechat.access.appid = wx75e5a7c0c88e45c2  
6 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b 5 +wechat.access.appid = wx1e6997242bcfcdfb
  6 +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
7 7
8 wechat.small.program.access.appid = wx084ab813d88c594b 8 wechat.small.program.access.appid = wx084ab813d88c594b
9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac 9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac