debug

.idea/php-test-framework.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpTestFrameworkVersionCache">
-    <tools_cache>
-      <tool tool_name="PHPUnit">
-        <cache>
-          <versions>
-            <info id="Local" version="5.4.4" />
-          </versions>
-        </cache>
-      </tool>
-    </tools_cache>
-  </component>
-</project>

.idea/php.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpUnit">
-    <phpunit_settings>
-      <PhpUnitSettings load_method="PHPUNIT_PHAR" custom_loader_path="" phpunit_phar_path="$PROJECT_DIR$/../phpunit-5.4.4.phar" />
-    </phpunit_settings>
-  </component>
-</project>

core/framework/db/mysqli.php

@@ -132,7 +132,7 @@ class Db
 
             if ($query === false)
             {
-                $eno = mysqli_errno(self::$link[$host]);
+                $eno  = mysqli_errno(self::$link[$host]);
                 $emsg = mysqli_error(self::$link[$host]);
                 $error = "Db Error eno={$eno} msg={$emsg}";
                 Log::record("{$error} \r\n sql={$sql}",Log::ERR);
@@ -162,9 +162,6 @@ class Db
             else
             {
                 Log::record($sql . " [ RunTime:" . $staer->elapsed(6) . "s ]", Log::SQL);
-//                if(strpos($sql,"SELECT") === false) {
-//                    Log::record($sql . " [ RunTime:" . $staer->elapsed(6) . "s ]", Log::SQL);
-//                }
                 return $query;
             }
         }

core/framework/libraries/model.php

@@ -1239,7 +1239,7 @@ class ModelDb
                 }
             }
 
-            $order   =  implode(',',$array);
+            $order = implode(',',$array);
         }
         return !empty($order)?  ' ORDER BY '.$order:'';
     }

crontab/control/queue.php

@@ -19,10 +19,10 @@ class queueControl extends BaseCronControl
     {
         if (ob_get_level()) ob_end_clean();
 
-        pcntl_signal(SIGINT,  array($this,'sig_handler'));
-        pcntl_signal(SIGHUP,  array($this,'sig_handler'));
-        pcntl_signal(SIGQUIT, array($this,'sig_handler'));
-        pcntl_signal(SIGTERM, array($this,'sig_handler'));
+        pcntl_signal(SIGINT,  [$this,'sig_handler']);
+        pcntl_signal(SIGHUP,  [$this,'sig_handler']);
+        pcntl_signal(SIGQUIT, [$this,'sig_handler']);
+        pcntl_signal(SIGTERM, [$this,'sig_handler']);
 
         $logic_queue = Logic('queue');
 
@@ -46,8 +46,8 @@ class queueControl extends BaseCronControl
                     $arg = current($content);
 
                     $argx = json_encode($arg,JSON_UNESCAPED_UNICODE);
+                    $trace = new scope_trace(__METHOD__ . "  {$method}");
                     Log::record("method={$method} args={$argx}",Log::DEBUG);
-
                     $result = $logic_queue->$method($arg);
                     if (!$result['state']) {
                         $this->log($result['msg'],false);

data/model/room.model.php

@@ -26,6 +26,10 @@ class roomModel extends Model
         $ret = $this->table('room_participant')->where($cond)->update($updata);
         return $ret;
     }
+    public function countParts($cond) {
+        $ret = $this->table('room_participant')->where($cond)->count();
+        return $ret;
+    }
     public function invite($room_id,$user,$inviter) {
         $ret = $this->table('room_participant')->insert(['room_id' => $room_id,'member_id' => $user,'inviter' => $inviter,'invite_time' => time(),'join_time' => 0,'jointimes' => 0,'state' => 0],true);
         return $ret;
@@ -44,9 +48,9 @@ class roomModel extends Model
         $params = ['type' => $type,'room_name' => $name,'room_creator' => $creator,'room_owner' => $owner,'owner_name' => $owner_name,'max_user' => $max_user,'add_time' => time()];
         return $this->table('room')->insert($params);
     }
-    public function editRoom($cond,$update)
+    public function editRoom($cond, $updata)
     {
-        return $this->table('room')->where($cond)->update($update);
+        return $this->table('room')->where($cond)->update($updata);
     }
     public function edit($condition,$data) {
         return $this->table('room')->where($condition)->update($data);

helper/room/factory_processor.php

@@ -13,6 +13,7 @@ use process_looper;
 use errcode;
 use uniquer;
 use Log;
+use scope_trace;
 
 class factory_processor implements IProcessor
 {
@@ -75,6 +76,7 @@ class factory_processor implements IProcessor
 
     public function onRequest($bufid, $body)
     {
+        $trace = new scope_trace(__METHOD__);
         $input = json_decode($body,true);
         if($input == false) {
             return false;

helper/room/room_parts.php

@@ -59,6 +59,12 @@ class room_parts
         return $result;
     }
 
+    public function users()
+    {
+        $count = $this->mModRoom->countParts(['room_id' => $this->mRoomID]);
+        return intval($count);
+    }
+
     public function allparts($filter=[])
     {
         $uids = [];

helper/room/room_processor.php

@@ -13,6 +13,7 @@ use process_looper;
 use errcode;
 use algorithm;
 use QueueClient;
+use scope_trace;
 
 class room_processor implements IProcessor
 {
@@ -41,6 +42,7 @@ class room_processor implements IProcessor
     }
     public function onRequest($bufid, $body)
     {
+        $trace = new scope_trace(__METHOD__);
         $input = json_decode($body,true);
         if($input == false) {
             process_looper::instance()->close($bufid);
@@ -167,7 +169,7 @@ class room_processor implements IProcessor
                             QueueClient::push("OnUpdateRoom",['room_id' => $roomid]);
                         } else {
                             $count = count($newusers);
-                            Model('room')->editRoom(['room_id' => $roomid],['users' => ['users',"users+{$count}"]]);
+                            Model('room')->editRoom(['room_id' => $roomid],['users' => ['exp',"users+{$count}"]]);
                         }
                     }
                     return $this->success($result);

helper/room/tpl_group_home.php

@@ -14,6 +14,7 @@ require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
 
 use Exception;
 use url_helper;
+use author_url;
 use util;
 
 class tpl_group_home
@@ -231,7 +232,7 @@ class tpl_group_home
                         <div class=\"weui-cell__ft\" id=\"room-desc-btn\">{$desc}</div>
                     </a>
                     
-                    <a class=\"weui-cell weui-cell_access\" href=\"/mobile/index.php?act=member_talk&op=room_apply&talk_id=37\">
+                    <a class=\"weui-cell weui-cell_access\" href=\"/mobile/index.php?act=member_talk&op=room_apply&talk_id={$this->room_id}\">
                         <div class=\"weui-cell__bd\">
                             <p>进群申请</p>
                         </div>
@@ -254,7 +255,7 @@ class tpl_group_home
                     <div class=\"weui-cell__bd\">
                         <p>我在本群的昵称</p>
                     </div>
-                    <div class=\"weui-cell__ft\">{$this->participants[$this->cur_user]['nickname']}</div>
+                    <div class=\"weui-cell__ft group-nickname\">{$this->participants[$this->cur_user]['nickname']}</div>
                 </a>
             </div>";
         }
@@ -399,15 +400,18 @@ class tpl_group_home
         $avatar = $this->room_info->avatar();
         $desc = $this->room_info->room_desc();
 
-        $url = url_helper::room_invite_url($this->room_id,$this->cur_user);
-        $save_path = BASE_UPLOAD_PATH."/room/qrcodes/{$this->room_id}_{$this->cur_user}.png";
+//        $url = url_helper::room_invite_url($this->room_id,$this->cur_user);
+//        $save_path = BASE_UPLOAD_PATH."/room/qrcodes/{$this->room_id}_{$this->cur_user}.png";
+//        $qrcode_path = BASE_SITE_URL . "/data/upload/room/qrcodes/{$this->room_id}_{$this->cur_user}.png?v=" . time();
+
+        $url = author_url::room_detail_url('room',$this->room_id);
+        $save_path = BASE_UPLOAD_PATH."/room/qrcodes/{$this->room_id}.png";
+        $qrcode_path = BASE_SITE_URL . "/data/upload/room/qrcodes/{$this->room_id}.png?v=" . time();
 
         if(!file_exists($save_path)) {
             util::qrcode_path($url, $save_path);
         }
 
-        $qrcode_path = BASE_SITE_URL . "/data/upload/room/qrcodes/{$this->room_id}_{$this->cur_user}.png?v=" . time();
-
         $html = "<div class=\"qrcode\">
                         <div class=\"qrcode_info\">
                             <img src=\"$avatar\" class=\"qrcode_avatar_img\" alt=\"\">

helper/room_helper.php

@@ -36,6 +36,7 @@ class room_helper
 
         $parts = new room\room_parts($room);
         $partinfos = $parts->top_users(20);
+        $users = $parts->users();
 
         $uids = [];
         foreach ($partinfos as $part) {
@@ -67,6 +68,7 @@ class room_helper
                 $updata['tmp_name'] = $tmp_name;
             }
         }
+        $updata['users'] = $users;
 
         if(!empty($updata)) {
             $mod_room->editRoom(['room_id' => $room],$updata);

helper/url_helper.php

@@ -77,10 +77,14 @@ class url_helper
         $url = BASE_SITE_URL . "/mobile/index.php?act=bargain&op=open&client_type=wap&bargain_id={$bargain_id}&relay_id={$relay_id}";
         return $url;
     }
-    public static function room_invite_url($room_id,$inviter)
+    public static function room_invite_url($room_id,$relay_id)
     {
-        $relay_id = session_helper::share_id();
-        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=room_invite&client_type=ajax&room_id={$room_id}&inviter={$inviter}&relay_id={$relay_id}";
+        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=room_invite&client_type=ajax&room_id={$room_id}&relay_id={$relay_id}";
+        return $url;
+    }
+    public static function room_detail_url($talk_type,$talk_id)
+    {
+        $url = BASE_SITE_URL . "/mobile/index.php?act=member_talk&op=room_detail&client_type=wap&talk_type={$talk_type}&talk_id={$talk_id}";
         return $url;
     }
 }
@@ -148,10 +152,13 @@ class author_url
         $url = BASE_SITE_URL . "/mobile/index.php?act=bargain&op=open&client_type=wap&bargain_id={$bargain_id}&relay_id={$relay_id}";
         return $url;
     }
-    public static function room_invite_url($room_id,$inviter)
+    public static function room_invite_url($room_id,$relay_id)
     {
-        $relay_id = session_helper::share_id();
-        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=room_invite&client_type=ajax&room_id={$room_id}&inviter={$inviter}&relay_id={$relay_id}";
+        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=room_invite&client_type=ajax&room_id={$room_id}&relay_id={$relay_id}";
+        return $url;
+    }
+    public static function room_detail_url($talk_type,$talk_id){
+        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=room_detail&client_type=wap&talk_type={$talk_type}&talk_id={$talk_id}";
         return $url;
     }
 }

mobile/control/control.php

@@ -15,7 +15,7 @@ require_once (BASE_ROOT_PATH . "/helper/statistics_helper.php");
 class mobileControl
 {
     //客户端类型
-    private static $stClienTypes = array('android', 'wap', 'wechat', 'ios', 'ajax', 'web','mini');
+    private static $stClienTypes = ['android', 'wap', 'wechat', 'ios', 'ajax', 'web','mini'];
 
     //列表默认分页数
     protected $page_size;
@@ -46,7 +46,6 @@ class mobileControl
 
         $param = $_GET;
         $param['client_type'] = $_SESSION['client_type'];
-        Log::record("client_type = {$param['client_type']}",Log::DEBUG);
 
         $this->set_relay();
         statistics_helper::instance()->add_call($param);
@@ -109,8 +108,6 @@ class mobileControl
         $client = strtolower(trim($_SERVER['HTTP_CLIENT_TYPE']));
         $version = trim($_SERVER['HTTP_CLIENT_VERSION']);
 
-        Log::record("client_type = {$client}",Log::DEBUG);
-
         if (empty($client)) {
             $client = $_POST['client_type'];
         } else {
@@ -155,7 +152,7 @@ class mobileControl
 
     static public function outerr($code, $msg = '', $page = '',$type = NULL)
     {
-        static $json_clients = array('android', 'ios','mini');
+        static $json_clients = ['android', 'ios','mini'];
 
         if(!empty($type)) {
             $show_type = $type;
@@ -210,7 +207,7 @@ class mobileControl
 
     static public function outsuccess($data, $page = '',$type = NULL)
     {
-        static $json_clients = array('android', 'ios','mini');
+        static $json_clients = ['android', 'ios','mini'];
 
         if(!empty($type)) {
             $show_type = $type;
@@ -300,9 +297,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=20180820";
+    return "v=2018082201";
 }
 function shop_version()
 {
-    return "v=20180820";
+    return "v=2018082201";
 }

mobile/control/index.php

@@ -111,42 +111,54 @@ class indexControl extends specialControl
     public function room_inviteOp()
     {
         $room_id = intval($_GET['room_id']);
-        $inviter = intval($_GET["inviter"]);
+        $relay_id = intval($_GET["relay_id"]);
 
-//        if(session_helper::need_wechat_author())
-//        {
-//            $_SESSION['client_type'] = 'wap';
-////            define('SERVER_TYPE','panda');
-//            $author = new thrid_author\wxauthor();
-//            $url = author_url::room_invite_url($room_id,$inviter);
-//            $url = $author->enter($url);
-//            Log::record("url:$url",Log::DEBUG);
-//            return self::outsuccess(['direct_uri' => $url],"redirect");
-//        }
-
-//        $invitee = [session_helper::memberid()];
-        $invitee = [39682];
-
-        $result = room\factory_client::instance()->invite($room_id,$inviter,$invitee);
+        if(session_helper::need_wechat_author())
+        {
+            $_SESSION['client_type'] = 'wap';
+            $author = new thrid_author\wxauthor();
+            $url = author_url::room_invite_url($room_id,$relay_id);
+            $url = $author->enter($url);
+            Log::record("url:$url",Log::DEBUG);
+            return self::outsuccess(['direct_uri' => $url],"redirect");
+        }
 
-        if(util::from_wechat() == false){
+        $result = room\factory_client::instance()->invite($room_id,$relay_id,[session_helper::memberid()]);
+        if(session_helper::isapp())
+        {
             $_SESSION['client_type'] = 'ajax';
             if($result === false) {
                 return self::outerr(errcode::ErrRoom,"进入失败");
-            }
-            else
-            {
+            } else {
                 $members = member_info::get_members($result['newusers']);
                 $result['invitees'] = $members;
                 $result["url"] = BASE_SITE_URL.'/mobile/index.php?act=member_talk&op=room_detail&talk_type=room&talk_id='.$result['room'];
                 return self::outsuccess($result);
             }
-        }else{
-            //todo 修改成同时兼容APP请求返回打开回话和微信返回打开小程序
+        }
+        else {
             $_SESSION['client_type'] = 'wap';
             return self::outsuccess(null,"talk/share_bonus");
         }
     }
+
+
+    public function room_detailOp(){
+        $talk_type = trim($_GET['talk_type']);
+        $talk_id = intval($_GET["talk_id"]);
+
+        if(session_helper::need_wechat_author())
+        {
+            $author = new thrid_author\wxauthor();
+            $url = author_url::room_detail_url($talk_type,$talk_id);
+            $url = $author->enter($url);
+            Log::record("url:$url",Log::DEBUG);
+            return self::outsuccess(['direct_uri' => $url],"redirect");
+        }
+
+        $url = url_helper::room_detail_url($talk_type,$talk_id);
+        return self::outsuccess(['direct_uri' => $url],"redirect");
+    }
 }
 
 class tpl_member

mobile/control/member_fcode.php

@@ -30,8 +30,6 @@ class member_fcodeControl extends mbMemberControl
         $items = $mod_fcode->getFcodeList(array('mobile' => session_helper::mobile()),'*','fc_state asc,usable_time desc,fc_id asc',$this->page_size());
         $page_count = $mod_fcode->gettotalpage();
 
-        Log::record("pages={$page_count},pagesize={$this->page_size()},pageno={$this->page_no()} curpage={$_GET['curpage']}");
-
         if($this->page_no() == 1)
         {
             if(isset($_SESSION['fcodes'])) {

mobile/control/member_talk.php

@@ -92,6 +92,7 @@ class member_talkControl extends mbMemberControl
 
         $uids = [];
         foreach ($members as $member) {
+            if($member['member_id'] == session_helper::memberid()) continue;
             $uids[] = $member['member_id'];
         }
 
@@ -120,7 +121,7 @@ class member_talkControl extends mbMemberControl
                 return self::outerr(errcode::ErrParamter);
             }
             $result = $this->roomsg($msgid,$room_id);
-            $msgs = $this->format_message($result['uids'],$result['msgs'],$type,0);
+            $msgs = $this->format_message($result['uids'],$result['msgs'],$type,0,$room_id);
         }
         elseif($type == 'chatwo')
         {
@@ -138,11 +139,19 @@ class member_talkControl extends mbMemberControl
         return self::outsuccess(["msgs" => $msgs]);
     }
 
-    private function format_message($uids,$msgs,$type,$other)
+    private function format_message($uids,$msgs,$type,$other=0,$room_id=0)
     {
         $members = [];
         if(!empty($uids))
         {
+            $room_members = Model('room')->getRoomParts(["room_id"=>$room_id],'member_id,member_nick',false);
+            $nicknames = [];
+            if(!empty($room)) {
+                foreach ($room_members as $room_member){
+                    $nicknames[$room_member['member_id']] = $room_member['member_nick'];
+                }
+            }
+
             $items = Model('member')->getMemberList(['member_id' => ['in',$uids]]);
             foreach ($items as $item)
             {
@@ -151,11 +160,14 @@ class member_talkControl extends mbMemberControl
                     $info = new member_info($item);
 
                     $val = [];
+                    $mid = $info->member_id();
+                    $nickname = empty($nicknames[$mid]) ? $info->nickname() : $nicknames[$mid];
+
                     $val['avatar'] = $info->avatar();
-                    $val['nickname'] = $info->nickname();
-                    $val['userid'] = $info->member_id();
+                    $val['nickname'] = $nickname;
+                    $val['userid'] = $mid;
 
-                    $members[$info->member_id()] = $val;
+                    $members[$mid] = $val;
                 }
                 catch (Exception $ex) {
                     Log::record($ex->getMessage(),Log::ERR);
@@ -214,7 +226,7 @@ class member_talkControl extends mbMemberControl
         if(!empty($room)){
             $hide_msg = intval($room[0]["hide_msg"]);
         }else{
-            $hide_msg = 0;
+            return ['uids' => [],'msgs' => []];
         }
 
         $msgs = $mod_room->getRoomsgList(['room_id' => $room_id,'msg_id' => [['gt',$hide_msg],['lt',$msgid]],'msg_type' => 0], $this->page_size);
@@ -349,7 +361,18 @@ class member_talkControl extends mbMemberControl
 
         $ret = room\factory_client::instance()->invite($room_id,$this->room_creator($room_id),[session_helper::memberid()]);
 
-        return self::outsuccess(['result' => $ret]);
+        if($ret === false) {
+            return self::outerr(errcode::ErrRoom,"进群失败");
+        }
+        else
+        {
+
+            $mod_room = Model('room');
+            $room = $mod_room->getRoom($room_id);
+            $info = new room\room_info($room);
+            $result['name'] = $info->name();
+            return self::outsuccess(['result' => $ret]);
+        }
     }
 
     public function leave_faceOp()
@@ -879,6 +902,7 @@ class member_talkControl extends mbMemberControl
 
         $member = session_helper::memberid();
         $info = new room\room_info($item);
+        Log::record("room:{$room_id} user:$member",Log::DEBUG);
         if($info->owner() != $member) {
             return self::outerr(errcode::ErrTalk,"只有管理员可以查看申请列表");
         }
@@ -1044,6 +1068,12 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrParamter,"群信息有误");
         }
 
+        $parts = new room\room_parts($room_id);
+        $uids = $parts->allparts();
+        if(!in_array(session_helper::memberid(),$uids)) {
+            return self::outerr(errcode::ErrParamter,"不可以偷看别人的共享资金哦");
+        }
+
         $list = [];
         $items = $mod_room->getRoomsgList(["room_id"=>$room_id,"type"=>room\proto_type::msg_type_bonus]);
         if(!empty($items))
@@ -1053,9 +1083,7 @@ class member_talkControl extends mbMemberControl
                 $uids[] = $item['member_id'];
             }
             $uids = array_unique($uids);
-            if(!in_array(session_helper::memberid(),$uids)) {
-                return self::outerr(errcode::ErrParamter,"不可以偷看别人的共享资金哦");
-            }
+
 
             $info = [];
             $members = member_info::get_members($uids);

mobile/templates/default/talk/homepage_room.php

@@ -396,7 +396,9 @@
                                     }
                                     var new_group_name = input.trim();
                                     $('.weui-flex__item[data-member-id="'+cur_mid+'"] p').text(new_group_name);
+                                    $('.group-nickname').text(new_group_name);
                                     $.toast('修改成功',1000);
+
                                 });
                         }
                         else {
@@ -618,6 +620,7 @@
                             $.showLoading();
                             $.get('/mobile/index.php?act=member_talk&op=send_apply',
                                 {
+                                    apply:1,
                                     msg :input,
                                     room_id: talk_id,
                                     client_type: 'ajax'