nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-05-16 13:55:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
jxxghp
2024-10-10 19:04:46 +08:00
parent eb66f6c05a 9f79a30960
commit d2a613a441
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/endpoints/system.py
View File

@@ -138,7 +138,7 @@ def set_env_setting(env: dict,
@router.get("/progress/{process_type}", summary="实时进度") @router.get("/progress/{process_type}", summary="实时进度")
def get_progress(process_type: str, _: schemas.TokenPayload = Depends(verify_token)): def get_progress(process_type: str, _: schemas.TokenPayload = Depends(verify_resource_token)):
""" """
实时获取处理进度，返回格式为SSE 实时获取处理进度，返回格式为SSE
""" """

2
app/core/config.py
View File

@@ -39,7 +39,7 @@ class ConfigModel(BaseModel):
# TOKEN过期时间 # TOKEN过期时间
ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8 ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8
# RESOURCE_TOKEN过期时间 # RESOURCE_TOKEN过期时间
RESOURCE_ACCESS_TOKEN_EXPIRE_SECONDS: int = 60 * 10 RESOURCE_ACCESS_TOKEN_EXPIRE_SECONDS: int = 60 * 30
# 时区 # 时区
TZ: str = "Asia/Shanghai" TZ: str = "Asia/Shanghai"
# API监听地址 # API监听地址

5
app/core/security.py
View File

@@ -75,6 +75,7 @@ def create_access_token(
to_encode = { to_encode = {
"exp": expire, "exp": expire,
"iat": datetime.utcnow(),
"sub": str(userid), "sub": str(userid),
"username": username, "username": username,
"super_user": super_user, "super_user": super_user,
@@ -102,8 +103,8 @@ def __set_or_refresh_resource_token_cookie(request: Request, response: Response,
exp = decoded_token.get("exp") exp = decoded_token.get("exp")
if exp: if exp:
remaining_time = datetime.utcfromtimestamp(exp) - datetime.utcnow() remaining_time = datetime.utcfromtimestamp(exp) - datetime.utcnow()
# 如果剩余时间少于 2 分钟，刷新令牌 # 根据剩余时长提前刷新令牌
if remaining_time < timedelta(minutes=2): if remaining_time < timedelta(seconds=(settings.RESOURCE_ACCESS_TOKEN_EXPIRE_SECONDS / 3)):
raise jwt.ExpiredSignatureError raise jwt.ExpiredSignatureError
except jwt.PyJWTError: except jwt.PyJWTError:
logger.debug(f"Token error occurred. refreshing token") logger.debug(f"Token error occurred. refreshing token")