blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-19 20:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug: multiple gateway kick user

Browse Source
This commit is contained in:
wangchuxiao 2023-07-14 19:38:59 +08:00
parent 1dbc8fe882
commit 6bf6a9b808
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/msggateway/hub_server.go
View File

@ -185,7 +185,7 @@ func (s *Server) KickUserOffline(
if err != nil { if err != nil {
return nil, err return nil, err
} }
s.LongConnServer.UnRegister(client) // s.LongConnServer.UnRegister(client)
} }
} else { } else {
log.ZInfo(ctx, "conn not exist", nil, "userID", v, "platformID", req.PlatformID) log.ZInfo(ctx, "conn not exist", nil, "userID", v, "platformID", req.PlatformID)

4
internal/rpc/auth/auth.go
View File

@ -130,7 +130,9 @@ func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID
if err != nil { if err != nil {
return err return err
} }
log.ZDebug(ctx, "forceKickOff", "conns", conns) for _, v := range conns {
log.ZDebug(ctx, "forceKickOff", "conn", v.(*grpc.ClientConn).Target())
}
for _, v := range conns { for _, v := range conns {
client := msggateway.NewMsgGatewayClient(v) client := msggateway.NewMsgGatewayClient(v)
kickReq := &msggateway.KickUserOfflineReq{KickUserIDList: []string{userID}, PlatformID: platformID} kickReq := &msggateway.KickUserOfflineReq{KickUserIDList: []string{userID}, PlatformID: platformID}

10
pkg/proto/msg/msg.go
View File

@ -126,6 +126,11 @@ func (x *MarkMsgsAsReadReq) Check() error {
if x.UserID == "" { if x.UserID == "" {
return errs.ErrArgs.Wrap("userID is empty") return errs.ErrArgs.Wrap("userID is empty")
} }
for _, seq := range x.Seqs {
if seq == 0 {
return errs.ErrArgs.Wrap("seqs has 0 value is invalid")
}
}
return nil return nil
} }
@ -139,6 +144,11 @@ func (x *MarkConversationAsReadReq) Check() error {
if x.HasReadSeq < 1 { if x.HasReadSeq < 1 {
return errs.ErrArgs.Wrap("hasReadSeq is invalid") return errs.ErrArgs.Wrap("hasReadSeq is invalid")
} }
for _, seq := range x.Seqs {
if seq == 0 {
return errs.ErrArgs.Wrap("seqs has 0 value is invalid")
}
}
return nil return nil
} }