blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-29 17:59:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

kick user log

Browse Source
This commit is contained in:
wangchuxiao 2023-07-12 13:21:49 +08:00
parent 3658f2b198
commit 5dbeac7dcf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/msggateway/hub_server.go
View File

@ -146,6 +146,8 @@ func (s *Server) KickUserOffline(ctx context.Context, req *msggateway.KickUserOf
return nil, err
}
}
} else {
log.ZWarn(ctx, "conn not exist", nil, "userID", v, "platformID", req.PlatformID)
}
}
return &msggateway.KickUserOfflineResp{}, nil

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

@ -93,14 +93,13 @@ func (s *authServer) ParseToken(ctx context.Context, req *pbAuth.ParseTokenReq)
}
func (s *authServer) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) {
resp := pbAuth.ForceLogoutResp{}
if err := tokenverify.CheckAdmin(ctx); err != nil {
return nil, err
}
if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, mcontext.GetOperationID(ctx)); err != nil {
return nil, err
}
return &resp, nil
return &pbAuth.ForceLogoutResp{}, nil
}
func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID int32, operationID string) error {
@ -114,5 +113,5 @@ func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID
_, err := client.KickUserOffline(ctx, kickReq)
return utils.Wrap(err, "")
}
return errs.ErrInternalServer.Wrap()
return nil
}

2
pkg/common/db/controller/msg.go
View File

@ -607,7 +607,7 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string
//&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli()
if len(msgDocModel.Msg) > 0 {
for _, msg := range msgDocModel.Msg {
if msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
if msg != nil && msg.Msg != nil && msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
if msg.Msg.SendTime > lastMsgDestructTime.UnixMilli() && !utils.Contain(userID, msg.DelList...) {
seqs = append(seqs, msg.Msg.Seq)
}