Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into ccw

conf/application.ini

@@ -285,21 +285,21 @@ elastic.master.scheme="http";
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "172.18.0.3"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs_ccw"
+resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "root"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "172.18.0.3"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs_ccw"
+resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "root"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -316,7 +316,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
 
-redis.database.params.host = "192.168.1.180"
+redis.database.params.host = "172.18.0.6"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
 redis.database.params.password = "23456ertyu"
@@ -328,13 +328,13 @@ out.locks="/data/locks";
 
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.1.180:9502"
-push.host="192.168.1.180"
+push.clientHost="ws://127.0.0.1:9502"
+push.host="127.0.0.1"
 push.port="9503"
 push.open=1
 push.user.service.id=293
 push.user.service.type=7
-elastic.master.host="192.168.1.180"
+elastic.master.host="127.0.0.1"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 ;resources.database.params.hostname = "127.0.0.1"