Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

scripts/crontab/push/redisSubscribe.php

@@ -10,8 +10,12 @@ define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向
 require APPLICATION_PATH . '/scripts/crontab/baseCli.php';
 require APPLICATION_PATH . '/scripts/crontab/common.php';
 error_reporting(E_ALL ^ E_NOTICE);
-$redis = new Redis();
-$redis->connect('192.168.1.201', 6379);
+// redis 没有设置密码
+$redis=new Redis();
+$redis->connect($conf['host'], $conf['port']);
+if(!empty($conf['password'])){
+    $redis->auth($conf['password']);
+}
 $result=$redis->subscribe(array('pushcenter'), 'callback');
 function printTest($meg){
     echo $meg;