消息增加是否组消息字段

Author: linyiyuan

app/Controller/Laboratory/Ws/FriendController.php

@@ -52,6 +52,7 @@ public function sendMessage()
                     'content' => $contactData['content'],
                     'toContactId' => $contactData['fromUser']['id'],
                     'fromUser' => $contactData['fromUser'],
+                    'isGroup' => false,
                 ],
                 'event' => ''
             ],
@@ -95,6 +96,7 @@ public function pullMessage()
                 'toContactId' => $value['to_uid'],
                 'fileSize' => $value['file_size'],
                 'fileName' => $value['file_name'],
+                'isGroup' => false,
                 'fromUser' => [
                     'id' => $value['from_uid'],
                     'avatar' => User::query()->where('id', $value['from_uid'])->value('avatar'),

app/Controller/Laboratory/Ws/GroupController.php

@@ -66,6 +66,7 @@ public function sendMessage()
                     'content' => $contactData['content'],
                     'toContactId' =>$contactData['toContactId'],
                     'fromUser' => $contactData['fromUser'],
+                    'isGroup' => true,
                 ],
             ],
             'fd' => $fdList
@@ -100,6 +101,7 @@ public function pullMessage()
                 'toContactId' => $value['to_group_id'],
                 'fileSize' => $value['file_size'],
                 'fileName' => $value['file_name'],
+                'isGroup' => true,
             ];
             if ($value['from_uid'] != 0) $temp['fromUser'] = [
                 'id' => $value['from_uid'],

app/Controller/Laboratory/Ws/MessageController.php

@@ -25,27 +25,53 @@
 class MessageController extends AbstractController
 {
     /**
-     * 发送信息
+     * 合并转发信息
+     * @RequestMapping(path="merge_forward_message",methods="POST")
+     */
+    public function mergeForwardMessage()
+    {
+        $chatMessage = MessageParser::decode(conGet('chat_message'));
+        $contactData = $chatMessage['message'];
+
+        $content = json_encode($contactData['message']);
+        $user = $contactData['user'];
+        foreach ($contactData['contact'] as $item) {
+            if ($item['is_group'] == 1) {
+                $groupInfo = Group::query()->where('group_id', $item['id'])->first();
+                if (empty($groupInfo)) continue;
+                $groupInfo = objToArray($groupInfo);
+                $this->container->get(GroupWsTask::class)->mergeForwardMessage($groupInfo, $user, $content);
+            }else {
+                $userInfo = User::query()->where('id', $item['id'])->first();
+                if (empty($userInfo)) continue;
+                $userInfo = objToArray($userInfo);
+                $this->container->get(FriendWsTask::class)->mergeForwardMessage($userInfo, $user, $content);
+            }
+        }
+    }
+
+    /**
+     * 合并转发信息
      * @RequestMapping(path="forward_message",methods="POST")
      */
     public function forwardMessage()
     {
         $chatMessage = MessageParser::decode(conGet('chat_message'));
         $contactData = $chatMessage['message'];
 
-        $content = json_encode($contactData['message']);
         $user = $contactData['user'];
         foreach ($contactData['contact'] as $item) {
             if ($item['is_group'] == 1) {
                 $groupInfo = Group::query()->where('group_id', $item['id'])->first();
+                var_dump($groupInfo);
                 if (empty($groupInfo)) continue;
                 $groupInfo = objToArray($groupInfo);
-                $this->container->get(GroupWsTask::class)->forwardMessage($groupInfo, $user, $content);
+                $this->container->get(GroupWsTask::class)->forwardMessage($groupInfo, $user, $contactData['message']);
             }else {
                 $userInfo = User::query()->where('id', $item['id'])->first();
                 if (empty($userInfo)) continue;
                 $userInfo = objToArray($userInfo);
-                $this->container->get(FriendWsTask::class)->forwardMessage($userInfo, $user, $content);
+                $this->container->get(FriendWsTask::class)->forwardMessage($userInfo, $user, $contactData['message']);
             }
         }
     }

app/Task/Laboratory/FriendWsTask.php

@@ -64,13 +64,13 @@ public function friendOnlineAndOfflineNotify(array $userInfo, string $event, boo
     }
 
     /**
-     * 转发信息
+     * 合并转发信息
      * @param array $userInfo
      * @param array $user
      * @param string $content
      * @return bool
      */
-    function forwardMessage(array $userInfo, array $user, string $content)
+    function mergeForwardMessage(array $userInfo, array $user, string $content)
     {
         //添加聊天记录
         $message = [];
@@ -83,6 +83,7 @@ function forwardMessage(array $userInfo, array $user, string $content)
         $message['content'] = $content;
         $message['toContactId'] = $userInfo['id'];
         $message['fromUser'] = $user;
+        $message['isGroup'] = false;
         $contactId = Redis::getInstance()->hget(ChatRedisKey::ONLINE_USER_FD_KEY, (string)$userInfo['id']);
         $fromUserFd = Redis::getInstance()->hget(ChatRedisKey::ONLINE_USER_FD_KEY, (string)$user['id']);
         $receptionState = empty($contactId) ? FriendChatHistory::RECEPTION_STATE_NO : FriendChatHistory::RECEPTION_STATE_YES;

app/Task/Laboratory/GroupWsTask.php

@@ -297,13 +297,13 @@ public function changeGroupAvatar(array $groupInfo)
     }
 
     /**
-     * 转发信息
+     * 合并转发信息
      * @param array $groupInfo
      * @param array $user
      * @param string $content
      * @return bool
      */
-    function forwardMessage(array $groupInfo, array $user, string $content)
+    function mergeForwardMessage(array $groupInfo, array $user, string $content)
     {
         //添加聊天记录
         $message = [];
@@ -326,6 +326,41 @@ function forwardMessage(array $groupInfo, array $user, string $content)
         return true;
     }
 
+    /**
+     * 逐条转发信息
+     * @param array $groupInfo
+     * @param array $user
+     * @param array $content
+     * @return bool
+     */
+    function forwardMessage(array $groupInfo, array $user, array $content)
+    {
+        if (is_array($content)) {
+            foreach ($content as $item) {
+                var_dump($item);
+//                //添加聊天记录
+//                $message = [];
+//                $message['id'] = generate_rand_id();
+//                $message['from_uid'] = $user['id'];
+//                $message['to_group_id'] = $groupInfo['group_id'];
+//                $message['type'] = GroupChatHistory::GROUP_CHAT_MESSAGE_TYPE_FORWARD;
+//                $message['status'] = GroupChatHistory::GROUP_CHAT_MESSAGE_STATUS_SUCCEED;
+//                $message['sendTime'] = time() * 1000;
+//                $message['content'] = $content;
+//                $message['toContactId'] = $groupInfo['group_id'];
+//                $message['fromUser'] = $user;
+//
+//                //获取不在线用户，并添加到未读历史消息中
+//                $unOnlineUidList = GroupService::getInstance()->getUnOnlineGroupMember($groupInfo['group_id']);
+//                foreach ($unOnlineUidList as $uid) {
+//                    Redis::getInstance()->sAdd(ChatRedisKey::GROUP_CHAT_UNREAD_MESSAGE_BY_USER . $uid, $groupInfo['group_id']);
+//                }
+//                $this->sendMessage($groupInfo['group_id'], $message, GroupEvent::FORWARD_MESSAGE);
+                return true;
+            }
+        }
+    }
+
     /**
      * 组消息发送
      * @param string $groupId
@@ -340,6 +375,7 @@ public function sendMessage(string $groupId, array $message, $event = '')
             $message['fromUser']['id'] = 0;
             $message['fromUser']['displayName'] = '系统通知';
         }
+        $message['isGroup'] = true;
         //添加聊天记录
         GroupChatHistory::addMessage($message, 1);
         $uidFdList = GroupService::getInstance()->getOnlineGroupMemberFd($groupId);