Skip to content

Commit eea90a0

Browse files
committed
feat: 后端配置文件新增账号同时登录开关配置
1 parent 53983de commit eea90a0

File tree

5 files changed

+23
-12
lines changed

5 files changed

+23
-12
lines changed

dash-fastapi-backend/.env.dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ APP_VERSION= '1.3.1'
1515
APP_RELOAD = true
1616
# 应用是否开启IP归属区域查询
1717
APP_IP_LOCATION_QUERY = true
18+
# 应用是否允许账号同时登录
19+
APP_SAME_TIME_LOGIN = true
1820

1921
# -------- Jwt配置 --------
2022
# Jwt秘钥

dash-fastapi-backend/.env.prod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ APP_VERSION= '1.3.1'
1515
APP_RELOAD = false
1616
# 应用是否开启IP归属区域查询
1717
APP_IP_LOCATION_QUERY = true
18+
# 应用是否允许账号同时登录
19+
APP_SAME_TIME_LOGIN = true
1820

1921
# -------- Jwt配置 --------
2022
# Jwt秘钥

dash-fastapi-backend/config/env.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class AppSettings(BaseSettings):
1818
app_version: str = '1.4.0'
1919
app_reload: bool = True
2020
app_ip_location_query: bool = True
21+
app_same_time_login: bool = True
2122

2223

2324
class JwtSettings(BaseSettings):

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ async def login(request: Request, form_data: CustomOAuth2PasswordRequestForm = D
4444
},
4545
expires_delta=access_token_expires
4646
)
47-
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}", access_token,
48-
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
49-
# 此方法可实现同一账号同一时间只能登录一次
50-
# await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{result[0].user_id}", access_token,
51-
# ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
47+
if AppConfig.app_same_time_login:
48+
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}", access_token,
49+
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
50+
else:
51+
# 此方法可实现同一账号同一时间只能登录一次
52+
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{result[0].user_id}", access_token,
53+
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
5254
logger.info('登录成功')
5355
# 判断请求是否来自于api文档,如果是返回指定格式的结果,用于修复api文档认证成功后token显示undefined的bug
5456
request_from_swagger = request.headers.get('referer').endswith('docs') if request.headers.get('referer') else False

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,18 @@ async def get_current_user(request: Request = Request, token: str = Depends(oaut
7373
if user is None:
7474
logger.warning("用户token不合法")
7575
raise AuthException(data="", message="用户token不合法")
76-
redis_token = await request.app.state.redis.get(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}")
77-
# 此方法可实现同一账号同一时间只能登录一次
78-
# redis_token = await request.app.state.redis.get(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{user.user_basic_info.user_id}")
76+
if AppConfig.app_same_time_login:
77+
redis_token = await request.app.state.redis.get(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}")
78+
else:
79+
# 此方法可实现同一账号同一时间只能登录一次
80+
redis_token = await request.app.state.redis.get(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{user.user_basic_info.user_id}")
7981
if token == redis_token:
80-
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}", redis_token,
81-
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
82-
# await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{user.user_basic_info.user_id}", redis_token,
83-
# ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
82+
if AppConfig.app_same_time_login:
83+
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{session_id}", redis_token,
84+
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
85+
else:
86+
await request.app.state.redis.set(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{user.user_basic_info.user_id}", redis_token,
87+
ex=timedelta(minutes=JwtConfig.jwt_redis_expire_minutes))
8488

8589
return CurrentUserInfoServiceResponse(
8690
user=user.user_basic_info,

0 commit comments

Comments
 (0)