From 197692c4ebfd8d867507d0d31a86bea33253444a Mon Sep 17 00:00:00 2001
From: Alone <675061370@qq.com>
Date: Tue, 5 Nov 2024 09:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E9=A1=B5=E5=85=A8?=
 =?UTF-8?q?=E7=BD=91=E6=90=9C=E9=80=9F=E5=BA=A6=20=E6=9C=89=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E4=BD=86=E4=B8=8D=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Chatbot.php | 14 +++-----------
 app/api/controller/Other.php   | 25 ++++++++++++++-----------
 app/api/controller/Tool.php    | 12 +++---------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/app/api/controller/Chatbot.php b/app/api/controller/Chatbot.php
index b1f4bfb..8f61291 100644
--- a/app/api/controller/Chatbot.php
+++ b/app/api/controller/Chatbot.php
@@ -122,18 +122,10 @@ class Chatbot extends QfShop
     
     private function Qsearch($newString)
     {
-        $list = [];
-        $urlData = array(
-            'title' => $newString,
-        );
-        $res = curlHelper(Request::domain()."/api/other/all_search", "POST", $urlData)['body'];
-        $res = json_decode($res, true);
+        $bController = app(\app\api\controller\Other::class);
+        $result = $bController->all_search($newString);
         
-        if($res['code'] === 200){
-            $list = $res['data']??[];
-        }
-        
-        return $list;
+        return $result;
     }
 
     // 解密消息
diff --git a/app/api/controller/Other.php b/app/api/controller/Other.php
index 1887afa..1ffd9a2 100644
--- a/app/api/controller/Other.php
+++ b/app/api/controller/Other.php
@@ -23,14 +23,17 @@ class Other extends QfShop
      * 
      * @return void
      */
-    public function all_search()
+    public function all_search($param='')
     {
-        $searchdata = input('post.');
-        if (empty($searchdata['title'])) {
-            return jerr("请输入要看的内容");
+        if(empty($param)){
+            $searchdata = input('post.');
+            if (empty($searchdata['title'])) {
+                return jerr("请输入要看的内容");
+            }
+            $title = $searchdata['title'];
+        }else{
+            $title = $param;
         }
-        $title = $searchdata['title'];
-        
         
         $map[] = ['status', '=', 1];
         $map[] = ['is_delete', '=', 0];
@@ -51,14 +54,14 @@ class Other extends QfShop
                 $this->model->whereIn('source_id', $ids)->update(['update_time' => time()]);
             }
             
-            return jok('临时资源获取成功',$urls);
+            return !empty($param) ? $urls : jok('临时资源获取成功', $urls);
         }
 
 
          //同一个搜索内容锁机
          if (Cache::has($title)) {
             // 检查缓存中是否已有结果
-            return jok('临时资源获取成功1', Cache::get($title));
+            return !empty($param) ? Cache::get($title) : jok('临时资源获取成功', Cache::get($title));
         }
         
         
@@ -71,10 +74,10 @@ class Other extends QfShop
         
                 // 检查是否超过60秒
                 if (time() - $startTime > 60) {
-                    return jok('临时资源获取成功3', []); // 返回空数组
+                    return !empty($param) ? [] : jok('临时资源获取成功', []);
                 }
             }
-            return jok('临时资源获取成功2', Cache::get($title));
+            return !empty($param) ? Cache::get($title) : jok('临时资源获取成功', Cache::get($title));
         }
 
         
@@ -147,7 +150,7 @@ class Other extends QfShop
         Cache::set($title, $datas, 60); // 缓存结果60秒
         Cache::delete($title . '_processing'); // 解锁
         
-        return jok('临时资源获取成功',$datas);
+        return !empty($param) ? $datas : jok('临时资源获取成功', $datas);
     }
     
     // 检查 URL 是否已存在（忽略查询参数）
diff --git a/app/api/controller/Tool.php b/app/api/controller/Tool.php
index 1073987..eefa79f 100644
--- a/app/api/controller/Tool.php
+++ b/app/api/controller/Tool.php
@@ -169,15 +169,9 @@ class Tool extends QfShop
         }
         Cache::set($keys, 1, 10);
 
-        $urlData = array(
-            'title' => $title,
-        );
-        $res = curlHelper(Request::domain()."/api/other/all_search", "POST", $urlData)['body'];
-        $res = json_decode($res, true);
-        
-        if($res['code'] === 200){
-            $list = $res['data']??[];
-        }
+        $bController = app(\app\api\controller\Other::class);
+        $list = $bController->all_search($title);
+
         Cache::delete($keys); 
         return jok('临时资源获取成功', $list);
     }