yohoops / auto_deploy_test · Commits

Go to a project

Authored by jimi.ji
Commit 6208597164743913e0f172664cb0dcb0d1d1c1df 1 parent bf9b37ff

add

Inline Side-by-side
Showing 25 changed files with 155 additions and 155 deletions
@@ -2,7 +2,7 @@ autoconfig.properties = sharedAutoconfig @@ -2,7 +2,7 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
4 4
5 -gateway.api.url = http://api.yoho.yohoops.org 5 +gateway.api.url = http://openresty-java
6 6
7 uic_userInfoRest_enable = true 7 uic_userInfoRest_enable = true
8 8
1 -applepay.notifyurl = http://service.yoho.cn/payment/applepay_notify 1 +applepay.notifyurl = http://openresty-java/payment/applepay_notify
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
@@ -17,20 +17,20 @@ degrade_shareBrandInfo_level = 0 @@ -17,20 +17,20 @@ degrade_shareBrandInfo_level = 0
17 degrade_shareGuang_level = 0 17 degrade_shareGuang_level = 0
18 degrade_userHabits_level = 0 18 degrade_userHabits_level = 0
19 19
20 -erp.gateway.url = http://gateway.erp.yohoops.org/erp-gateway-web/ 20 +erp.gateway.url = http://java-erp/erp-gateway-web/
21 21
22 -erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 22 +erp.order.status.url = http://java-erp/api/orders/status
23 23
24 -erp.shops.batch.center.url = http://gateway.erp.yohoops.org/erp-gateway-web/stock/get_batch_center_stock  
25 -erp.shops.batch.url = http://gateway.erp.yohoops.org/erp-gateway-web/stock/get_batch_stock  
26 -erp.shops.url = http://gateway.erp.yohoops.org/erp-gateway-web/stock/get_stock 24 +erp.shops.batch.center.url = http://java-erp/erp-gateway-web/stock/get_batch_center_stock
  25 +erp.shops.batch.url = http://java-erp/erp-gateway-web/stock/get_batch_stock
  26 +erp.shops.url = http://java-erp/erp-gateway-web/stock/get_stock
27 27
28 file.uploadTempDir = /Data 28 file.uploadTempDir = /Data
29 29
30 is_checksession_enable = true 30 is_checksession_enable = true
31 is_debug_enable = false 31 is_debug_enable = false
32 32
33 -line.shops.url = http://192.168.102.47:8098/shops 33 +line.shops.url = http://java-line:8098/shops
34 34
35 login.skip.modify.weakPwd = Y 35 login.skip.modify.weakPwd = Y
36 36
@@ -45,27 +45,27 @@ photoSearch.secret.key = 45c1ce98ee6b4701d55802989ba240f4 @@ -45,27 +45,27 @@ photoSearch.secret.key = 45c1ce98ee6b4701d55802989ba240f4
45 45
46 photoSearch.service.id = tvn7882z 46 photoSearch.service.id = tvn7882z
47 47
48 -platform.service.url = http://api.platform.yohoops.org:8088/platform 48 +platform.service.url = http://java-yohobuy-platform:8088/platform
49 49
50 portalGateway.ipad.key = ad9fcda2e679cf9229e37feae2cdcf80 50 portalGateway.ipad.key = ad9fcda2e679cf9229e37feae2cdcf80
51 51
52 -portalGateway.service.url = http://api.store.yohoops.org/portal-gateway 52 +portalGateway.service.url = http://java-portal/portal-gateway
53 53
54 -qq.notifyurl = http://service.yoho.cn/payment/qqpay_notify 54 +qq.notifyurl = http://openresty-java/payment/qqpay_notify
55 55
56 student.discount.rate = 0.9 56 student.discount.rate = 0.9
57 57
58 -unionpay.notifyurl = https://service.yoho.cn/payment/unionpay_newnotify 58 +unionpay.notifyurl = https://openresty-java/payment/unionpay_newnotify
59 59
60 users.browse.appVersion = 4.1.0.*** 60 users.browse.appVersion = 4.1.0.***
61 users.browse.expire = 7776000 61 users.browse.expire = 7776000
62 users.browse.numPerUser = 200 62 users.browse.numPerUser = 200
63 users.browse.sync = true 63 users.browse.sync = true
64 64
65 -wechat.app.newnotifyurl = http://service.yoho.cn/payment/weixin_notify  
66 -wechat.app.notifyurl = http://service.yoho.cn/payment/wechat_notify 65 +wechat.app.newnotifyurl = http://openresty-java/payment/weixin_notify
  66 +wechat.app.notifyurl = http://openresty-java/payment/wechat_notify
67 67
68 -wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify 68 +wechat.wap.notifyurl = http://openresty-java/payment/wechatwap_notify
69 69
70 yoho.gateway.env.namespace = gateway 70 yoho.gateway.env.namespace = gateway
71 yoho.gateway.env.serverport = 0 71 yoho.gateway.env.serverport = 0
@@ -7,6 +7,6 @@ jdbc.mysql.readonlyinslave = true @@ -7,6 +7,6 @@ jdbc.mysql.readonlyinslave = true
7 yoho.message.env.namespace = message 7 yoho.message.env.namespace = message
8 yoho.message.env.serverport = 6 8 yoho.message.env.serverport = 6
9 yoho.message.env.webapphome = /home/test/yohoJavaApp/yoho-message/deploy/target 9 yoho.message.env.webapphome = /home/test/yohoJavaApp/yoho-message/deploy/target
10 -browse.service.url = http://api.brower.yohoops.org:8092/brower/ 10 +browse.service.url = http://java-yohobuy-brower:8092/brower/
11 11
12 mobile.limit.sendTimes=50 12 mobile.limit.sendTimes=50
@@ -7,8 +7,8 @@ yoho.messagecontroller.env.serverport = 7 @@ -7,8 +7,8 @@ yoho.messagecontroller.env.serverport = 7
7 yoho.messagecontroller.env.webapphome = /home/test/yohoJavaApp/yoho-message-controller/deploy/target 7 yoho.messagecontroller.env.webapphome = /home/test/yohoJavaApp/yoho-message-controller/deploy/target
8 8
9 ##push redis 9 ##push redis
10 -redis.push.address=172.31.24.77  
11 -redis.push.port=16379 10 +redis.push.address=twemproxy-nosync
  11 +redis.push.port=63790
12 redis.push.auth= 12 redis.push.auth=
13 13
14 redis.pool.maxTotal=200 14 redis.pool.maxTotal=200
@@ -7,8 +7,8 @@ yoho.messagesender.env.serverport = 5 @@ -7,8 +7,8 @@ yoho.messagesender.env.serverport = 5
7 yoho.messagesender.env.webapphome = /home/test/yohoJavaApp/yoho-message-sender/deploy/target 7 yoho.messagesender.env.webapphome = /home/test/yohoJavaApp/yoho-message-sender/deploy/target
8 8
9 ##push redis 9 ##push redis
10 -redis.push.address=172.31.24.77  
11 -redis.push.port=16379 10 +redis.push.address=twemproxy-nosync
  11 +redis.push.port=63790
12 redis.push.auth= 12 redis.push.auth=
13 13
14 #redis pool 14 #redis pool
@@ -7,14 +7,14 @@ yoho.push.env.webapphome = /home/test/yohoJavaApp/yoho-push/deploy/target @@ -7,14 +7,14 @@ yoho.push.env.webapphome = /home/test/yohoJavaApp/yoho-push/deploy/target
7 7
8 ##just for push 8 ##just for push
9 #jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306 9 #jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306
10 -jdbc.mysql.yhpush.master=write.cms.yohoops.org:3306  
11 -jdbc.mysql.yhpush.slave=dbs.slave.yohoops.org:3306 10 +jdbc.mysql.yhpush.master=mysql-cms:3306
  11 +jdbc.mysql.yhpush.slave=mysql-cms:3306
12 jdbc.mysql.yhpush.username=yh_vpc_bak 12 jdbc.mysql.yhpush.username=yh_vpc_bak
13 -jdbc.mysql.yhpush.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA= 13 +jdbc.mysql.yhpush.password=hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
14 14
15 ##push redis 15 ##push redis
16 -redis.push.address=172.31.24.77  
17 -redis.push.port=16379 16 +redis.push.address=twemproxy-nosync
  17 +redis.push.port=63790
18 redis.push.auth= 18 redis.push.auth=
19 19
20 redis.pool.maxTotal=200 20 redis.pool.maxTotal=200
@@ -6,14 +6,14 @@ yoho.search.adaptor.env.serverport = 5 @@ -6,14 +6,14 @@ yoho.search.adaptor.env.serverport = 5
6 yoho.search.adaptor.env.webapphome = /home/test/yohoJavaApp/yoho-search-adaptor/deploy/target 6 yoho.search.adaptor.env.webapphome = /home/test/yohoJavaApp/yoho-search-adaptor/deploy/target
7 yoho.search.adaptor.env.namespace = yoho-search-adaptor 7 yoho.search.adaptor.env.namespace = yoho-search-adaptor
8 8
9 -tbl.product.url = http://service.api.global.yohobuy.com/product/api/v1/detail/ 9 +tbl.product.url = http://java-yoho-search-service:8080/product/api/v1/detail/
10 10
11 web.context = yohosearchadaptor 11 web.context = yohosearchadaptor
12 12
13 -ip.port.search.server = search.yohoops.org 13 +ip.port.search.server = java-yoho-search-service:8080
14 jdbc.mysql.yhshops.datasources = yh_shops 14 jdbc.mysql.yhshops.datasources = yh_shops
15 15
16 -jdbc.mysql.yhshops.master = write.shops.yohoops.org:3306  
17 -jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3306 16 +jdbc.mysql.yhshops.master = mysql-shops:3306
  17 +jdbc.mysql.yhshops.slave = mysql-shops:3306
18 jdbc.mysql.yhshops.username = yh_vpc_bak 18 jdbc.mysql.yhshops.username = yh_vpc_bak
19 -jdbc.mysql.yhshops.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=  
  19 +jdbc.mysql.yhshops.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
@@ -6,11 +6,11 @@ yoho.search.consumer.env.serverport = 8 @@ -6,11 +6,11 @@ yoho.search.consumer.env.serverport = 8
6 yoho.search.consumer.env.webapphome = /home/test/yohoJavaApp/yoho-search-consumer/deploy/target 6 yoho.search.consumer.env.webapphome = /home/test/yohoJavaApp/yoho-search-consumer/deploy/target
7 7
8 #search-tbl 8 #search-tbl
9 -tbl.product.url = http://service.api.global.yohobuy.com/product/api/v1/detail/ 9 +tbl.product.url = http://java-yoho-search-service:8080/product/api/v1/detail/
10 10
11 #search-adaptor 11 #search-adaptor
12 tpl.adaptor.valid = false 12 tpl.adaptor.valid = false
13 -tpl.adaptor.domain = http://search.adaptor.yohoops.org:8085/yoho-search-adaptor 13 +tpl.adaptor.domain = http://java-yoho-search-adaptor:8085/yoho-search-adaptor
14 14
15 #build.productindex.use.code 15 #build.productindex.use.code
16 build.productindex.use.code=true 16 build.productindex.use.code=true
@@ -9,7 +9,7 @@ yoho.search.producer.env.webapphome = /home/test/yohoJavaApp/yoho-search-produc @@ -9,7 +9,7 @@ yoho.search.producer.env.webapphome = /home/test/yohoJavaApp/yoho-search-produc
9 9
10 //canal 10 //canal
11 canal.hostType=zkCluster 11 canal.hostType=zkCluster
12 -canal.server.port=zk01.yohoops.org:2181,zk02.yohoops.org:2181,zk03.yohoops.org:2181,zk04.yohoops.org:2181,zk05.yohoops.org:2181 12 +canal.server.port=zk:2181
13 13
14 ##canal-shop 14 ##canal-shop
15 canal.destination.shop=shops 15 canal.destination.shop=shops
@@ -8,7 +8,7 @@ yoho.sns.env.namespace = sns @@ -8,7 +8,7 @@ yoho.sns.env.namespace = sns
8 yoho.sns.env.serverport = 2 8 yoho.sns.env.serverport = 2
9 yoho.sns.env.webapphome = /home/test/yohoJavaApp/yoho-sns/deploy/target 9 yoho.sns.env.webapphome = /home/test/yohoJavaApp/yoho-sns/deploy/target
10 10
11 -browse.service.url = http://api.brower.yohoops.org:8092/brower/ 11 +browse.service.url = http://java-yohobuy-brower:8092/brower/
12 12
13 m.yohoblk.com=http://m.yohoblk.com 13 m.yohoblk.com=http://m.yohoblk.com
14 www.yohoblk.com=http://www.yohoblk.com 14 www.yohoblk.com=http://www.yohoblk.com
@@ -2,16 +2,16 @@ autoconfig.properties = sharedAutoconfig @@ -2,16 +2,16 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
4 4
5 -platform.login.url = http://serve.erp.yohoops.org/service/account/v1/Profile/login 5 +platform.login.url = http://java-erp/service/account/v1/Profile/login
6 6
7 -social.domain = http://social.yoho.cn 7 +social.domain = http://java-social
8 8
9 -uic.service.url = http://uic.yohoops.org:8096/uic/ 9 +uic.service.url = http://java-uic:8096/uic/
10 10
11 yohoboy.service.url = http://new.yohoboys.com/yohoboyins/v5/channel 11 yohoboy.service.url = http://new.yohoboys.com/yohoboyins/v5/channel
12 12
13 -gateway.service.url = http://service.yoho.yohoops.org/  
14 -gateway.api.url = http://api.yoho.yohoops.org/ 13 +gateway.service.url = http://openresty-java/
  14 +gateway.api.url = http://openresty-java/
15 15
16 yoho.social.env.namespace = social 16 yoho.social.env.namespace = social
17 yoho.social.env.serverport = 5 17 yoho.social.env.serverport = 5
@@ -8,7 +8,7 @@ des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ @@ -8,7 +8,7 @@ des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
8 8
9 diff.base.flag = 1 9 diff.base.flag = 1
10 10
11 -erp.user.useGiftcard.url = http://api.erp.yohobuy.com 11 +erp.user.useGiftcard.url = http://erp-api
12 12
13 jdbc.mysql.readonlyinslave = true 13 jdbc.mysql.readonlyinslave = true
14 14
@@ -16,9 +16,9 @@ register.image.onoff = off @@ -16,9 +16,9 @@ register.image.onoff = off
16 16
17 register.new.user.page.probability = 5 17 register.new.user.page.probability = 5
18 18
19 -uic.service.url = http://uic.yohoops.org:8096/uic 19 +uic.service.url = http://java-uic:8096/uic
20 20
21 -union.domain.url = http://union.yoho.cn/union 21 +union.domain.url = http://java-yohobuy-union/union
22 22
23 user.bankInfo.redisExpire = 24 23 user.bankInfo.redisExpire = 24
24 24
@@ -44,7 +44,7 @@ users.yohocoin.dilute = true @@ -44,7 +44,7 @@ users.yohocoin.dilute = true
44 verify_student_flag = false 44 verify_student_flag = false
45 45
46 invite.code.activity.id = 2024 46 invite.code.activity.id = 2024
47 -invite.code.url = https://union.yoho.cn/union/app-downloads.html?union_type=100000000005441 47 +invite.code.url = https://java-yohobuy-union/union/app-downloads.html?union_type=100000000005441
48 48
49 yoho.users.env.namespace = users 49 yoho.users.env.namespace = users
50 yoho.users.env.serverport = 1 50 yoho.users.env.serverport = 1
@@ -2,7 +2,7 @@ autoconfig.properties = sharedAutoconfig @@ -2,7 +2,7 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/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://openresty-java/activity/cocacola/html/index1.html
6 6
7 drawline.luckyUserNotice.interval = 5 7 drawline.luckyUserNotice.interval = 5
8 8
@@ -10,7 +10,7 @@ drawline.luckydraw.interval = 360 @@ -10,7 +10,7 @@ drawline.luckydraw.interval = 360
10 10
11 execute.timetask.host =192.168.90.9 11 execute.timetask.host =192.168.90.9
12 12
13 -gateway.url = http://api.yoho.cn 13 +gateway.url = http://openresty-java
14 14
15 is_debug_enable = false 15 is_debug_enable = false
16 16
@@ -22,7 +22,7 @@ orderShare.recevied.maxNum = 5 @@ -22,7 +22,7 @@ orderShare.recevied.maxNum = 5
22 22
23 orderShare.shareUrl = http://m.yohobuy.com/coupon/index 23 orderShare.shareUrl = http://m.yohobuy.com/coupon/index
24 24
25 -tencentmkt.shareUrl = http://service.yoho.cn/activity/tencentMkt/index.html 25 +tencentmkt.shareUrl = http://openresty-java/activity/tencentMkt/index.html
26 26
27 yoho.activity.env.namespace = activity 27 yoho.activity.env.namespace = activity
28 yoho.activity.env.serverport = 0 28 yoho.activity.env.serverport = 0
@@ -33,4 +33,4 @@ userday.open.day=60 @@ -33,4 +33,4 @@ userday.open.day=60
33 33
34 userday.coupon.oct={"10":38208,"40":38210,"70":38212} 34 userday.coupon.oct={"10":38208,"40":38210,"70":38212}
35 35
36 -yoho.crm.online.dns=http://api.crm.yohoops.org:8093/crm/  
  36 +yoho.crm.online.dns=http://java-yohobuy-crm:8093/crm/
@@ -22,10 +22,10 @@ yoho.bigData.env.namespace = bigdata @@ -22,10 +22,10 @@ yoho.bigData.env.namespace = bigdata
22 yoho.bigData.env.serverport = 1 22 yoho.bigData.env.serverport = 1
23 yoho.bigData.env.webapphome = /home/test/yohoJavaApp/yohobuy-bigdata/deploy/target 23 yoho.bigData.env.webapphome = /home/test/yohoJavaApp/yohobuy-bigdata/deploy/target
24 24
25 -jdbc.mysql.bigdata.master=bigdata.db.union.yohoops.org:3306 25 +jdbc.mysql.bigdata.master=mysql-bigdata:3306
26 jdbc.mysql.bigdata.username=yh_bigdata 26 jdbc.mysql.bigdata.username=yh_bigdata
27 #yoho@7Y$^YpNb7hp 27 #yoho@7Y$^YpNb7hp
28 jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 28 jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
29 29
30 bigdata.database.cluster.name = shop 30 bigdata.database.cluster.name = shop
31 -ip.port.search.server = search.yohoops.org  
  31 +ip.port.search.server = java-yoho-search-service
@@ -13,4 +13,4 @@ yohobuy.brower.env.webapphome = /home/test/yohoJavaApp/yohobuy-brower/deploy/ta @@ -13,4 +13,4 @@ yohobuy.brower.env.webapphome = /home/test/yohoJavaApp/yohobuy-brower/deploy/ta
13 13
14 rabbit_concurrent=3 14 rabbit_concurrent=3
15 15
16 -api.yoho.url = http://api-pt.yohoops.org 16 +api.yoho.url = http://openresty-java
@@ -7,8 +7,8 @@ jdbc.mysql.readonlyinslave=true @@ -7,8 +7,8 @@ jdbc.mysql.readonlyinslave=true
7 7
8 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties 8 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
9 9
10 -bigData.url=http://123.207.166.124:8080/bigdata/crm/  
11 -search.url=192.168.102.216:8080 10 +bigData.url=http://java-yohobuy-bigdata:8080/bigdata/crm/
  11 +search.url=java-yoho-search-service:8080
12 12
13 qiniu.domain=http://7xnrdp.com1.z0.glb.clouddn.com 13 qiniu.domain=http://7xnrdp.com1.z0.glb.clouddn.com
14 qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m 14 qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
@@ -19,24 +19,24 @@ qiniu.bucket=test @@ -19,24 +19,24 @@ qiniu.bucket=test
19 aesKey=yoho96461qaz2wsx 19 aesKey=yoho96461qaz2wsx
20 20
21 #SMS_URL 21 #SMS_URL
22 -sms.url=http://211.147.239.62:9050/cgi-bin/sendsms 22 +sms.url=http://java-sms:9050/cgi-bin/sendsms
23 sms.name=yohoyx@yohoyx 23 sms.name=yohoyx@yohoyx
24 sms.pwd=EH+iuWSAfINJYwSdPgVqhA== 24 sms.pwd=EH+iuWSAfINJYwSdPgVqhA==
25 sms.reprot.flag=false 25 sms.reprot.flag=false
26 26
27 #FTP 27 #FTP
28 -ftp.ip=123.206.26.127 28 +ftp.ip=java-ftp
29 ftp.port=21 29 ftp.port=21
30 ftp.userName=ftpuser 30 ftp.userName=ftpuser
31 ftp.pwd=ok83sQlrvHfw8OBMz6xlRA== 31 ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
32 32
33 -rabbit_common=192.168.103.58:5672 33 +rabbit_common=mq-common:5672
34 rabbit_common_user=yoho 34 rabbit_common_user=yoho
35 rabbit_common_password=yoho 35 rabbit_common_password=yoho
36 rabbit_vhost=yoho 36 rabbit_vhost=yoho
37 37
38 -redis.crm.proxy.address=192.168.103.58  
39 -redis.crm.notsync.twemproxy.addresses=192.168.103.58:6379 38 +redis.crm.proxy.address=twemproxy-nosync
  39 +redis.crm.notsync.twemproxy.addresses=twemproxy-nosync:63790
40 40
41 crm.send.notice=false 41 crm.send.notice=false
42 #alarm_mobile 42 #alarm_mobile
@@ -67,13 +67,13 @@ birthday.coupon.sms.templateid=2 @@ -67,13 +67,13 @@ birthday.coupon.sms.templateid=2
67 aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k= 67 aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k=
68 aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58= 68 aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58=
69 69
70 -platform.host=http://192.168.102.210:8088/platform  
71 -platform.gray.host = http://192.168.102.210:8088/platform 70 +platform.host=http://java-yohobuy-platform:8088/platform
  71 +platform.gray.host = http://java-yohobuy-platform:8088/platform
72 72
73 platform.coupon.userId=10964 73 platform.coupon.userId=10964
74 platform.coupon.userName=crm 74 platform.coupon.userName=crm
75 75
76 -browse.service.url=http://192.168.103.59:8092/brower/ 76 +browse.service.url=http://java-yohobuy-brower:8092/brower/
77 77
78 # ******************** 定时器时间配置 ******************** 78 # ******************** 定时器时间配置 ********************
79 79
@@ -93,9 +93,9 @@ wechart.retry.scheduler=0 0 2 * * ? @@ -93,9 +93,9 @@ wechart.retry.scheduler=0 0 2 * * ?
93 sms.clean.scheduler=0 0 2 * * ? 93 sms.clean.scheduler=0 0 2 * * ?
94 94
95 #大数据 95 #大数据
96 -jdbc.mysql.bigdataunion.slave=118.89.235.30:3306  
97 -jdbc.mysql.bigdataunion.username=root  
98 -jdbc.mysql.bigdataunion.password=t5/oMgwUCmO/GeMHBAQ2Cg== 96 +jdbc.mysql.bigdataunion.slave=mysql-bigdata:3306
  97 +jdbc.mysql.bigdataunion.username=yh_vpc_bak
  98 +jdbc.mysql.bigdataunion.password=hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
99 99
100 #Mars接口域名 100 #Mars接口域名
101 mars.host=http://mars-test.yohops.com:9999/ 101 mars.host=http://mars-test.yohops.com:9999/
@@ -4,11 +4,11 @@ yohobuy.global.env.namespace=globalbuy @@ -4,11 +4,11 @@ yohobuy.global.env.namespace=globalbuy
4 4
5 is_debug_enable=false 5 is_debug_enable=false
6 6
7 -yhb_api_url=http://api.yoho.cn  
8 -yhb_search_url=http://search.yohoops.org/yohosearch/tblproduct/search.json 7 +yhb_api_url=http://openresty-java
  8 +yhb_search_url=http://java-yoho-search-service:8080/yohosearch/tblproduct/search.json
9 9
10 -globalbuyRedis.proxy.address=qqg.redis.yohoops.org  
11 -globalbuyRedis.proxy.port=16379 10 +globalbuyRedis.proxy.address=twemproxy-nosync
  11 +globalbuyRedis.proxy.port=63790
12 redis.proxy.auth= 12 redis.proxy.auth=
13 13
14 redis.pool.maxTotal=100 14 redis.pool.maxTotal=100
@@ -4,10 +4,10 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoc @@ -4,10 +4,10 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoc
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
7 -erp.order.create.url = http://portal.admin.yohobuy.com/api/orderform/create 7 +erp.order.create.url = http://java-erp/api/orderform/create
8 erp.order.express.sync.type = MQ 8 erp.order.express.sync.type = MQ
9 erp.order.refund.sync.type = MQ 9 erp.order.refund.sync.type = MQ
10 -erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 10 +erp.order.status.url = http://java-erp/api/orders/status
11 11
12 java.logs.home = /home/test/yohoJavaLogs 12 java.logs.home = /home/test/yohoJavaLogs
13 13
@@ -44,25 +44,25 @@ exhibition.ticket.couponid=29640 @@ -44,25 +44,25 @@ exhibition.ticket.couponid=29640
44 package.ticket.couponid=29642 44 package.ticket.couponid=29642
45 45
46 # 支付回调地址 46 # 支付回调地址
47 -applepay.notifyurl = http://service-pt-1.yohoops.org/payment/applepay_notify  
48 -qq.notifyurl = http://service-pt-1.yohoops.org/payment/qqpay_notify  
49 -unionpay.notifyurl = https://service-pt-1.yohoops.org/payment/unionpay_newnotify  
50 -wechat.app.newnotifyurl = http://service-pt-1.yohoops.org/payment/weixin_notify  
51 -wechat.app.notifyurl = http://service-pt-1.yohoops.org/payment/wechat_notify  
52 -alipay.notifyurl = https://service-pt-1.yohoops.org/payment/alipay_notify  
53 -cmbnetpay.payNoticeUrl = https://service-pt-1.yohoops.org/payment/cmbpay_notify  
54 -cmbnetpay.signNoticeUrl = https://service-pt-1.yohoops.org/payment/cmbsign_notify 47 +applepay.notifyurl = http://openresty-java/payment/applepay_notify
  48 +qq.notifyurl = http://openresty-java/payment/qqpay_notify
  49 +unionpay.notifyurl = https://openresty-java/payment/unionpay_newnotify
  50 +wechat.app.newnotifyurl = http://openresty-java/payment/weixin_notify
  51 +wechat.app.notifyurl = http://openresty-java/payment/wechat_notify
  52 +alipay.notifyurl = https://openresty-java/payment/alipay_notify
  53 +cmbnetpay.payNoticeUrl = https://openresty-java/payment/cmbpay_notify
  54 +cmbnetpay.signNoticeUrl = https://openresty-java/payment/cmbsign_notify
55 55
56 # unionmpos env: 00,production enviroment; 01,test enviroment 56 # unionmpos env: 00,production enviroment; 01,test enviroment
57 unionmpos.env=00 57 unionmpos.env=00
58 58
59 -browse.service.url = http://api.brower.yohoops.org:8092/brower/ 59 +browse.service.url = http://java-yohobuy-brower:8092/brower/
60 60
61 -erp.offline.lock.url=http://gateway.erp.yohoops.org/erp-gateway-web  
62 -erp.offline.erp-portal-gateway.url = http://api.store.yohoops.org/portal-gateway 61 +erp.offline.lock.url=http://java-offline/erp-gateway-web
  62 +erp.offline.erp-portal-gateway.url = http://java-offline/portal-gateway
63 63
64 -offline.portal.gateway.url=instore.yohobuy.com 64 +offline.portal.gateway.url=java-offline
65 offline.portal.gateway.clienttype=yoho 65 offline.portal.gateway.clienttype=yoho
66 offline.portal.gateway.clientkey=fd4ad5fcsa0de589af23234ks1923ks 66 offline.portal.gateway.clientkey=fd4ad5fcsa0de589af23234ks1923ks
67 67
68 -offline.portal.gateway.apistore.url=http://api.store.yohoops.org 68 +offline.portal.gateway.apistore.url=http://java-offline
1 admin.login.url = http://127.0.0.1:30012 1 admin.login.url = http://127.0.0.1:30012
2 2
3 -admin.portal.url = http://admin.portal.yohobuy.com 3 +admin.portal.url = http://java-portal
4 4
5 -api.yoho.url = http://api-pt.yohoops.org 5 +api.yoho.url = http://openresty-java
6 6
7 -auth.user.req.url = http://gw.api.yohobuy.com/erp-shop-web/account/profile/queryAllAuth 7 +auth.user.req.url = http://java-erp/erp-shop-web/account/profile/queryAllAuth
8 8
9 autoconfig.properties = sharedAutoconfig 9 autoconfig.properties = sharedAutoconfig
10 10
11 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 11 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
12 12
13 -bigData.analytics.transfer.url = http://analytics.m.yohobuy.com/yas.gif/web/ 13 +bigData.analytics.transfer.url = http://analytics.m.yohoops.org/yas.gif/web/
14 14
15 bigDataRedis.pool.maxIdle = 100 15 bigDataRedis.pool.maxIdle = 100
16 bigDataRedis.pool.maxTotal = 100 16 bigDataRedis.pool.maxTotal = 100
@@ -29,29 +29,29 @@ bigdata.qiniu.secretkey = qAns6jrf9pg6bHNvS1IcKi-pnVBWV46pbpFWKwJ7 @@ -29,29 +29,29 @@ bigdata.qiniu.secretkey = qAns6jrf9pg6bHNvS1IcKi-pnVBWV46pbpFWKwJ7
29 29
30 bigdata.sitemap.url = http://o9tw3bcp2.bkt.clouddn.com 30 bigdata.sitemap.url = http://o9tw3bcp2.bkt.clouddn.com
31 31
32 -crawler.host = http://10.66.100.2:9100 32 +crawler.host = http://java-crawler:9100
33 33
34 -erp.domain = http://gateway.erp.yohoops.org/erp-gateway-web 34 +erp.domain = http://java-erp/erp-gateway-web
35 35
36 -erp.platform.shops.url = http://api.erp.yohobuy.com 36 +erp.platform.shops.url = http://java-erp
37 37
38 -erp.realStorage.url = http://gateway.erp.yohoops.org/erp-gateway-web/shift_logs/query_stock_num_by_sku 38 +erp.realStorage.url = http://java-erp/erp-gateway-web/shift_logs/query_stock_num_by_sku
39 39
40 -erp.shop.url = http://gw.api.yohobuy.com/erp-shop-web/ 40 +erp.shop.url = http://java-erp/erp-shop-web/
41 41
42 -erp.shops.account.url = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist  
43 -erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword  
44 -erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login 42 +erp.shops.account.url = http://java-erp/service/finance/v1/clearing/balancelist
  43 +erp.shops.change.pwd.url = http://java-erp/service/account/v1/Profile/updatePassword
  44 +erp.shops.login.url = http://java-erp/service/account/v1/Profile/login
45 45
46 -erp.storage = http://serve.yohobuy.com 46 +erp.storage = http://java-erp
47 47
48 -erp.virtualinventory.setNumberBySkn.url = http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn 48 +erp.virtualinventory.setNumberBySkn.url = http://java-erp/service/supplier/v1/virtualinventory/setNumberBySkn
49 49
50 -execute.limitcode.host = 172.31.20.7 50 +execute.limitcode.host = java-execute
51 51
52 -execute.shopmessage.host = 172.31.20.7 52 +execute.shopmessage.host = java-execute
53 53
54 -execute.update_product_price.host = 172.31.20.7 54 +execute.update_product_price.host = java-execute
55 55
56 file.image.gif.size = 2621440 56 file.image.gif.size = 2621440
57 file.image.size = 512000 57 file.image.size = 512000
@@ -61,41 +61,41 @@ file.saveDir = /Data/images @@ -61,41 +61,41 @@ file.saveDir = /Data/images
61 file.uploadMalongImgDir = /Data/malong 61 file.uploadMalongImgDir = /Data/malong
62 file.uploadTempDir = /Data/images 62 file.uploadTempDir = /Data/images
63 63
64 -gateway.service.url = http://service.yoho.cn  
65 -  
66 -jdbc.mysql.platform.erp_account.master = write.erp.yohoops.org:3306  
67 -jdbc.mysql.platform.erp_account.password = NOUasZz6vYU/DUnkWudOAqMwEu/zaKV31I9S8xDJIUA=  
68 -jdbc.mysql.platform.erp_account.slave = read3.erp.yohoops.org:3306  
69 -jdbc.mysql.platform.erp_account.username = yh_erp_db  
70 -jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3306  
71 -jdbc.mysql.platform.erp_product.password = NOUasZz6vYU/DUnkWudOAqMwEu/zaKV31I9S8xDJIUA=  
72 -jdbc.mysql.platform.erp_product.slave = read3.erp.yohoops.org:3306  
73 -jdbc.mysql.platform.erp_product.username = yh_erp_db  
74 -jdbc.mysql.platform.erp_supplier.password = NOUasZz6vYU/DUnkWudOAqMwEu/zaKV31I9S8xDJIUA=  
75 -jdbc.mysql.platform.erp_supplier.username = yh_erp_db  
76 -jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306  
77 -jdbc.mysql.platform.yh_guang.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=  
78 -jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306 64 +gateway.service.url = http://openresty-java
  65 +
  66 +jdbc.mysql.platform.erp_account.master = mysql-erp:3306
  67 +jdbc.mysql.platform.erp_account.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  68 +jdbc.mysql.platform.erp_account.slave = mysql-erp:3306
  69 +jdbc.mysql.platform.erp_account.username = yh_vpc_bak
  70 +jdbc.mysql.platform.erp_product.master = mysql-erp:3306
  71 +jdbc.mysql.platform.erp_product.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  72 +jdbc.mysql.platform.erp_product.slave = mysql-erp:3306
  73 +jdbc.mysql.platform.erp_product.username = yh_vpc_bak
  74 +jdbc.mysql.platform.erp_supplier.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  75 +jdbc.mysql.platform.erp_supplier.username = yh_vpc_bak
  76 +jdbc.mysql.platform.yh_guang.master = mysql-cms:3306
  77 +jdbc.mysql.platform.yh_guang.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  78 +jdbc.mysql.platform.yh_guang.slave = mysql-cms:3306
79 jdbc.mysql.platform.yh_guang.username = yh_vpc_bak 79 jdbc.mysql.platform.yh_guang.username = yh_vpc_bak
80 -jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306  
81 -jdbc.mysql.platform.yhb_account.password = NOUasZz6vYU/DUnkWudOAqMwEu/zaKV31I9S8xDJIUA=  
82 -jdbc.mysql.platform.yhb_account.slave = read3.erp.yohoops.org:3306  
83 -jdbc.mysql.platform.yhb_account.username = yh_erp_db 80 +jdbc.mysql.platform.yhb_account.master = mysql-erp:3306
  81 +jdbc.mysql.platform.yhb_account.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  82 +jdbc.mysql.platform.yhb_account.slave = mysql-erp:3306
  83 +jdbc.mysql.platform.yhb_account.username = yh_vpc_bak
84 84
85 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47 85 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
86 malongApi.imageSetId = 7tm74zfv 86 malongApi.imageSetId = 7tm74zfv
87 malongApi.paiUserId = 1714 87 malongApi.paiUserId = 1714
88 malongApi.secretKey = 45c1ce98ee6b4701d55802989ba240f4 88 malongApi.secretKey = 45c1ce98ee6b4701d55802989ba240f4
89 89
90 -mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html 90 +mkt.activity.domain.url = http://java-yohobuy-union/union/tencentMkt/index.html
91 91
92 mkt.app.download.url = http://m.yohobuy.com/app 92 mkt.app.download.url = http://m.yohobuy.com/app
93 93
94 -mkt.pcwap.domain.url = http://union.yoho.cn/union/go 94 +mkt.pcwap.domain.url = http://java-yohobuy-union/union/go
95 95
96 mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1 96 mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
97 97
98 -offline.shops.url = http://adminstore.yohoops.org/shops 98 +offline.shops.url = http://java-offline/shops
99 99
100 platform.login.salt = yoho9646yoho9646 100 platform.login.salt = yoho9646yoho9646
101 101
@@ -107,25 +107,25 @@ price.changed.notice.phone = 18105178926,17895010543,17608015989,18652008443,13 @@ -107,25 +107,25 @@ price.changed.notice.phone = 18105178926,17895010543,17608015989,18652008443,13
107 107
108 price.over.days.roleName = 444 108 price.over.days.roleName = 444
109 109
110 -price.selltype.url = http://gateway.erp.yohoops.org/erp-gateway-web/plate_price_form/list_product_info 110 +price.selltype.url = http://java-erp/erp-gateway-web/plate_price_form/list_product_info
111 111
112 qiniu.bigdata.skndada.folderName = /Data/bigdata/ 112 qiniu.bigdata.skndada.folderName = /Data/bigdata/
113 113
114 resources_https_enable = true 114 resources_https_enable = true
115 115
116 -search.server.address = http://search.yohoops.org/yohosearch/ 116 +search.server.address = http://java-yoho-search-service:8080/yohosearch/
117 117
118 -service.yoho.url = http://service.yoho.cn 118 +service.yoho.url = http://openresty-java
119 119
120 shop.status.change.phone = 13901031676,13910715745,13817834488,15651892695,15651892221,13813898627,13811251311,18602565212,13910268241,18666628755,13146085963,13951853540,13851573106,15905171841,18652978258,18626439680,13905172541,15895984489,18512524901,15062262013,18801044770,15652292115,18672559651,15651702116,17608015989,13451938602,17895010543 120 shop.status.change.phone = 13901031676,13910715745,13817834488,15651892695,15651892221,13813898627,13811251311,18602565212,13910268241,18666628755,13146085963,13951853540,13851573106,15905171841,18652978258,18626439680,13905172541,15895984489,18512524901,15062262013,18801044770,15652292115,18672559651,15651702116,17608015989,13451938602,17895010543
121 121
122 -stock.req.url = http://gateway.erp.yohoops.org/erp-gateway-web/finance/calc/calcSknLowestPrice 122 +stock.req.url = http://java-erp/erp-gateway-web/finance/calc/calcSknLowestPrice
123 123
124 sync.product.isPromotion.advance.minutes = 5 124 sync.product.isPromotion.advance.minutes = 5
125 125
126 -unionRedis.proxy.address = union.redis.yohoops.org 126 +unionRedis.proxy.address = twempeoxy-nosync
127 unionRedis.proxy.auth = 127 unionRedis.proxy.auth =
128 -unionRedis.proxy.port = 6379 128 +unionRedis.proxy.port = 63790
129 129
130 upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco 130 upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
131 upload.tencent.product.mark = 9.99 131 upload.tencent.product.mark = 9.99
@@ -137,4 +137,4 @@ watchService.watchDir = /Data/sftp_images @@ -137,4 +137,4 @@ watchService.watchDir = /Data/sftp_images
137 yohobuy.platform.env.namespace = platform 137 yohobuy.platform.env.namespace = platform
138 yohobuy.platform.env.serverport = 8 138 yohobuy.platform.env.serverport = 8
139 yohobuy.platform.env.webapphome = /home/test/yohoJavaApp/yohobuy-platform/deploy/target 139 yohobuy.platform.env.webapphome = /home/test/yohoJavaApp/yohobuy-platform/deploy/target
140 -manager.zkAddress = 172.31.20.7:2181,172.31.23.161:2181 140 +manager.zkAddress = zk:2181
@@ -2,16 +2,16 @@ autoconfig.properties = sharedAutoconfig @@ -2,16 +2,16 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
4 4
5 -front.gateway.host = http://api.yoho.cn 5 +front.gateway.host = http://openresty-java
6 #grey 6 #grey
7 # front.gateway.host = http://service.yoho.yohoops.org 7 # front.gateway.host = http://service.yoho.yohoops.org
8 8
9 is_debug_enable = false 9 is_debug_enable = false
10 10
11 -offline.shops.url = http://adminstore.yohoops.org/shops 11 +offline.shops.url = http://java-erp/shops
12 12
13 #platform.host = http://172.31.20.7:8088/platform 13 #platform.host = http://172.31.20.7:8088/platform
14 -platform.host = http://172.31.23.161:8088/platform 14 +platform.host = http://java-yohobuy-platform:8088/platform
15 15
16 yohobuy.portal.gateway.env.namespace = portal-gateway 16 yohobuy.portal.gateway.env.namespace = portal-gateway
17 yohobuy.portal.gateway.env.serverport = 0 17 yohobuy.portal.gateway.env.serverport = 0
@@ -4,7 +4,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoc @@ -4,7 +4,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoc
4 4
5 jdbc.mysql.readonlyinslave = false 5 jdbc.mysql.readonlyinslave = false
6 6
7 -rabbitAddress = 192.168.102.162:32810 7 +rabbitAddress = mq-common:5672
8 8
9 yohobuy.product.env.namespace = product 9 yohobuy.product.env.namespace = product
10 yohobuy.product.env.serverport = 3 10 yohobuy.product.env.serverport = 3
@@ -2,11 +2,11 @@ autoconfig.properties = sharedAutoconfig @@ -2,11 +2,11 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
4 4
5 -erp.domain = http://gateway.erp.yohoops.org/erp-gateway-web 5 +erp.domain = http://java-erp/erp-gateway-web
6 6
7 -gateway.domain.url = http://api.yoho.cn 7 +gateway.domain.url = http://openresty-java
8 8
9 -ip.port.search.server = http://search.yohoops.org 9 +ip.port.search.server = http://java-yoho-search-service:8080
10 10
11 jdbc.mysql.readonlyinslave = true 11 jdbc.mysql.readonlyinslave = true
12 12
@@ -15,16 +15,16 @@ password.aes.key = yoho9646yoho9646 @@ -15,16 +15,16 @@ password.aes.key = yoho9646yoho9646
15 shop.login.salt = yoho9646yoho9646 15 shop.login.salt = yoho9646yoho9646
16 16
17 # platform.host = http://172.31.20.7:8088/platform 17 # platform.host = http://172.31.20.7:8088/platform
18 -platform.host = http://172.31.23.161:8088/platform 18 +platform.host = http://java-yohobuy-platform:8088/platform
19 19
20 portal.shops.dept.id = 90 20 portal.shops.dept.id = 90
21 21
22 printer.ftp.password = 123456 22 printer.ftp.password = 123456
23 -printer.ftp.url = 172.16.2.243 23 +printer.ftp.url = java-ftp
24 printer.ftp.username = yoho 24 printer.ftp.username = yoho
25 25
26 shop.wifi.img.path = /var/www/icons/ 26 shop.wifi.img.path = /var/www/icons/
27 -shop.wifi.img.url = http://192.168.102.47/icons/ 27 +shop.wifi.img.url = http://java-shop/icons/
28 28
29 storeLockerManager.role.id = 0 29 storeLockerManager.role.id = 0
30 30
@@ -38,7 +38,7 @@ trend.tour.online.time = 1480310438 @@ -38,7 +38,7 @@ trend.tour.online.time = 1480310438
38 38
39 web.context = shops 39 web.context = shops
40 40
41 -wifi.login.url = http://192.168.103.230:8080/am/controller/portal/external/login 41 +wifi.login.url = http://java-wifi:8080/am/controller/portal/external/login
42 42
43 yohobuy.shops.env.namespace = shops 43 yohobuy.shops.env.namespace = shops
44 yohobuy.shops.env.serverport = 8 44 yohobuy.shops.env.serverport = 8
@@ -9,10 +9,10 @@ yoho.logs.level=INFO @@ -9,10 +9,10 @@ yoho.logs.level=INFO
9 9
10 ##jdbc 10 ##jdbc
11 jdbc.mysql.kisjob.datasources = yh_distributed_task 11 jdbc.mysql.kisjob.datasources = yh_distributed_task
12 -jdbc.mysql.kisjob.master = write.cms.yohoops.org:3306  
13 -jdbc.mysql.kisjob.slave = read.cms.yohoops.org:3306 12 +jdbc.mysql.kisjob.master = mysql-cms:3306
  13 +jdbc.mysql.kisjob.slave = mysql-cms:3306
14 jdbc.mysql.kisjob.username = yh_vpc_bak 14 jdbc.mysql.kisjob.username = yh_vpc_bak
15 -jdbc.mysql.kisjob.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA= 15 +jdbc.mysql.kisjob.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
16 16
17 ##redis 17 ##redis
18 redis.pool.maxIdle = 100 18 redis.pool.maxIdle = 100
@@ -23,8 +23,8 @@ redis.pool.testOnBorrow = false @@ -23,8 +23,8 @@ redis.pool.testOnBorrow = false
23 redis.pool.testWhileIdle = false 23 redis.pool.testWhileIdle = false
24 24
25 ##redis for push 25 ##redis for push
26 -redis.push.address=172.31.24.77  
27 -redis.push.port=16379 26 +redis.push.address=twemproxy-nosync
  27 +redis.push.port=63790
28 redis.push.auth= 28 redis.push.auth=
29 29
30 ##config 30 ##config
1 activeTime = 86400 1 activeTime = 86400
2 2
3 -admin.login.url = http://admin.portal.yohobuy.com 3 +admin.login.url = http://java-admin
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties 7 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy_test/autoconfig/test_performance/global-autoconfig.properties
8 8
9 -bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=  
10 -bigdate.db.url = bigdata.db.union.yohoops.org:3306  
11 -bigdate.db.username = yh_bigdata 9 +bigdate.db.password = hWrS6ehZZCOYAcEDgiU7fN8u26r4KcIh
  10 +bigdate.db.url = mysql-bigdata:3306
  11 +bigdate.db.username = yh_vpc_bak
12 12
13 exclude.union.type=100000000000349 13 exclude.union.type=100000000000349
14 draw.writeFile.delay = 60 14 draw.writeFile.delay = 60
15 15
16 -erp.domain = http://gateway.erp.yohoops.org/erp-gateway-web 16 +erp.domain = http://java-erp/erp-gateway-web
17 17
18 -gateway.url = http://api.yoho.cn 18 +gateway.url = http://openresty-java
19 19
20 jdbc.mysql.readonlyinslave = true 20 jdbc.mysql.readonlyinslave = true
21 21
22 platform.login.salt = yoho9646yoho9646 22 platform.login.salt = yoho9646yoho9646
23 23
24 -tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html 24 +tencentmkt.shareUrl = http://java-yohobuy-union/union/tencentMkt/index.html
25 25
26 baidu.tp.push.url=http://sfc.baidu.com/business/article_publish 26 baidu.tp.push.url=http://sfc.baidu.com/business/article_publish
27 baidu.app.id=1566454424306679 27 baidu.app.id=1566454424306679
28 baidu.app.token=b6a5850042758145fefef0f94e5d5133 28 baidu.app.token=b6a5850042758145fefef0f94e5d5133
29 baidu.union.type=100000000005493 29 baidu.union.type=100000000005493
30 30
31 -union.host = 172.31.16.99  
32 -unions.kafka.consumer.servers=10.67.1.23:9092,10.67.1.53:9092,10.67.1.61:9092,10.67.1.69:9092  
33 -unions.kafka.producer.servers=10.67.1.23:9092,10.67.1.53:9092,10.67.1.61:9092,10.67.1.69:9092 31 +union.host = java-yohobuy-union
  32 +unions.kafka.consumer.servers=kafka:9092
  33 +unions.kafka.producer.servers=kafka:9092
34 34
35 yoho.unions.env.namespace = union 35 yoho.unions.env.namespace = union
36 yoho.unions.env.serverport = 8 36 yoho.unions.env.serverport = 8
@@ -23,4 +23,4 @@ wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948 @@ -23,4 +23,4 @@ wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948
23 yohobuy.wechat.env.namespace = wechat 23 yohobuy.wechat.env.namespace = wechat
24 yohobuy.wechat.env.serverport = 4 24 yohobuy.wechat.env.serverport = 4
25 yohobuy.wechat.env.webapphome = /home/test/yohoJavaApp/yohobuy-wechat/deploy/target 25 yohobuy.wechat.env.webapphome = /home/test/yohoJavaApp/yohobuy-wechat/deploy/target
26 -bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/  
  26 +bigData.analytics.transfer.url=http://java-yohobuy-bigdata/yas.gif/web/