HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 踢其他设备时不再清除踢人者自己的 session
All checks were successful
Build docker and publish / build (20.15.1) (push) Successful in 7m29s
Details

Browse Source 
logoutUnbind 循环清理家庭成员时，踢人者(kicker)也在成员列表中，
导致 kicker 的设备被踢、session 被清，自己也下线了。
现在跳过 kickerUserID，只清缓存不踢设备不清 session。

Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
shanshanzhong 2026-03-12 03:05:34 -07:00
parent e4ec85c176
commit 2f33e1e680
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/logic/public/user/unbindDeviceLogic.go
View File

@ -66,10 +66,10 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
}
currentSessionID, _ := l.ctx.Value(constant.CtxKeySessionID).(string)
return l.logoutUnbind(targetUser, device, currentSessionID)
return l.logoutUnbind(userInfo.Id, targetUser, device, currentSessionID)
}
func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Device, currentSessionID string) error {
func (l *UnbindDeviceLogic) logoutUnbind(kickerUserID int64, userInfo *user.User, device *user.Device, currentSessionID string) error {
// 1. 事务前查出 AuthMethods，用于事务后清邮箱缓存
authMethods, _ := l.svcCtx.UserModel.FindUserAuthMethods(l.ctx, userInfo.Id)
@ -210,7 +210,7 @@ func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Devic
// 7. 清除该用户所有 session（旧 token 全部失效）
l.clearAllSessions(userInfo.Id)
// 8. 清理受影响的家庭成员缓存 + 踢设备 + 清 session
// 8. 清理受影响的家庭成员缓存 + 踢设备 + 清 session（跳过踢人者自己）
for _, memberID := range familyMemberIDs {
if memberUser, findErr := l.svcCtx.UserModel.FindOne(l.ctx, memberID); findErr == nil {
if clearErr := l.svcCtx.UserModel.ClearUserCache(l.ctx, memberUser); clearErr != nil {
@ -221,6 +221,11 @@ func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Devic
}
}
// 踢人者只需刷新缓存，不踢设备、不清 session
if memberID == kickerUserID {
continue
}
// 踢该成员的所有在线设备
var memberDevices []user.Device
l.svcCtx.DB.WithContext(l.ctx).