msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix bug: group chat share pb

Browse Source
pull/232/head
skiffer-git 3 years ago
parent e7fdc318f1
commit a2e62c9fb5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File

24
internal/rpc/msg/send_msg.go
Unescape View File

@ -268,12 +268,16 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
for i := 0; i < len(memberUserIDList)/split; i++ { for i := 0; i < len(memberUserIDList)/split; i++ {
wg.Add(1) wg.Add(1)
go func(list []string) { go func(list []string) {
msgToMQGroup := pbChat.MsgDataToMQ{Token: pb.Token, OperationID: pb.OperationID, MsgData: pb.MsgData} groupPB := pbChat.SendMsgReq{MsgData: &sdk_ws.MsgData{OfflinePushInfo: &sdk_ws.OfflinePushInfo{}}}
groupPB = *pb
*groupPB.MsgData = *pb.MsgData
*groupPB.MsgData.OfflinePushInfo = *pb.MsgData.OfflinePushInfo
msgToMQGroup := pbChat.MsgDataToMQ{Token: groupPB.Token, OperationID: groupPB.OperationID, MsgData: groupPB.MsgData}
for _, v := range list { for _, v := range list {
pb.MsgData.RecvID = v groupPB.MsgData.RecvID = v
isSend := modifyMessageByUserMessageReceiveOpt(v, groupID, constant.GroupChatType, pb) isSend := modifyMessageByUserMessageReceiveOpt(v, groupID, constant.GroupChatType, &groupPB)
if isSend { if isSend {
msgToMQGroup.MsgData = pb.MsgData msgToMQGroup.MsgData = groupPB.MsgData
err := rpc.sendMsgToKafka(&msgToMQGroup, v) err := rpc.sendMsgToKafka(&msgToMQGroup, v)
if err != nil { if err != nil {
log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String()) log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String())
@ -288,12 +292,16 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
if remain > 0 { if remain > 0 {
wg.Add(1) wg.Add(1)
go func(list []string) { go func(list []string) {
groupPB := pbChat.SendMsgReq{MsgData: &sdk_ws.MsgData{OfflinePushInfo: &sdk_ws.OfflinePushInfo{}}}
groupPB = *pb
*groupPB.MsgData = *pb.MsgData
*groupPB.MsgData.OfflinePushInfo = *pb.MsgData.OfflinePushInfo
msgToMQGroup := pbChat.MsgDataToMQ{Token: groupPB.Token, OperationID: groupPB.OperationID, MsgData: groupPB.MsgData}
for _, v := range list { for _, v := range list {
msgToMQGroup := pbChat.MsgDataToMQ{Token: pb.Token, OperationID: pb.OperationID, MsgData: pb.MsgData} groupPB.MsgData.RecvID = v
pb.MsgData.RecvID = v isSend := modifyMessageByUserMessageReceiveOpt(v, groupID, constant.GroupChatType, &groupPB)
isSend := modifyMessageByUserMessageReceiveOpt(v, groupID, constant.GroupChatType, pb)
if isSend { if isSend {
msgToMQGroup.MsgData = pb.MsgData msgToMQGroup.MsgData = groupPB.MsgData
err := rpc.sendMsgToKafka(&msgToMQGroup, v) err := rpc.sendMsgToKafka(&msgToMQGroup, v)
if err != nil { if err != nil {
log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String()) log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String())

Write Preview
Loading…
Cancel
Save