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

application/controllers/Index.php

@@ -52,6 +52,7 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
+        echo 1;exit;
         $orderDao = \DAO\Order\OrderModel::getInstance();
 
         $res=$orderDao->getList(array('buyer_id'=>1),'*',0,10);

application/library/JPush/ClientPush.php

@@ -64,11 +64,13 @@ class ClientPush
     }
     public function push($pushData)
     {
+        $pushFlag=(APP_ENV=='product')?true:false;
        // echo json_encode($pushData);
        $title=$this->getMessageType($pushData['fromType']);
         $messageContent=$this->getMessageContent($pushData['message']);
        // $pushObject=array('id'=>$toId,'memberName'=>'abc');
       //  $pushData['toId']=249;
+        echo $pushData['toId'];
         try {
             $response = $this->client->push()
                 ->setPlatform('all')
@@ -116,7 +118,7 @@ class ClientPush
                     // apns_production: 表示APNs是否生产环境，
                     // True 表示推送生产环境，False 表示要推送开发环境；如果不指定则默认为推送生产环境
 
-                    'apns_production' => false,
+                    'apns_production' => $pushFlag,
 
                     // big_push_duration: 表示定速推送时长(分钟)，又名缓慢推送，把原本尽可能快的推送速度，降低下来，
                     // 给定的 n 分钟内，均匀地向这次推送的目标用户推送。最大值为1400.未设置则不是定速推送

application/models/Business/Message/MessageService.php

@@ -194,7 +194,7 @@ class MessageServiceModel extends \Business\AbstractModel
         foreach ($messageOneList['list'] as &$val) {
             $self = $this->getUserByMemberIdAndSelfType($val['fromId'], $val['fromType']);
             $toMember = $this->getUserByMemberIdAndSelfType($val['toId'], $val['toType']);
-            $val['toAvatar'] = $toMember['avatar'];
+            $val['toAvatar'] = !empty($toMember['avatar'])?$toMember['avatar']:'';
             $val['message'] = $messageHistoryDao->convertMessage($val['message']);
             $val['fromAvatar'] = $self['avatar'];
 //                $val['toAvatar']=$this->getAvatar($val['toType'],$val['toId']);

conf/application.ini

@@ -24,23 +24,16 @@ 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 = "127.0.0.1"
-;resources.database.slave.params.port     = 3306
-;resources.database.slave.params.database = "qmcs"
-;resources.database.slave.params.username = "qmcsreader"
-;resources.database.slave.params.password = "!@#$%12345werty"
-;resources.database.slave.params.charset  = "UTF8"
-;resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
-;
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "172.16.142.15"
+resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
-resources.database.slave.params.username = "root"
+resources.database.slave.params.username = "qmcsreader"
 resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+;
+
 redis.database.params.host = "172.16.142.15"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"