From c9264b6b93fad4e46d15cd25a6315876f1738a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sun, 28 Sep 2025 20:33:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E8=BF=9E=E5=90=8E=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cron/controller/TenSeconds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/cron/controller/TenSeconds.php b/application/cron/controller/TenSeconds.php
index 03d5e42..cf39820 100644
--- a/application/cron/controller/TenSeconds.php
+++ b/application/cron/controller/TenSeconds.php
@@ -55,7 +55,7 @@ class TenSeconds
     //清理切后台超过5分钟的用户
     protected function clear_offline_user()
     {
-        $time = time() - 300;
+        $time = time() - 60;
         $user_list = db::name('vs_user_in_room_bg')->where('updatetime', '<=', $time)->select();
         if($user_list){
             foreach ($user_list as $v){

From b2c229ace8424614a5b6cda2c30e912d5c647316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Sep 2025 10:17:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Search.php      | 53 ++++++++++++++++++++++
 application/cron/controller/TenSeconds.php |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php
index 20d1586..6093e88 100644
--- a/application/api/controller/Search.php
+++ b/application/api/controller/Search.php
@@ -100,4 +100,57 @@ class Search extends BaseCom
 
         return V(1, '获取成功', $lists);
     }
+
+
+    //搜索
+    public function search_list()
+    {
+        $search = input('search', '');
+
+        if(is_numeric($search)){
+            $where = [
+                'user_code' => $search,
+                'status' => 1
+            ];
+            $where1 = [
+                'room_number' => $search,
+                'apply_status' => 2,
+                'type_id' => ['<>',6],
+                'room_status' => 1
+            ];
+        }else{
+            $where = [
+                'nickname' => ['like', '%'.$search . '%'],
+                'status' => 1
+            ];
+            $where1 = [
+                'room_name' => ['like', '%'.$search . '%'],
+                'apply_status' => 2,
+                'type_id' => ['<>',6],
+                'room_status' => 1
+            ];
+        }
+        $users = db::name('user')->field('id as user_id,nickname,avatar,user_code,sex')->where($where)->select();
+        if(isset($users)){
+            foreach ($users as $v){
+                $v['room_id'] = 0;
+                //是否在房间
+                $is_room = db::name('vs_room_visitor')->where(['user_id' => $v['user_id'], 'is_delete' => 1])->order('id desc')->value('room_id');
+                if ($is_room) {
+                    $v['room_id'] = $is_room;
+                }
+                $v['icon'][0] = model('UserData')->user_wealth_icon($v['id']);//财富图标
+                $v['icon'][1] = model('UserData')->user_charm_icon($v['id']);//魅力图标
+            }
+        }
+
+        $rooms = db::name('vs_room')->field('id as room_id,room_name,room_cover,room_number,label_id,today_hot_value')->where($where1)->select();
+        if(isset($rooms)){
+            foreach ($rooms as &$v){
+                $v['label_icon'] = db::name('vs_room_label')->where('id', $v['label_id'])->value('label_icon');
+                $v['hot_value'] = $v['today_hot_value'];
+            }
+        }
+        return V(1, '获取成功', ['users' => $users, 'rooms' => $rooms]);
+    }
 }
\ No newline at end of file
diff --git a/application/cron/controller/TenSeconds.php b/application/cron/controller/TenSeconds.php
index cf39820..03d5e42 100644
--- a/application/cron/controller/TenSeconds.php
+++ b/application/cron/controller/TenSeconds.php
@@ -55,7 +55,7 @@ class TenSeconds
     //清理切后台超过5分钟的用户
     protected function clear_offline_user()
     {
-        $time = time() - 60;
+        $time = time() - 300;
         $user_list = db::name('vs_user_in_room_bg')->where('updatetime', '<=', $time)->select();
         if($user_list){
             foreach ($user_list as $v){

From 0fa41cfd7b8aec693365d815b1da6ae1bb621437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Sep 2025 10:29:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Search.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php
index 6093e88..d0bbc67 100644
--- a/application/api/controller/Search.php
+++ b/application/api/controller/Search.php
@@ -130,7 +130,9 @@ class Search extends BaseCom
                 'room_status' => 1
             ];
         }
+
         $users = db::name('user')->field('id as user_id,nickname,avatar,user_code,sex')->where($where)->select();
+
         if(isset($users)){
             foreach ($users as $v){
                 $v['room_id'] = 0;
@@ -139,8 +141,8 @@ class Search extends BaseCom
                 if ($is_room) {
                     $v['room_id'] = $is_room;
                 }
-                $v['icon'][0] = model('UserData')->user_wealth_icon($v['id']);//财富图标
-                $v['icon'][1] = model('UserData')->user_charm_icon($v['id']);//魅力图标
+                $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
+                $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
             }
         }
 

From f5416d6b9bfe95a34fe767ab250933a14a1315b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Sep 2025 11:24:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php
index d0bbc67..d233e5f 100644
--- a/application/api/controller/Search.php
+++ b/application/api/controller/Search.php
@@ -134,7 +134,7 @@ class Search extends BaseCom
         $users = db::name('user')->field('id as user_id,nickname,avatar,user_code,sex')->where($where)->select();
 
         if(isset($users)){
-            foreach ($users as $v){
+            foreach ($users as &$v){
                 $v['room_id'] = 0;
                 //是否在房间
                 $is_room = db::name('vs_room_visitor')->where(['user_id' => $v['user_id'], 'is_delete' => 1])->order('id desc')->value('room_id');
@@ -148,9 +148,9 @@ class Search extends BaseCom
 
         $rooms = db::name('vs_room')->field('id as room_id,room_name,room_cover,room_number,label_id,today_hot_value')->where($where1)->select();
         if(isset($rooms)){
-            foreach ($rooms as &$v){
-                $v['label_icon'] = db::name('vs_room_label')->where('id', $v['label_id'])->value('label_icon');
-                $v['hot_value'] = $v['today_hot_value'];
+            foreach ($rooms as $vv){
+                $vv['label_icon'] = db::name('vs_room_label')->where('id', $vv['label_id'])->value('label_icon');
+                $vv['hot_value'] = $vv['today_hot_value'];
             }
         }
         return V(1, '获取成功', ['users' => $users, 'rooms' => $rooms]);