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

application/controllers/Message.php

@@ -153,7 +153,6 @@ class MessageController extends \Our\Controller_AbstractApi {
     }
 
     public function getSetAction(){
-        echo 11;exit;
         $memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
         $messageSet=$memberCenterService->getMessageSet($this->memberId);
         if(!empty($messageSet)){

application/models/Business/User/MemberCenterService.php

@@ -57,7 +57,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         $memberInfo = \DAO\MemberModel::getInstance()->getInfo($memberId);
        // $pushSet=array();
         if(!empty($memberInfo['pushSet'])){
-            echo 1;exit;
             $pushSet=unserialize($memberInfo['pushSet']);
             $pushSet=array(
                 'canPush'=>(int)$pushSet['canPush'],
@@ -66,7 +65,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
                 'timeDiff'=>$pushSet['timeDiff'],
             );
         }else{
-            echo 2;exit;
             $pushSet=array(
                 'canPush'=>ApiConst::openMessae,
                 'sound'=>ApiConst::openMessae,