Merge branch '20241106_lj_chat'

app/Controller/ChatController.php

@@ -193,8 +193,8 @@ class ChatController extends AbstractController
     public function applyFriend()
     {
         $requireData = $this->request->all();
-        $frindid =$requireData['apply_id'];
-        unset($requireData['apply_id']);
+        $frindid =$requireData['friend_id']??0;
+        unset($requireData['friend_id']);
         // 定义验证规则
         $validator = $this->validationFactory->make(
             $requireData,
@@ -223,7 +223,7 @@ class ChatController extends AbstractController
             // var_dump($myFriends, '--------------------1');
             $redisClient->setUserFriends((string)$requireData['user_id'], $myFriends['data']);
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $frindid, 'status' => 2]);
-            // var_dump($myFriends, '-------------3-------1');
+             var_dump($myFriends, '-------------3-------1');
             $redisClient->setUserFriends((string)$frindid, $myFriends['data']);
             $result =  $redisClient->getUserFriends((string)$requireData['user_id']);
             // var_dump($result,'redis-结果');

app/Controller/WebSocketController.php

@@ -87,8 +87,8 @@ class WebSocketController implements OnMessageInterface, OnOpenInterface, OnClos
                 if (!in_array($result['receiver_id'], $myFriendsArrID)) {
                     $result['content'] = '您还不是好友，无法发送消息!';
                     $server->push((int) $frame->fd, json_encode($result));
+                    return;
                 }
-            return;
         }
             //给自己推一条数据
             if ($server->isEstablished($frame->fd)) {