pc

application/library/JPush/ClientPush.php

@@ -48,7 +48,7 @@ class ClientPush
         return $baseTitle;
     }
     private function getMessageContent($message){
-        $messageContent='';
+        $messageContent='推送消息:';
         switch($message['type']){
             case ApiConst::reacheCallMessage:
             case ApiConst::refundReturnMessage:
@@ -56,9 +56,9 @@ class ClientPush
             case ApiConst::autoSendMessage:
             case ApiConst::orderStateChangeMessage:
             case ApiConst::orderReceiveMessage:
-            case ApiConst::orderMessageType:$messageContent=$message['content'];break;
-            case ApiConst::onePictureMessage:$messageContent=DescribeConst::imageMessage;break;
-
+            case ApiConst::orderMessageType:$messageContent=$messageContent.$message['content'];break;
+            case ApiConst::onePictureMessage:$messageContent=$messageContent.DescribeConst::imageMessage;break;
+            default:$messageContent;break;
         }
         return $messageContent;
     }
@@ -66,7 +66,6 @@ class ClientPush
     {
        $title=$this->getMessageType($pushData['fromType']);
         $messageContent=$this->getMessageContent($pushData['message']);
-        echo $title.'|'.$messageContent;exit;
        // $pushObject=array('id'=>$toId,'memberName'=>'abc');
         $pushData['toId']=249;
         try {
@@ -94,11 +93,11 @@ class ClientPush
                     // 'builder_id' => 2,
                     'extras' => $pushData['message'],
                 ))
-//                ->message($messageContent, array(
-//                    'title' => $title,
-//                    'content_type' => $pushData['type'],
-//                    'extras' => $pushData,
-//                ))
+                ->message($messageContent, array(
+                    'title' => $title,
+                    'content_type' => $pushData['type'],
+                    'extras' => $pushData['message'],
+                ))
                 ->options(array(
                     // sendno: 表示推送序号，纯粹用来作为 API 调用标识，
                     // API 返回时被原样返回，以方便 API 调用方匹配请求与返回

application/models/Business/Message/MessageService.php

@@ -24,7 +24,7 @@ class MessageServiceModel extends \Business\AbstractModel
     private $messageDao;
     public $memberId;
     private $memberMessageField = 'message_id,message_title,message_body,message_type,tpl_type,record_id';
-
+    private $baseRedis;
     public function init()
     {
 
@@ -371,13 +371,13 @@ class MessageServiceModel extends \Business\AbstractModel
     public function addMessageCenterToDb()
     {
         $conf = \Yaf\Registry::get('config')->get('redis.database.params');
-        $redis = new \Redis();
-        $redis->pconnect($conf['host'], $conf['port']);
+        $this->baseRedis = new \Redis();
+        $this->baseRedis->pconnect($conf['host'], $conf['port']);
         if (!empty($conf['password'])) {
-            $redis->auth($conf['password']);
+            $this->baseRedis->auth($conf['password']);
         }
-        while ($center = $redis->lPop('message_center')) {
-            $redis->rPush('push_center',$center);
+        while ($center = $this->baseRedis->lPop('message_center')) {
+            $this->baseRedis->rPush('push_center',$center);
             $addData = unserialize($center);
             $addData['message'] = unserialize($addData['message']);
             $this->addMessage($addData['fromId'], $addData['fromUserId'], $addData['fromUserName'], $addData['fromType'], $addData['message'], $addData['toId'], $addData['toUserId'], $addData['toUserName'], $addData['toType'], $addData['id']);

scripts/crontab/push/news_server.php

@@ -115,11 +115,6 @@ $serv->on('Message', function($server, $frame) use($conf){
                 $redis->hSet(KEY_PRE.$memberId,'sendTime', time());
                 $server->push($frame->fd, responseJson(1,"sendMsg","success", $sendMessage));
                 $messageService->addMessage($sendMessage['fromId'],$sendMessage['fromUserId'],$sendMessage['fromUserName'],$sendMessage['fromType'],$sendMessage['message'],$sendMessage['toId'],$sendMessage['toUserId'],$sendMessage['toUserName'],$sendMessage['toType'],$sendMessage['id']);
-                if(!empty($sendMessage['message']['content'])){
-                    $sendMessage['message']['content']=base64_encode($sendMessage['message']['content']);
-                }
-                $sendMessage['message']=serialize($sendMessage);
-                $redis->rPush('push_center',serialize($sendMessage));
             }
             $redis->close();
             $messageService->unsetDb();