From 4f322254b009c1b15b0c9cc3329df09623865a5c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 9 Jan 2023 19:11:50 +0800 Subject: [PATCH] fix Pb2String --- internal/rpc/msg/rpcChat.go | 11 +++-------- pkg/common/db/mongoModel.go | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/internal/rpc/msg/rpcChat.go b/internal/rpc/msg/rpcChat.go index 470325deb..a8ca5bc05 100644 --- a/internal/rpc/msg/rpcChat.go +++ b/internal/rpc/msg/rpcChat.go @@ -145,14 +145,9 @@ func (rpc *rpcChat) runCh() { select { case msg := <-rpc.delMsgCh: log.NewInfo(msg.OperationID, utils.GetSelfFuncName(), "delmsgch recv new: ", msg) - 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()) - continue - } - if len(unexistSeqList) > 0 { - DeleteMessageNotification(msg.OpUserID, msg.UserID, unexistSeqList, msg.OperationID) + if len(msg.SeqList) > 0 { + db.DB.DelMsgFromCache(msg.UserID, msg.SeqList, msg.OperationID) + DeleteMessageNotification(msg.OpUserID, msg.UserID, msg.SeqList, msg.OperationID) } } } diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 4d7d01f80..5b8cd2fb9 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -94,7 +94,7 @@ func (d *DataBases) GetMinSeqFromMongo2(uid string) (MinSeq uint32, err error) { } // deleteMsgByLogic -func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID string) (totalUnexistSeqList []uint32, err error) { +func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID string) (totalUnExistSeqList []uint32, err error) { log.Debug(operationID, utils.GetSelfFuncName(), "args ", userID, seqList) sortkeys.Uint32s(seqList) suffixUserID2SubSeqList := func(uid string, seqList []uint32) map[string][]uint32 { @@ -123,11 +123,11 @@ func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID return } lock.Lock() - totalUnexistSeqList = append(totalUnexistSeqList, unexistSeqList...) + totalUnExistSeqList = append(totalUnExistSeqList, unexistSeqList...) lock.Unlock() }(k, v, operationID) } - return totalUnexistSeqList, err + return totalUnExistSeqList, err } func (d *DataBases) DelMsgBySeqListInOneDoc(suffixUserID string, seqList []uint32, operationID string) ([]uint32, error) {