Merge branch 'master' of git.dev.yoho.cn:yohoops/deploy-test

@@ -132,6 +132,10 @@ jdbc.mysql.yohopushcenter.password=9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.yohoactivity.username=yh_test
 jdbc.mysql.yohoactivity.password=9nm0icOwt6bMHjMusIfMLw==
 
+#yh_special
+jdbc.mysql.yhspecial.username=yh_test
+jdbc.mysql.yhspecial.password=9nm0icOwt6bMHjMusIfMLw==
+
 
 ###  ******************************  database new ***********************************
 
@@ -215,6 +219,10 @@ jdbc.mysql.yohopushcenter.slave=192.168.102.219:3306
 jdbc.mysql.yohoactivity.master=192.168.50.69:9980
 jdbc.mysql.yohoactivity.slave=192.168.102.219:3306
 
+#yh_special
+jdbc.mysql.yhspecial.master=192.168.50.69:9980
+jdbc.mysql.yhspecial.slave=192.168.102.219:3306
+
 
 ## mq or call erp
 erp.message.sync.type=MQ
@@ -270,6 +278,13 @@ redis.union.readonly.proxy.address=192.168.102.211
 redis.union.readonly.proxy.port=6379
 redis.union.readonly.proxy.auth=
 
+# outter big data redis
+bigDataRedis.proxy.address=192.168.102.162
+bigDataRedis.proxy.port=6379
+bigDataRedis.proxy.auth
+
+
+
 gateway.domain.url=http://testapi.yoho.cn:28078
 
 zkAddress=192.168.102.211:2181 
@@ -292,6 +307,8 @@ rabbit_host = 192.168.102.162:35672
 rabbit_user = yoho
 rabbit_password = yoho
 
+
+
 #####  ****************************************  services.yml ******************************************************
 
 message.server.a  = 192.168.102.211