blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-25 11:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

msg update

Browse Source
This commit is contained in:
Gordon 2023-03-20 10:43:02 +08:00
parent f03c72541a
commit eec9446abe
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/msg/send_pull.go
View File

@ -9,6 +9,7 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" "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/proto/sdkws"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
"github.com/go-redis/redis/v8"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"sync" "sync"
) )
@ -260,24 +261,23 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
resp := new(sdkws.GetMaxAndMinSeqResp) resp := new(sdkws.GetMaxAndMinSeqResp)
m2 := make(map[string]*sdkws.MaxAndMinSeq) m2 := make(map[string]*sdkws.MaxAndMinSeq)
maxSeq, err := m.MsgDatabase.GetUserMaxSeq(ctx, req.UserID) maxSeq, err := m.MsgDatabase.GetUserMaxSeq(ctx, req.UserID)
if err != nil { if err != nil && err != redis.Nil {
return nil, err return nil, err
} }
minSeq, err := m.MsgDatabase.GetUserMinSeq(ctx, req.UserID) minSeq, err := m.MsgDatabase.GetUserMinSeq(ctx, req.UserID)
if err != nil { if err != nil && err != redis.Nil {
return nil, err return nil, err
} }
resp.MaxSeq = maxSeq resp.MaxSeq = maxSeq
resp.MinSeq = minSeq resp.MinSeq = minSeq
if len(req.GroupIDs) > 0 { if len(req.GroupIDs) > 0 {
resp.GroupMaxAndMinSeq = make(map[string]*sdkws.MaxAndMinSeq)
for _, groupID := range req.GroupIDs { for _, groupID := range req.GroupIDs {
maxSeq, err := m.MsgDatabase.GetGroupMaxSeq(ctx, groupID) maxSeq, err := m.MsgDatabase.GetGroupMaxSeq(ctx, groupID)
if err != nil { if err != nil && err != redis.Nil {
return nil, err return nil, err
} }
minSeq, err := m.MsgDatabase.GetGroupMinSeq(ctx, groupID) minSeq, err := m.MsgDatabase.GetGroupMinSeq(ctx, groupID)
if err != nil { if err != nil && err != redis.Nil {
return nil, err return nil, err
} }
m2[groupID] = &sdkws.MaxAndMinSeq{ m2[groupID] = &sdkws.MaxAndMinSeq{
@ -286,6 +286,7 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
} }
} }
} }
resp.GroupMaxAndMinSeq = m2
return resp, nil return resp, nil
} }

2
pkg/common/mw/rpc_server_interceptor.go
View File

@ -119,7 +119,7 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
if err != nil { if err != nil {
panic(err) panic(err)
} }
log.ZError(ctx, "rpc server resp", err, "funcName", funcName) log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName)
return nil, details.Err() return nil, details.Err()
} }