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

application/models/Business/Goods/GoodsClassService.php

@@ -75,8 +75,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
 
         $signStoreIds = $signStoreInfo['signStoreIds'];//当前位置签约店铺ID
         $signParentClassIds = $signStoreInfo['signParentClassIds'];//当前位置签约分类对应一级分类
-
-        \Our\Log::getInstance()->write(json_encode($signParentClassIds).'$signParentClassIds');
         $classIds = array();
         if($signParentClassIds){
             $classIds = $signParentClassIds;
@@ -88,30 +86,24 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         }
 
         $serviceParentClassIds = $this->getServiceStoreClasses($serviceStoreIds);
-        \Our\Log::getInstance()->write(json_encode($serviceParentClassIds).'$serviceParentClassIds');
         if($serviceParentClassIds){
             $classIds = array_merge($serviceParentClassIds,$classIds);
         }
         //获取可快递店铺对应分类
 
         $expressClassIds = $this->getExpressStoreClasses($where);
-        \Our\Log::getInstance()->write(json_encode($expressClassIds).'$expressClassIds');
         if($expressClassIds){
             $classIds = array_merge($expressClassIds,$classIds);
         }
         $classIdKeys = array_flip($classIds);
-        \Our\Log::getInstance()->write(json_encode($classIdKeys).'$classIdKeys');
         $goodsClassDao = \DAO\GoodsClassModel::getInstance();
         $parentClasses = $goodsClassDao->getParentClasses();
-        \Our\Log::getInstance()->write(json_encode($parentClasses).'$parentClasses');
         $temp =array_diff_key($parentClasses,$classIdKeys);
-        \Our\Log::getInstance()->write(json_encode($temp).'$temp');
         if($temp){
             $returnClasses = array_diff_key($parentClasses,$temp);
         }else{
             $returnClasses = $parentClasses;
         }
-        \Our\Log::getInstance()->write(json_encode($returnClasses).'$returnClasses');
         $returnClasses = array_values($returnClasses);
         return $returnClasses;
 

scripts/crontab/push/news_server.php

@@ -7,7 +7,7 @@
  */
 define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
 define("KEY_REDIS_PRE","PHPREDIS_SESSION:");
-define("KEY_PRE","qm_:han_member:");
+define("KEY_PRE","qm_:han_member_im:");
 require APPLICATION_PATH . '/scripts/crontab/common.php';
 header("Access-Control-Allow-Origin: *");
 header('Access-Control-Allow-Method: *');
@@ -48,6 +48,8 @@ $serv->on('Message', function($server, $frame) use($conf){
             $redis->auth($conf['password']);
         }
        // echo $frame->data;
+        echo $frame->data;
+        echo 11111111111;
         $rev_data = json_decode($frame->data,true);
         //echo json_encode($rev_data);
         $method = isset($rev_data['method']) ? $rev_data['method'] : '';
@@ -103,8 +105,10 @@ $serv->on('Message', function($server, $frame) use($conf){
                     $sendMessage['toUserName']=$rev_data['toUserName'];
                     $sendMessage['toType']= $rev_data['toType'];
                     if(!empty($sendFd)){
+                        echo '发送fd:'.$sendFd;
                         $server->push($sendFd, responseJson(1,"fromMsg","success", $sendMessage));
                     }
+                    echo 'afterSendFd:'.$sendFd;
                 }
                 //echo json_encode($sendMessage);
                 //$redis->rPush("message_center",serialize($sendMessage));
@@ -128,6 +132,7 @@ $serv->on('Message', function($server, $frame) use($conf){
             preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);//现在
            // preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);过去
             $memberId=$matchs[1];
+            echo "success".$memberId.'login||||';
             $redis->expire($realKey,\Our\ApiConst::tenDaySecond);
             if($memberId==(int)$memberId){
                 switch($method) {