Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

# Conflicts:
#	internal/rpc/msg/rpcChat.go
pull/232/head
wangchuxiao 3 years ago
parent e961a44511
commit 9eb1870196

@ -91,11 +91,15 @@ func (rpc *rpcChat) runCh() {
for { for {
select { select {
case msg := <-rpc.delMsgCh: case msg := <-rpc.delMsgCh:
if unexistSeqList, err := db.DB.DelMsgBySeqList(msg.UserID, msg.SeqList, msg.OperationID); err != nil { db.DB.DelMsgFromCache(msg.UserID, msg.SeqList, msg.OperationID)
unexistSeqList, err := db.DB.DelMsgBySeqList(msg.UserID, msg.SeqList, msg.OperationID)
if err != nil {
log.NewError(msg.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", msg.UserID, msg.SeqList, msg.OperationID, err.Error()) log.NewError(msg.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", msg.UserID, msg.SeqList, msg.OperationID, err.Error())
DeleteMessageNotification(msg.OpUserID, msg.UserID, unexistSeqList, msg.OperationID) continue
}
if len(unexistSeqList) > 0 {
DeleteMessageNotification(msg.OpUserID, msg.UserID, msg.SeqList, msg.OperationID)
} }
db.DB.DelMsgFromCache(msg.UserID, msg.SeqList, msg.OperationID)
} }
} }
} }

Loading…
Cancel
Save