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

conversation

Browse Source
This commit is contained in:
wangchuxiao 2023-04-20 16:05:22 +08:00
parent 9f523d980a
commit b05bedf243
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/msggateway/message_handler.go
View File

@ -2,6 +2,7 @@ package msggateway
import ( import (
"context" "context"
"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/rpcclient/notification" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
@ -61,7 +62,7 @@ func (g GrpcHandler) GetSeq(context context.Context, data Req) ([]byte, error) {
if err := proto.Unmarshal(data.Data, &req); err != nil { if err := proto.Unmarshal(data.Data, &req); err != nil {
return nil, err return nil, err
} }
if err := g.validate.Struct(req); err != nil { if err := g.validate.Struct(&req); err != nil {
return nil, err return nil, err
} }
resp, err := g.notification.Msg.GetMaxAndMinSeq(context, &req) resp, err := g.notification.Msg.GetMaxAndMinSeq(context, &req)
@ -100,7 +101,7 @@ func (g GrpcHandler) SendSignalMessage(context context.Context, data Req) ([]byt
if err := proto.Unmarshal(data.Data, &signalReq); err != nil { if err := proto.Unmarshal(data.Data, &signalReq); err != nil {
return nil, err return nil, err
} }
if err := g.validate.Struct(signalReq); err != nil { if err := g.validate.Struct(&signalReq); err != nil {
return nil, err return nil, err
} }
//req := pbRtc.SignalMessageAssembleReq{SignalReq: &signalReq, OperationID: "111"} //req := pbRtc.SignalMessageAssembleReq{SignalReq: &signalReq, OperationID: "111"}

1
pkg/common/db/controller/conversation.go
View File

@ -168,6 +168,7 @@ func (c *ConversationDataBase) SetUserConversations(ctx context.Context, ownerUs
return err return err
} }
if len(existConversations) > 0 { if len(existConversations) > 0 {
log.ZDebug(ctx, "SetUserConversations", "existConversations", existConversations)
err = conversationTx.Update(ctx, conversations) err = conversationTx.Update(ctx, conversations)
if err != nil { if err != nil {
return err return err