From fcce32f04c9ed61c73a986c46b00c7223ae0d6d8 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Wed, 25 Jun 2025 11:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=BA=95=E5=B1=82=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/WebSocketController.php    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Server/application/api/controller/WebSocketController.php b/Server/application/api/controller/WebSocketController.php
index a0891051..15f5fdfa 100644
--- a/Server/application/api/controller/WebSocketController.php
+++ b/Server/application/api/controller/WebSocketController.php
@@ -70,11 +70,11 @@ class WebSocketController extends BaseController
             $result_array = handleApiResponse($result);
 
             if (isset($result_array['access_token']) && !empty($result_array['access_token'])) {
-                    $this->authorized = $result_array['access_token'];
+                $this->authorized = $result_array['access_token'];
                 $this->accountId = $userData['accountId'];
                
-                    // 将token存入缓存，有效期5分钟
-                    Cache::set($cacheKey, $this->authorized, 300);
+                // 将token存入缓存，有效期5分钟
+                Cache::set($cacheKey, $this->authorized, 300);
             } else {
                     return json_encode(['code'=>400,'msg'=>'获取系统授权信息失败']);
                 }
@@ -649,7 +649,7 @@ class WebSocketController extends BaseController
 
         // 消息拼接  msgType(1:文本 3:图片 43:视频 47:动图表情包（gif、其他表情包） 49:小程序/其他：图文、文件)
         // 当前，type 为文本、图片、动图表情包的时候，content为string, 其他情况为对象 {type: 'file/link/...', url: '', title: '', thunmbPath: '', desc: ''}
-            $result = [
+        $params = [
                 "cmdType" => "CmdSendMessage",
                 "content" => $dataArray['content'],
                 "msgSubType" => 0,
@@ -660,14 +660,15 @@ class WebSocketController extends BaseController
                 "wechatFriendId" => $dataArray['wechatFriendId'],
             ];
 
-            $result = json_encode($result);
-            $this->client->send($result);
-            $message = $this->client->receive();
-            $message = json_decode($message, 1);
-            //关闭WS链接
-            $this->client->close();
-            //Log::write('WS个人消息发送');
-        return $message;
+        // 发送请求
+        $this->client->send(json_encode($params));
+        // 接收响应
+        $response = $this->client->receive();
+        $message = json_decode($response, true);
+
+        if(!empty($message)){
+            return json_encode(['code'=>500,'msg'=>'信息发送成功','data'=>$message]);
+        }
     }
 
     /**