From eec9446abe503d69e77e51f187bcaae3532ebec9 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Mon, 20 Mar 2023 10:43:02 +0800
Subject: [PATCH] msg update

---
 internal/rpc/msg/send_pull.go           | 11 ++++++-----
 pkg/common/mw/rpc_server_interceptor.go |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/internal/rpc/msg/send_pull.go b/internal/rpc/msg/send_pull.go
index eac40bc1a..af3c65760 100644
--- a/internal/rpc/msg/send_pull.go
+++ b/internal/rpc/msg/send_pull.go
@@ -9,6 +9,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"github.com/go-redis/redis/v8"
 	"github.com/golang/protobuf/proto"
 	"sync"
 )
@@ -260,24 +261,23 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
 	resp := new(sdkws.GetMaxAndMinSeqResp)
 	m2 := make(map[string]*sdkws.MaxAndMinSeq)
 	maxSeq, err := m.MsgDatabase.GetUserMaxSeq(ctx, req.UserID)
-	if err != nil {
+	if err != nil && err != redis.Nil {
 		return nil, err
 	}
 	minSeq, err := m.MsgDatabase.GetUserMinSeq(ctx, req.UserID)
-	if err != nil {
+	if err != nil && err != redis.Nil {
 		return nil, err
 	}
 	resp.MaxSeq = maxSeq
 	resp.MinSeq = minSeq
 	if len(req.GroupIDs) > 0 {
-		resp.GroupMaxAndMinSeq = make(map[string]*sdkws.MaxAndMinSeq)
 		for _, groupID := range req.GroupIDs {
 			maxSeq, err := m.MsgDatabase.GetGroupMaxSeq(ctx, groupID)
-			if err != nil {
+			if err != nil && err != redis.Nil {
 				return nil, err
 			}
 			minSeq, err := m.MsgDatabase.GetGroupMinSeq(ctx, groupID)
-			if err != nil {
+			if err != nil && err != redis.Nil {
 				return nil, err
 			}
 			m2[groupID] = &sdkws.MaxAndMinSeq{
@@ -286,6 +286,7 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
 			}
 		}
 	}
+	resp.GroupMaxAndMinSeq = m2
 	return resp, nil
 }
 
diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go
index ca6af8f7d..26362c786 100644
--- a/pkg/common/mw/rpc_server_interceptor.go
+++ b/pkg/common/mw/rpc_server_interceptor.go
@@ -119,7 +119,7 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
 	if err != nil {
 		panic(err)
 	}
-	log.ZError(ctx, "rpc server resp", err, "funcName", funcName)
+	log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName)
 	return nil, details.Err()
 }