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

application/models/Business/Message/MessageService.php

@@ -141,6 +141,16 @@ class MessageServiceModel extends \Business\AbstractModel
         }
         return $avatar;
     }
+    public function unsetDb(){
+        $store = \DAO\StoreModel::getInstance();
+        $member = \DAO\MemberModel::getInstance();
+        $messageHistoryDao = \DAO\MessageHistoryModel::getInstance();
+        $mesageOneDao = \DAO\MessageOneModel::getInstance();
+        $store->unsetDb();
+        $member->unsetDb();
+        $messageHistoryDao->unsetDb();
+        $mesageOneDao->unsetDb();
+    }
 
     /**
      * 获得全部类型消息，每种消息一条数据，以及每种消息的未读条数

application/models/DAO/Abstract.php

@@ -28,6 +28,10 @@ abstract class AbstractModel {
                 $this->db=LinkMySQLModel::get($dbLink);
             }
     }
+    public function unsetDb(){
+        unset($this->db);
+        LinkMySQLModel::unsetDbConecet();
+    }
     /**
      * 捕获dao中没有的方法，直接访问mysql中相应的类的方法
      * 

application/models/Mysql/LinkMySQL.php

@@ -63,6 +63,10 @@ class LinkMySQLModel{
 //        return self::$_instances[$database];
     }
 
+    public static function unsetDbConecet(){
+        unset(self::$_instances);
+    }
+
 
     /**
      * 构造函数 选择数据库

application/views/index/chatroom.phtml

@@ -15,7 +15,7 @@
 <!--    <script src="/data/js/vue.js"></script>-->
     <!--<script src="/config.js?timespan=12347" charset="utf-8"></script>-->
     <script src="/data/js/comet.js?timespan=123" charset="utf-8"></script>
-    <script src="/data/js/chat.js?timespan=12456791171072154133133" charset="utf-8"></script>
+    <script src="/data/js/chat.js?timespan=12456791171072154133132343243" charset="utf-8"></script>
     <!--<script type="text/javascript" src="/data/js/swfupload.js"></script>-->
     <!--<script type="text/javascript" src="/data/js/swfupload.queue.js"></script>-->
     <!--<script type="text/javascript" src="/data/js/fileprogress.js"></script>-->

public/data/js/chat.js

@@ -673,7 +673,7 @@ function sendMsg(content, type){
     msg.messageUrl="";
     msg.messageHref="";
     msg.messagePrice=1;
-
+console.log(msg);
     showNewMsg(msg);
     var sendData=Object();
      sendData.data=msg;

scripts/crontab/push/news_server.php

@@ -66,7 +66,6 @@ $serv->on('Message', function($server, $frame) use($conf){
             preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);
             $memberId= $matchs[1];
             $messageService=\Business\Message\MessageServiceModel::getInstance();
-
             $sendFd=$redis->hGet(KEY_PRE.$rev_data['toId'],'fd');
             $sendTime= $redis->hGet(KEY_PRE.$memberId,'sendTime');
             $diffTime=time()-$sendTime;
@@ -111,11 +110,11 @@ $serv->on('Message', function($server, $frame) use($conf){
                 //$redis->rPush("message_center",serialize($sendMessage));
                 $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']);;
-                unset($messageService);
-
-
+                $messageService->addMessage($sendMessage['fromId'],$sendMessage['fromUserId'],$sendMessage['fromUserName'],$sendMessage['fromType'],$sendMessage['message'],$sendMessage['toId'],$sendMessage['toUserId'],$sendMessage['toUserName'],$sendMessage['toType'],$sendMessage['id']);
             }
+            $messageService->unsetDb();
+            unset($messageService);
+            unset($redis);
         }else{
             $realKey = KEY_REDIS_PRE.$key;
             $sessData=$redis->get($realKey);
@@ -126,7 +125,8 @@ $serv->on('Message', function($server, $frame) use($conf){
             $res=$sessData;
            //echo $res;
             $matchs=array();
-            preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);
+            preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);//现在
+           // preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);过去
             $memberId=$matchs[1];
             $redis->expire($realKey,\Our\ApiConst::tenDaySecond);
             if($memberId==(int)$memberId){