From 8a83015118df73c367fd274aeb4a3f08a7358b96 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 20 Feb 2023 10:16:37 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/UsersController.php |  3 +--
 app/Models/WebSocketDialogMsg.php            |  2 +-
 app/Module/Base.php                          | 16 +++++++++++++---
 app/Tasks/BotReceiveMsgTask.php              |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index dd763d1e5..00ee6ecca 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1561,8 +1561,7 @@ class UsersController extends AbstractController
      */
     public function socket__status()
     {
-        $fd = Request::exists('fd') ? Request::input('fd') : Request::header('fd');
-        $row = WebSocket::select(['id', 'fd', 'userid', 'updated_at'])->whereFd($fd)->first();
+        $row = WebSocket::select(['id', 'fd', 'userid', 'updated_at'])->whereFd(Base::headerOrInput('fd'))->first();
         if (empty($row)) {
             return Base::retError('error');
         }
diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php
index 32bb397ab..b417bc309 100644
--- a/app/Models/WebSocketDialogMsg.php
+++ b/app/Models/WebSocketDialogMsg.php
@@ -254,7 +254,7 @@ class WebSocketDialogMsg extends AbstractModel
         $dialog = WebSocketDialog::find($this->dialog_id);
         $dialog?->pushMsg('update', $resData);
         //
-        return Base::retSuccess('sucess', $resData);
+        return Base::retSuccess('success', $resData);
     }
 
     /**
diff --git a/app/Module/Base.php b/app/Module/Base.php
index 23b7d5f5f..8868f9c11 100755
--- a/app/Module/Base.php
+++ b/app/Module/Base.php
@@ -76,6 +76,16 @@ class Base
         });
     }
 
+    /**
+     * 如果header没有则通过input读取
+     * @param $key
+     * @return mixed|string
+     */
+    public static function headerOrInput($key)
+    {
+        return Base::nullShow(Request::header($key), Request::input($key));
+    }
+
     /**
      * 获取版本号
      * @return string
@@ -94,7 +104,7 @@ class Base
     {
         global $_A;
         if (!isset($_A["__static_client_version"])) {
-            $_A["__static_client_version"] = Request::header('version') ?: '0.0.1';
+            $_A["__static_client_version"] = self::headerOrInput('version') ?: '0.0.1';
         }
         return $_A["__static_client_version"];
     }
@@ -1484,7 +1494,7 @@ class Base
     public static function langData()
     {
         global $_A;
-        $language = trim(Request::header('language'));
+        $language = trim(self::headerOrInput('language'));
         if (!isset($_A["__static_langdata_" . $language])) {
             $_A["__static_langdata_" . $language] = [];
             $langpath = resource_path('lang/' . $language . '.php');
@@ -2174,7 +2184,7 @@ class Base
     {
         global $_A;
         if (!isset($_A["__static_token"])) {
-            $_A["__static_token"] = Base::nullShow(Request::header('token'), Request::input('token'));
+            $_A["__static_token"] = self::headerOrInput('token');
         }
         return $_A["__static_token"];
     }
diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php
index 496c78447..018cbc0e9 100644
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -330,6 +330,8 @@ class BotReceiveMsgTask extends AbstractTask
                     'bot_uid' => $botUser->userid,
                     'version' => Base::getVersion(),
                 ], 10);
+                $userBot->webhook_num++;
+                $userBot->save();
             }
         }
     }