From 5c503e71edbe9a55acddab9c05afc61e5c7e7ec2 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 2 Nov 2022 15:32:36 +0800
Subject: [PATCH] message update

---
 internal/rpc/msg/pull_message.go |  8 ++++----
 pkg/common/db/mongoModel.go      |  3 ---
 pkg/common/log/file_line_hk.go   | 32 --------------------------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/internal/rpc/msg/pull_message.go b/internal/rpc/msg/pull_message.go
index 1a99a14e6..83f2275f2 100644
--- a/internal/rpc/msg/pull_message.go
+++ b/internal/rpc/msg/pull_message.go
@@ -61,9 +61,9 @@ func (rpc *rpcChat) PullMessageBySeqList(_ context.Context, in *open_im_sdk.Pull
 		msgList, err1 := commonDB.DB.GetMsgBySeqListMongo2(in.UserID, failedSeqList, in.OperationID)
 		if err1 != nil {
 			promePkg.PromeAdd(promePkg.MsgPullFromMongoFailedCounter, len(failedSeqList))
-			log.Error(in.OperationID, "PullMessageBySeqList data error", in.String(), err.Error())
+			log.Error(in.OperationID, "PullMessageBySeqList data error", in.String(), err1.Error())
 			resp.ErrCode = 201
-			resp.ErrMsg = err.Error()
+			resp.ErrMsg = err1.Error()
 			return resp, nil
 		} else {
 			promePkg.PromeAdd(promePkg.MsgPullFromMongoSuccessCounter, len(msgList))
@@ -88,9 +88,9 @@ func (rpc *rpcChat) PullMessageBySeqList(_ context.Context, in *open_im_sdk.Pull
 			msgList, err1 := commonDB.DB.GetSuperGroupMsgBySeqListMongo(k, failedSeqList, in.OperationID)
 			if err1 != nil {
 				promePkg.PromeAdd(promePkg.MsgPullFromMongoFailedCounter, len(failedSeqList))
-				log.Error(in.OperationID, "PullMessageBySeqList data error", in.String(), err.Error())
+				log.Error(in.OperationID, "PullMessageBySeqList data error", in.String(), err1.Error())
 				resp.ErrCode = 201
-				resp.ErrMsg = err.Error()
+				resp.ErrMsg = err1.Error()
 				return resp, nil
 			} else {
 				promePkg.PromeAdd(promePkg.MsgPullFromMongoSuccessCounter, len(msgList))
diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go
index 389a1e0f1..e3349bd76 100644
--- a/pkg/common/db/mongoModel.go
+++ b/pkg/common/db/mongoModel.go
@@ -374,9 +374,6 @@ func (d *DataBases) GetMsgBySeqListMongo2(uid string, seqList []uint32, operatio
 			}
 		}
 	}
-	if len(hasSeqList) == 0 {
-		return nil, errors.New("pull message is null")
-	}
 	if len(hasSeqList) != len(seqList) {
 		var diff []uint32
 		diff = utils.Difference(hasSeqList, seqList)
diff --git a/pkg/common/log/file_line_hk.go b/pkg/common/log/file_line_hk.go
index fd6047a2f..1a609d9be 100644
--- a/pkg/common/log/file_line_hk.go
+++ b/pkg/common/log/file_line_hk.go
@@ -39,35 +39,3 @@ func (f *fileHook) Fire(entry *logrus.Entry) error {
 	entry.Data["FilePath"] = s
 	return nil
 }
-
-//func findCaller(skip int) string {
-//	file := ""
-//	line := 0
-//	for i := 0; i < 10; i++ {
-//		file, line = getCaller(skip + i)
-//		if !strings.HasPrefix(file, "log") {
-//			break
-//		}
-//	}
-//	return fmt.Sprintf("%s:%d", file, line)
-//}
-//
-//func getCaller(skip int) (string, int) {
-//	_, file, line, ok := runtime.Caller(skip)
-//
-//	if !ok {
-//		return "", 0
-//	}
-//	fmt.Println("skip:", skip, "file:", file, "line", line)
-//	n := 0
-//	for i := len(file) - 1; i > 0; i-- {
-//		if file[i] == '/' {
-//			n++
-//			if n >= 2 {
-//				file = file[i+1:]
-//				break
-//			}
-//		}
-//	}
-//	return file, line
-//}