From a472da9ea69db3cb6aa7e237b763aab1b69ca585 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 13 May 2022 16:19:11 +0800 Subject: [PATCH] msg bug fix --- internal/rpc/msg/send_msg.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 87b79693c..8f7e7f427 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -256,7 +256,6 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S } onUserIDList, offUserIDList := getOnlineAndOfflineUserIDList(memberUserIDList, pb.OperationID) log.Debug(pb.OperationID, onUserIDList, offUserIDList) - groupID := pb.MsgData.GroupID //split parallel send var wg sync.WaitGroup var sendTag bool @@ -281,21 +280,8 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S go rpc.sendMsgToGroup(offUserIDList[split*(len(offUserIDList)/split):], *pb, constant.OfflineStatus, &sendTag, &wg) } wg.Wait() - log.Info(msgToMQSingle.OperationID, "addUidList", addUidList) - for _, v := range addUidList { - pb.MsgData.RecvID = v - isSend := modifyMessageByUserMessageReceiveOpt(v, groupID, constant.GroupChatType, pb) - log.Info(msgToMQSingle.OperationID, "isSend", isSend) - if isSend { - msgToMQSingle.MsgData = pb.MsgData - err := rpc.sendMsgToKafka(&msgToMQSingle, v, constant.OnlineStatus) - if err != nil { - log.NewError(msgToMQSingle.OperationID, "kafka send msg err:UserId", v, msgToMQSingle.String()) - } else { - sendTag = true - } - } - } + wg.Add(1) + rpc.sendMsgToGroup(addUidList, *pb, constant.OnlineStatus, &sendTag, &wg) // callback if err := callbackAfterSendGroupMsg(pb); err != nil { log.NewError(pb.OperationID, utils.GetSelfFuncName(), "callbackAfterSendGroupMsg failed", err.Error())