From 4989bb07f65e18fb7dbcbd529ec5e7df0be5ca1e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 1 Nov 2022 19:39:56 +0800 Subject: [PATCH] test cron --- internal/cron_task/clear_msg.go | 3 +++ pkg/common/db/mongoModel.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/cron_task/clear_msg.go b/internal/cron_task/clear_msg.go index 078eee136..0f3b05263 100644 --- a/internal/cron_task/clear_msg.go +++ b/internal/cron_task/clear_msg.go @@ -82,6 +82,9 @@ func deleteMongoMsg(operationID string, ID string, index int64, delMsgIDList *[] } return getDelMaxSeqByIDList(*delMsgIDList), delMongoMsgs(operationID, delMsgIDList) } + if index == 0 && msgs == nil { + return 0, nil + } if len(msgs.Msg) > db.GetSingleGocMsgNum() { log.NewWarn(operationID, utils.GetSelfFuncName(), "msgs too large", len(msgs.Msg), msgs.UID) } diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 8631b65ab..ff0dca2b0 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -277,7 +277,7 @@ func (d *DataBases) GetUserMsgListByIndex(ID string, index int64) (*UserChat, er if len(msgs) > 0 { return &msgs[0], err } else { - return nil, errors.New("get msg list failed") + return nil, nil } //return &msgs, nil } @@ -317,7 +317,7 @@ func (d *DataBases) GetNewestMsg(ID string) (msg *MsgInfo, err error) { if err != nil { return nil, err } - err = cursor.Decode(&userChats) + err = cursor.All(ctx, &userChats) if err != nil { return nil, utils.Wrap(err, "") }