From 76af99f47e07e232857cf4bfa8db2be5e47fe34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 5 Dec 2025 22:07:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B6=B3=E8=BF=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Room.php | 2 +- application/api/model/Room.php | 23 ----------------------- application/api/model/User.php | 2 ++ application/api/model/UserData.php | 2 +- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php index 801ef2f..aaa9ab6 100644 --- a/application/api/controller/Room.php +++ b/application/api/controller/Room.php @@ -46,7 +46,7 @@ class Room extends BaseCom public function user_room_history_list() { $page = input('page', 1); - $page_limit = input('page_limit', 15); + $page_limit = input('page_limit', 30); $reslut = model('UserData')->user_room_history_list($this->uid, $page, $page_limit); return V($reslut['code'], $reslut['msg'], $reslut['data']); } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 52bcb77..c73bcd5 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -908,29 +908,6 @@ class Room extends Model $ttex['ToUserInfo'] = db::name('user')->where('id', $partner_id)->field('id as user_id,nickname,avatar,sex')->find(); $ttex['text'] = 'CP特效'; model('api/Chat')->sendMsg(1080, $room_id, $ttex); - // 检查是否支持 pcntl 扩展 -// if (function_exists('pcntl_fork')) { -// $pid = pcntl_fork(); -// -// if ($pid == -1) { -// // 创建子进程失败，直接推送消息 -// model('api/Chat')->sendMsg(1080, $room_id, $ttex); -// } elseif ($pid) { -// // 父进程，继续执行 -// // 不等待子进程结束 -// } else { -// // 子进程，延迟推送消息 -// sleep(1); -// model('api/Chat')->sendMsg(1080, $room_id, $ttex); -// sleep(1); -// exit(0); // 子进程结束 -// } -// } else { -// // 不支持 pcntl，直接推送消息 -// model('api/Chat')->sendMsg(1080, $room_id, $ttex); -// } - - } } } diff --git a/application/api/model/User.php b/application/api/model/User.php index 3968e94..ec5caae 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -544,6 +544,7 @@ class User extends Model public function add_user_visit_log($type,$from_uid,$to_uid){ $visit = db::name('user_visit_log')->where(['from_uid' => $from_uid,'to_id' => $to_uid,'type' => $type])->find(); if($visit){ + db::name('user_visit_log')->where(['id' => $visit['id']])->update(['updatetime' => time()]); return true; } $data = [ @@ -551,6 +552,7 @@ class User extends Model 'from_uid' => $from_uid, 'to_id' => $to_uid, 'createtime' => time(), + 'updatetime' => time(), ]; db::name('user_visit_log')->insert($data); return true; diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php index 0a9e578..1f67fb5 100644 --- a/application/api/model/UserData.php +++ b/application/api/model/UserData.php @@ -433,7 +433,7 @@ class UserData extends Model ->where('a.type',2) ->where('b.type_id','<>',6) ->where('b.room_status',1) - ->order('a.id desc') + ->order('a.updatetime desc') ->page($page,$page_limit) ->select(); if($list){ From bed754f8b5b7f0fbfab1a19d376065e7e75af283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 5 Dec 2025 22:33:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=20?= =?UTF-8?q?=E5=86=85=E4=BE=A7=E8=B4=A6=E5=8F=B7=E4=B8=8D=E5=8F=AF=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E5=85=B6=E4=BB=96=E6=88=BF=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Room.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php index aaa9ab6..0bf7921 100644 --- a/application/api/controller/Room.php +++ b/application/api/controller/Room.php @@ -114,6 +114,24 @@ class Room extends BaseCom { $room_id = input('room_id', 0); $password = input('password', ''); + + //检测系统是否维护中 + $is_maintenance = get_system_config_value('is_maintenance'); + //获取内侧账号 + $inside_uid = get_system_config_value('inside_uid'); + if($inside_uid && $is_maintenance == 3){ + //排除小房间 + $room_type = db::name('vs_room')->where('id',$room_id)->value('type_id'); + if($room_type != 6){ + //先转为数组 不是内侧账号 返回301 + $inside_uid = explode(',',$inside_uid); + //room id = 9 是武松打鼠的房间 暂定为内侧房间 + if(in_array($this->uid,$inside_uid) && $room_id != 9){ + return V(0, '不可访问'); + } + } + } + $reslut = model('Room')->join_room($this->uid, $room_id, $password); return V($reslut['code'], $reslut['msg'], $reslut['data']); } From c503b7a1d5107fc5c86e362957285bc172cc5aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 5 Dec 2025 23:16:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E7=A6=BB?= =?UTF-8?q?=E5=BC=80=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/cron/controller/RoomPan.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php index 33a1062..f0ff60c 100644 --- a/application/cron/controller/RoomPan.php +++ b/application/cron/controller/RoomPan.php @@ -45,11 +45,12 @@ class RoomPan ->find(); if($is_online){//现在 在房间内 if(time() - $value['updatetime'] >= 180){//三分钟没有心跳 + db::name('user')->where('id',$value['user_id'])->update(['is_online'=>2]); if($is_online['is_online'] == 2){//之前就是离开 continue; }else{//之前就是在线则改为离开 db::name('vs_room_visitor')->where('id',$is_online['id'])->update(['is_online'=>2,'updatetime'=>time()]); - db::name('user')->where('id',$value['user_id'])->update(['is_online'=>2]); + $text['text'] = '离开'; $text['user_id'] = $value['user_id']; $text['type'] = 2;