Merge branch '20241106_lj_chat' into dev

app/Controller/ChatController.php

@@ -214,19 +214,23 @@ class ChatController extends AbstractController
             return Result::error(implode(', ', $validator->errors()->all()), 0);
         }
         $requireData['user_id'] = Context::get("UserId");
-        var_dump($requireData,'1111test');
+        // var_dump($requireData,'1111test');
         $result = $this->chatServiceClient->applyFriend($requireData);
-         //redis 添加好友
-         if ($result && $result['code'] != 0) {
+        if ($result && $result['code'] != 0) {
+            $realResult = $result;
             $redisClient = new RedisService();
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['user_id'], 'status' => 2]);
+            // 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');
             $redisClient->setUserFriends((string)$frindid, $myFriends['data']);
             $result =  $redisClient->getUserFriends((string)$requireData['user_id']);
-            var_dump($result,'redis-结果');
+            // var_dump($result,'redis-结果');
             $result =  $redisClient->getUserFriends((string)$frindid);
-            var_dump($result,'redis-结果');
+            // var_dump($result,'redis-结果');
+            //redis 添加好友
+            $result = $realResult;
         }
         return $result && $result['code'] != 0 ? Result::success($result['data']) :     Result::error($result['message']);
     }