Skip to content

Commit df6f795

Browse files
committed
fix: 修复logout接口未按照app_same_time_login配置项动态判断的问题
1 parent 6574bdc commit df6f795

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎dash-fastapi-backend/module_admin/controller/login_controller.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,11 @@ async def logout(request: Request, token: Optional[str] = Depends(oauth2_scheme)
127127
payload = jwt.decode(
128128
token, JwtConfig.jwt_secret_key, algorithms=[JwtConfig.jwt_algorithm], options={'verify_exp': False}
129129
)
130-
session_id: str = payload.get('session_id')
131-
await LoginService.logout_services(request, session_id)
130+
if AppConfig.app_same_time_login:
131+
token_id: str = payload.get('session_id')
132+
else:
133+
token_id: str = payload.get('user_id')
134+
await LoginService.logout_services(request, token_id)
132135
logger.info('退出成功')
133136

134137
return ResponseUtil.success(msg='退出成功')

‎dash-fastapi-backend/module_admin/service/login_service.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,15 +462,15 @@ async def forget_user_services(cls, request: Request, query_db: AsyncSession, fo
462462
raise ServiceException(message='短信验证码不正确')
463463

464464
@classmethod
465-
async def logout_services(cls, request: Request, session_id: str):
465+
async def logout_services(cls, request: Request, token_id: str):
466466
"""
467467
退出登录services
468468
469469
:param request: Request对象
470-
:param session_id: 会话编号
470+
:param token_id: 令牌编号
471471
:return: 退出登录结果
472472
"""
473-
await request.app.state.redis.delete(f'{RedisInitKeyConfig.ACCESS_TOKEN.key}:{session_id}')
473+
await request.app.state.redis.delete(f'{RedisInitKeyConfig.ACCESS_TOKEN.key}:{token_id}')
474474
# await request.app.state.redis.delete(f'{current_user.user.user_id}_access_token')
475475
# await request.app.state.redis.delete(f'{current_user.user.user_id}_session_id')
476476

0 commit comments

Comments
 (0)