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

+
+USER=$(whoami)
+if [[ "$USER" != "test" ]];then
+  echo "ERROR:需切换到test用户！"
+  exit 1
+fi
+
+if [[ $1 ]];then
+cd $1
+git reset --hard origin/master
+git pull;
+else
+echo "未输入路径"
+fi
+

+#!/bin/bash
+
+
+USER=$(whoami)
+if [[ "$USER" != "test" ]];then
+  echo "ERROR:需切换到test用户！"
+  exit 1
+fi
+
+if [[ $1 ]];then
+cd $1
+git add .
+git commit -m "auto push by shell"
+git push
+else
+echo "未输入路径"
+fi

@@ -14,115 +14,115 @@ file.saveDir=/home/test
 
 
 # cobar
-jdbc.mysql.cobar.username=yh_test
-jdbc.mysql.cobar.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.cobar.username=yh_vpc_bak
+jdbc.mysql.cobar.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
 jdbc.mysql.yhwechat.slave=write.passport.yohoops.org:3306
-jdbc.mysql.yhwechat.username=yh_test
-jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhwechat.username=yh_vpc_bak
+jdbc.mysql.yhwechat.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
-jdbc.mysql.yhresource.username=yh_test
-jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhresource.username=yh_vpc_bak
+jdbc.mysql.yhresource.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
- jdbc.mysql.yhshops.username=yh_test
-jdbc.mysql.yhshops.password=9nm0icOwt6bMHjMusIfMLw==
+ jdbc.mysql.yhshops.username=yh_vpc_bak
+jdbc.mysql.yhshops.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 # yh_orders
-jdbc.mysql.yhorders.username=yh_test
-jdbc.mysql.yhorders.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhorders.username=yh_vpc_bak
+jdbc.mysql.yhorders.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 # yhb_operations
-jdbc.mysql.yhboperations.username=yh_test
-jdbc.mysql.yhboperations.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhboperations.username=yh_vpc_bak
+jdbc.mysql.yhboperations.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 # yh_comment
-jdbc.mysql.yhcomment.username=yh_test
-jdbc.mysql.yhcomment.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhcomment.username=yh_vpc_bak
+jdbc.mysql.yhcomment.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yhb_promotion
-jdbc.mysql.yhbpromotion.username=yh_test
-jdbc.mysql.yhbpromotion.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhbpromotion.username=yh_vpc_bak
+jdbc.mysql.yhbpromotion.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yoho_sms配置读写分离
-jdbc.mysql.yohosms.username=yh_test
-jdbc.mysql.yohosms.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohosms.username=yh_vpc_bak
+jdbc.mysql.yohosms.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_inbox配置读写分离
-jdbc.mysql.yhinbox.username=yh_test
-jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhinbox.username=yh_vpc_bak
+jdbc.mysql.yhinbox.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中
-jdbc.mysql.yohologs.username=yh_test
-jdbc.mysql.yohologs.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohologs.username=yh_vpc_bak
+jdbc.mysql.yohologs.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yoho_passport读写数据分离
-jdbc.mysql.yohopassport.username=yh_test
-jdbc.mysql.yohopassport.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohopassport.username=yh_vpc_bak
+jdbc.mysql.yohopassport.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_operations配置读写分离
-jdbc.mysql.yhoperations.username=yh_test
-jdbc.mysql.yhoperations.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhoperations.username=yh_vpc_bak
+jdbc.mysql.yhoperations.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_passport读写分离
-jdbc.mysql.yhpassport.username=yh_test
-jdbc.mysql.yhpassport.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhpassport.username=yh_vpc_bak
+jdbc.mysql.yhpassport.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_setting读写分离
-jdbc.mysql.yhsetting.username=yh_test
-jdbc.mysql.yhsetting.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhsetting.username=yh_vpc_bak
+jdbc.mysql.yhsetting.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_pay
-jdbc.mysql.pay.username=yh_test
-jdbc.mysql.pay.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.pay.username=yh_vpc_bak
+jdbc.mysql.pay.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #event
-jdbc.mysql.yhevents.username=yh_test
-jdbc.mysql.yhevents.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhevents.username=yh_vpc_bak
+jdbc.mysql.yhevents.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 
 #event
-jdbc.mysql.yhcoupons.username=yh_test
-jdbc.mysql.yhcoupons.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhcoupons.username=yh_vpc_bak
+jdbc.mysql.yhcoupons.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_consult
-jdbc.mysql.yhconsult.username=yh_test
-jdbc.mysql.yhconsult.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhconsult.username=yh_vpc_bak
+jdbc.mysql.yhconsult.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #unions
-jdbc.mysql.unions.username=yh_test
-jdbc.mysql.unions.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.unions.username=yh_vpc_bak
+jdbc.mysql.unions.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #model
-jdbc.mysql.yohopushcenter.username=yh_test
-jdbc.mysql.yohopushcenter.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohopushcenter.username=yh_vpc_bak
+jdbc.mysql.yohopushcenter.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
-jdbc.mysql.yhpush.username=yh_test
-jdbc.mysql.yhpush.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhpush.username=yh_vpc_bak
+jdbc.mysql.yhpush.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yoho-activity
-jdbc.mysql.yohoactivity.username=yh_test
-jdbc.mysql.yohoactivity.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohoactivity.username=yh_vpc_bak
+jdbc.mysql.yohoactivity.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_guang
-jdbc.mysql.yhguang.username=yh_test
-jdbc.mysql.yhguang.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhguang.username=yh_vpc_bak
+jdbc.mysql.yhguang.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yhspecial
-jdbc.mysql.yhspecial.username=yh_test
-jdbc.mysql.yhspecial.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhspecial.username=yh_vpc_bak
+jdbc.mysql.yhspecial.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yohood
-jdbc.mysql.yohood.username=yh_test
-jdbc.mysql.yohood.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohood.username=yh_vpc_bak
+jdbc.mysql.yohood.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yohocrm
-jdbc.mysql.yohocrm.username=yh_test
-jdbc.mysql.yohocrm.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yohocrm.username=yh_vpc_bak
+jdbc.mysql.yohocrm.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #erppassport
-jdbc.mysql.erppassport.username=yh_test
-jdbc.mysql.erppassport.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.erppassport.username=yh_vpc_bak
+jdbc.mysql.erppassport.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 # ================
 
 # yh_orders db split cobar的地址
@@ -130,11 +130,11 @@ jdbc.mysql.yhorderssplit.master=cobar1.yohoops.org:8066
 jdbc.mysql.yhorderssplit.slave=cobar2.yohoops.org:8066
 jdbc.mysql.yhorderssplit.slave2=cobar1.yohoops.org:8066
 jdbc.mysql.yhorderssplit.slave3=cobar2.yohoops.org:8066
-jdbc.mysql.yhorderssplit.username=yh_test
-jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhorderssplit.username=yh_vpc_bak
+jdbc.mysql.yhorderssplit.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
-jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhresource.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3307
 
 jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306
 jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306
@@ -144,20 +144,20 @@ jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
 jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
 jdbc.mysql.yhbpromotionsplit.slave2=cobar1.yohoops.org:8066
 jdbc.mysql.yhbpromotionsplit.slave3=cobar2.yohoops.org:8066
-jdbc.mysql.yhbpromotionsplit.username=yh_test
-jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhbpromotionsplit.username=yh_vpc_bak
+jdbc.mysql.yhbpromotionsplit.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 # yh_orders
 jdbc.mysql.yhorders.master=write.orders.yohoops.org:3307
 jdbc.mysql.yhorders.slave=read.orders.yohoops.org:3307
 
 # yhb_operations
-jdbc.mysql.yhboperations.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhboperations.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhboperations.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhboperations.slave=read.cms.yohoops.org:3307
 
 # yh_comment
-jdbc.mysql.yhcomment.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhcomment.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhcomment.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhcomment.slave=read.cms.yohoops.org:3307
 
 #yhb_promotion
 jdbc.mysql.yhbpromotion.master=write.orders.yohoops.org:3307
@@ -179,36 +179,36 @@ jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306
 jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3306
 
 #yh_operations配置读写分离
-jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3307
 
 #yh_passport读写分离
 jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306
 jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306
 
 #yh_setting读写分离
-jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhsetting.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhsetting.slave=read.cms.yohoops.org:3307
 
 #yh_pay
 jdbc.mysql.pay.master=write.orders.yohoops.org:3307
 jdbc.mysql.pay.slave=read.orders.yohoops.org:3307
 
 #event
-jdbc.mysql.yhevents.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhevents.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhevents.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhevents.slave=read.cms.yohoops.org:3307
 
 #event
 jdbc.mysql.yhcoupons.master=write.orders.yohoops.org:3307
 jdbc.mysql.yhcoupons.slave=read.orders.yohoops.org:3307
 
 #yh_consult
-jdbc.mysql.yhconsult.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhconsult.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhconsult.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhconsult.slave=read.cms.yohoops.org:3307
 
 #unions
-jdbc.mysql.unions.master=write.cms.yohoops.org:3306
-jdbc.mysql.unions.slave=read.cms.yohoops.org:3306
+jdbc.mysql.unions.master=write.cms.yohoops.org:3307
+jdbc.mysql.unions.slave=read.cms.yohoops.org:3307
 
 #push center
 jdbc.mysql.yohopushcenter.master=write.passport.yohoops.org:3306
@@ -223,20 +223,20 @@ jdbc.mysql.yohoactivity.master=write.passport.yohoops.org:3306
 jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3306
 
 #yh_guang
-jdbc.mysql.yhguang.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhguang.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhguang.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhguang.slave=read.cms.yohoops.org:3307
 
 #yh_special
-jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3307
 
 #yh_special
-jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3306
-jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3306
+jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3307
+jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3307
 
 #yohood
-jdbc.mysql.yohood.master=write.yohood.yohoops.org:3306
-jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3306
+jdbc.mysql.yohood.master=write.yohood.yohoops.org:3307
+jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3307
 
 #yohocrm
 jdbc.mysql.yohocrm.master=write.passport.yohoops.org:3306
@@ -249,39 +249,39 @@ jdbc.mysql.erppassport.slave=write.erp.yohoops.org:3306
 
 #erp_supplier
 jdbc.mysql.platform.erp_supplier.master  = write.erp.yohoops.org:3306
-jdbc.mysql.platform.erp_supplier.password  = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.erp_supplier.slave   = read1.erp.yohoops.org:3306
-jdbc.mysql.platform.erp_supplier.username  = yh_test
+jdbc.mysql.platform.erp_supplier.password  = t5/oMgwUCmO/GeMHBAQ2Cg==
+jdbc.mysql.platform.erp_supplier.slave   = read.erp.yohoops.org:3306
+jdbc.mysql.platform.erp_supplier.username  = yh_vpc_bak
 #yohobuy_task
 jdbc.mysql.kisjob.datasources=yh_distributed_task
-jdbc.mysql.kisjob.master=write.cms.yohoops.org:3306
-jdbc.mysql.kisjob.slave=read.cms.yohoops.org:3306
+jdbc.mysql.kisjob.master=write.cms.yohoops.org:3307
+jdbc.mysql.kisjob.slave=read.cms.yohoops.org:3307
 
 
 #yhcommunity
 jdbc.mysql.yhcommunity.master=write.uic.yohoops.org:3306
 jdbc.mysql.yhcommunity.slave=read.uic.yohoops.org:3306
-jdbc.mysql.yhcommunity.username=yh_test
-jdbc.mysql.yhcommunity.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhcommunity.username=yh_vpc_bak
+jdbc.mysql.yhcommunity.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 
 #yh social
-jdbc.mysql.yhsocial.master=write.social.yohoops.org:3306
-jdbc.mysql.yhsocial.slave=read.social.yohoops.org:3306
-jdbc.mysql.yhsocial.username=yh_test
-jdbc.mysql.yhsocial.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhsocial.master=write.social.yohoops.org:3308
+jdbc.mysql.yhsocial.slave=read.social.yohoops.org:3308
+jdbc.mysql.yhsocial.username=yh_vpc_bak
+jdbc.mysql.yhsocial.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yh_cms
-jdbc.mysql.yh_cms.master=write.cms.yohoops.org:3306
-jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306
-jdbc.mysql.yh_cms.username=yh_test
-jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yh_cms.master=write.cms.yohoops.org:3307
+jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3307
+jdbc.mysql.yh_cms.username=yh_vpc_bak
+jdbc.mysql.yh_cms.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #yhlottery
-jdbc.mysql.yhlottery.master=192.168.103.36:3306
-jdbc.mysql.yhlottery.slave=192.168.103.36:3306
-jdbc.mysql.yhlottery.username=yh_test
-jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhlottery.master=write.yhlottery.yohoops.org:3307
+jdbc.mysql.yhlottery.slave=read.yhlottery.yohoops.org:3307
+jdbc.mysql.yhlottery.username=yh_vpc_bak
+jdbc.mysql.yhlottery.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 readOnlyInSlave=false
 
@@ -293,8 +293,8 @@ mongo.inbox.port    = 27017
 
 #search-db
 jdbc.mysql.yhbsearch.datasources=yhb_search
-jdbc.mysql.yhbsearch.master=192.168.103.83:3306 
-jdbc.mysql.yhbsearch.slave=192.168.103.83:3306
+jdbc.mysql.yhbsearch.master=write.yhsearch.yohoops.org:3307 
+jdbc.mysql.yhbsearch.slave=read.yhsearch.yohoops.org:3307
 jdbc.mysql.yhbsearch.username=yh_vpc_bak
 jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
@@ -306,7 +306,7 @@ search.index.refresh_interval       = 10s
 search.index.translog.flush_threshold_ops  = 5000
 
 # search-mq
-search.mq.server=192.168.102.209
+search.mq.server=rabbitmq-common.yohoops.org
 search.mq.port=5672
 search.mq.username=admin1
 search.mq.password=123qwe
@@ -318,19 +318,19 @@ jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
 jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3306
 jdbc.mysql.yhshops.onlyslave=read.passport.yohoops.org:3306
 jdbc.mysql.yhoperations.onlyslave=read.passport.yohoops.org:3306
-jdbc.mysql.yh.username=yh_test
-jdbc.mysql.yh.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yh.username=yh_vpc_bak
+jdbc.mysql.yh.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 #####  ****************************************  common properties ******************************************************
  
  
 
-cache.servers.gateway.level1.address  = mem01.l1.yohoops.org:21211
+cache.servers.gateway.level1.address  = mem01.l1.yohoops.org:12111,mem02.l1.yohoops.org:12111,mem03.l1.yohoops.org:12111,mem04.l1.yohoops.org:12111
 cache.servers.gateway.level1.expire   = 1800
-cache.servers.gateway.level2.address  =  mem01.l2.yohoops.org:21211
+cache.servers.gateway.level2.address  =  mem01.l2.yohoops.org:12112,mem02.l2.yohoops.org:12112,mem03.l2.yohoops.org:12112,mem04.l2.yohoops.org:12112
 cache.servers.gateway.level2.expire   = 43200
 
-cache.servers.union.address  = memcache.union.yohoops.org:11211
+cache.servers.union.address  = memcache.union.yohoops.org:12111
 
 ip.port.search.server  = search.yohoops.org:8080
 
@@ -344,46 +344,46 @@ yoho.service.domain.url=http://service-test4.yohops.com:9999
 # old redis
 redis.proxy.address  = write.redis.yohoops.org
 redis.proxy.auth     = 
-redis.proxy.port     = 6379
+redis.proxy.port     = 63790
 
 redis.readonly.proxy.address  = read.redis.yohoops.org
 redis.readonly.proxy.auth     = 
-redis.readonly.proxy.port     = 6379
+redis.readonly.proxy.port     = 63790
 
-redis.notsync.twemproxy.addresses = redis-no-sync-1.yohoops.org:6379
+redis.notsync.twemproxy.addresses = redis-no-sync-1.yohoops.org:63790,redis-no-sync-2.yohoops.org:63790,redis-no-sync-3.yohoops.org:63790,redis-no-sync-4.yohoops.org:63790
 redis.notsync.twemproxy.auth=
 
 # union redis
 redis.union.address  = classic.union-redis.yohoops.org
 redis.union.auth     = 
-redis.union.port     = 6379
+redis.union.port     = 63790
 
 # outter big data redis
 bigDataRedis.proxy.address=bigdata.redis.yohoops.org
-bigDataRedis.proxy.port=6379
+bigDataRedis.proxy.port=63790
 bigDataRedis.proxy.auth=
 
 # outter big data redis push
 bigDataRedis-push.proxy.address=bigdata.redis.push.yohoops.org
-bigDataRedis-push.proxy.port=6379
+bigDataRedis-push.proxy.port=63790
 bigDataRedis-push.proxy.auth=
 
-redis.union.proxy.address=huodong.write.yohoops.org
-redis.union.proxy.port=6379
+redis.union.proxy.address=union.write.yohoops.org
+redis.union.proxy.port=63790
 redis.union.proxy.auth=
 
-redis.union.readonly.proxy.address=huodong.read.yohoops.org
-redis.union.readonly.proxy.port=6379
+redis.union.readonly.proxy.address=union.read.yohoops.org
+redis.union.readonly.proxy.port=63790
 redis.union.readonly.proxy.auth=
 
 # search-redis
 redis.search.proxy.address=127.0.0.1
-redis.search.proxy.port=16379
+redis.search.proxy.port=163790
 redis.search.proxy.auth=
 
 #bigDataRedis-search
 bigDataRedis-search.proxy.address=bigdata.redis.yohoops.org
-bigDataRedis-search.proxy.port= 6379
+bigDataRedis-search.proxy.port= 63790
 bigDataRedis-search.proxy.auth=
 
 ##  rabbitmq configure
@@ -419,16 +419,22 @@ rabbit_message_center_user = yoho
 rabbit_message_center_password = yoho
 rabbit_message_center_vhost = yoho
 
+
+rabbit_union=rabbitmq-common.yohoops.org:5672
+rabbit_union_user=yoho
+rabbit_union_password=yoho
+rabbit_union_vhost=yoho
+
 crf.service.url=https://osprec-ci.crfchina.com
 
 gateway.domain.url = http://api.yoho.cn
 Gateway_URL=http://gateway.yohoops.org:8080/gateway
 yoho.message.controller.url=http://message-controller.yohoops.org:8087/yoho-message-controller
 
-zkAddress=192.168.102.216:2181
+zkAddress=zk01.yohoops.org:2181,zk02.yohoops.org:2181,zk03.yohoops.org:2181,zk04.yohoops.org:2181,zk05.yohoops.org:2181
 
 # change to order.run-host.yohoops.org later
-order.task.host=192.168.103.55
+order.task.host=192.168.104.20
 
 APP_KEY     = 1392109259
 APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
@@ -436,22 +442,22 @@ UUC_DOMAIN  =  http://passport.test.yoho.cn
 
  #从qcloud拷贝而来
 redis.brower.proxy.address = redis-brower.yohoops.org
-redis.brower.proxy.port = 6379
+redis.brower.proxy.port = 63790
 redis.brower.proxy.auth =
 
 redis.brower.readonly.proxy.address = redis-brower.yohoops.org
-redis.brower.readonly.proxy.port = 6379
+redis.brower.readonly.proxy.port = 63790
 redis.brower.readonly.proxy.auth =
 
 
 ＃single cloud not sync redis
 single.cloud.redis.proxy.address=redis-no-sync-1.yohoops.org
-single.cloud.redis.proxy.port=6379
+single.cloud.redis.proxy.port=63790
 single.cloud.redis.proxy.auth=
 
 ＃single cloud not sync redis
 single.cloud.redis.readonly.proxy.address=redis-no-sync-1.yohoops.org
-single.cloud.redis.readonly.proxy.port=6379
+single.cloud.redis.readonly.proxy.port=63790
 single.cloud.redis.readonly.proxy.auth=
 
 
@@ -478,20 +484,20 @@ package.ticket.more.couponid=13268
 
 default.http.type = http 
 
-erp.shop.web.url=http://192.168.103.82:9098
+erp.shop.web.url=http://192.168.104.44:9098
 
 #yoho-message配置读写分离
-jdbc.mysql.yhmessage.master=192.168.103.84:3306
-jdbc.mysql.yhmessage.slave=192.168.103.84:3306
-jdbc.mysql.yhmessage.username=yh_test
-jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhmessage.master=write.message.yohoops.org:3306
+jdbc.mysql.yhmessage.slave=read.message.yohoops.org:3306
+jdbc.mysql.yhmessage.username=yh_vpc_bak
+jdbc.mysql.yhmessage.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
-jdbc.mysql.platform.erp_orders.slave=192.1681.103.84
+jdbc.mysql.platform.erp_orders.slave=read.orders.yohoops.org:3307
 
 #erp-orders配置读写分离
 jdbc.mysql.platform.erp_orders.master=write.orders.yohoops.org:3307
 jdbc.mysql.platform.erp_orders.slave=read.orders.yohoops.org:3307
-jdbc.mysql.platform.erp_orders.username=yh_test
-jdbc.mysql.platform.erp_orders.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.platform.erp_orders.username=yh_vpc_bak
+jdbc.mysql.platform.erp_orders.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 

@@ -22,15 +22,13 @@ yoho.bigData.env.namespace   = bigdata
 yoho.bigData.env.serverport  = 1
 yoho.bigData.env.webapphome  = /home/test/yohoJavaApp/yohobuy-bigdata/deploy/target
 
-jdbc.mysql.bigdata.master=192.168.103.36:3306
+jdbc.mysql.bigdata.master=read.bigdata.yohoops.org:3306
 jdbc.mysql.bigdata.username=yh_test
 #yoho@7Y$^YpNb7hp
 jdbc.mysql.bigdata.password=9nm0icOwt6bMHjMusIfMLw==
 
 bigdata.database.cluster.name = test
 
-#bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
-#bigDataRedis.proxy.address=192.168.102.56
 
 bigDataRedis.proxy.address=123.206.17.17
 bigDataRedis.proxy.port=16379