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

@@ -30,7 +30,7 @@ ftp.port=21
 ftp.userName=ftpuser
 ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
 
-rabbit_common=192.168.102.211:5672
+rabbit_common=192.168.103.58:5672
 rabbit_common_user=yoho
 rabbit_common_password=yoho
 rabbit_vhost=yoho

@@ -45,6 +45,9 @@ wifi.login.url  = http://192.168.103.230:8080/am/controller/portal/external/logi
 
 offline.portal.gateway=http://192.168.102.47:8080/portal-gateway
 
+qiniu.domain = http://img11.static.yhbimg.com
+qiniu.bucket = yhb-img01
+
 yohobuy.shops.env.namespace   = shops
 yohobuy.shops.env.serverport  = 8
 yohobuy.shops.env.webapphome  = /home/test/yohobuy-shops/deploy

@@ -295,8 +295,8 @@ mongo.inbox.port    = 27017
 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.username=root
-jdbc.mysql.yhbsearch.password=123456
+jdbc.mysql.yhbsearch.username=yh_vpc_bak
+jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 # search-es
 search.es.cluster.name  = yohosearch_test
@@ -377,8 +377,8 @@ redis.union.readonly.proxy.port=6379
 redis.union.readonly.proxy.auth=
 
 # search-redis
-redis.search.proxy.address=redis-no-sync-1.yohoops.org
-redis.search.proxy.port=6379
+redis.search.proxy.address=127.0.0.1
+redis.search.proxy.port=16379
 redis.search.proxy.auth=
 
 #bigDataRedis-search