pc

application/controllers/User.php

@@ -58,7 +58,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     $this->sess[NameConst::sessionKey]=$this->key;
                     $member[NameConst::sessionKey]=$this->key;
                     $this->memberService->saveMember($member);
-                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl']));
+                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id']));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
                 }
@@ -141,7 +141,7 @@ class UserController extends \Our\Controller_AbstractIndex {
             $member[NameConst::sessionKey]=$this->key;
             $member['login_time']=TIMESTAMP;
             $this->memberService->saveMember($member);
-            $this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl']));
+            $this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>$member['memberId']));
         }else{
             $this->success(array('userFlag'=>\Our\ApiConst::zero));
         }

application/library/JPush/ClientPush.php

@@ -64,9 +64,9 @@ class ClientPush
     }
     public function push($pushData)
     {
-//        $title=$this->getMessageType($pushData['fromType']);
-//        $messageContent=$this->getMessageContent($pushData['message']);
-        $toId=249;
+       $title=$this->getMessageType($pushData['fromType']);
+        $messageContent=$this->getMessageContent($pushData['message']);
+        $pushData['toId']=249;
         try {
             $response = $this->client->push()
                 ->setPlatform('all')