From dcd46f16277316a52be2583ea6aa448231ae4fbe Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 5 May 2024 11:54:42 +0800 Subject: [PATCH] fix #2001 --- app/api/endpoints/history.py | 12 ++++++++++++ app/api/endpoints/site.py | 6 ++++-- app/api/endpoints/system.py | 16 +++++++++------- app/api/endpoints/user.py | 4 ++-- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/api/endpoints/history.py b/app/api/endpoints/history.py index 0b2066cb..00b9f964 100644 --- a/app/api/endpoints/history.py +++ b/app/api/endpoints/history.py @@ -9,8 +9,10 @@ from app.chain.transfer import TransferChain from app.core.event import eventmanager from app.core.security import verify_token from app.db import get_db +from app.db.models import User from app.db.models.downloadhistory import DownloadHistory from app.db.models.transferhistory import TransferHistory +from app.db.userauth import get_current_active_superuser from app.schemas.types import EventType router = APIRouter() @@ -103,3 +105,13 @@ def delete_transfer_history(history_in: schemas.TransferHistory, # 删除记录 TransferHistory.delete(db, history_in.id) return schemas.Response(success=True) + + +@router.get("/empty/transfer", summary="清空转移历史记录", response_model=schemas.Response) +def delete_transfer_history(db: Session = Depends(get_db), + _: User = Depends(get_current_active_superuser)) -> Any: + """ + 清空转移历史记录 + """ + TransferHistory.truncate(db) + return schemas.Response(success=True) diff --git a/app/api/endpoints/site.py b/app/api/endpoints/site.py index 38ce1901..b1a94ffa 100644 --- a/app/api/endpoints/site.py +++ b/app/api/endpoints/site.py @@ -10,10 +10,12 @@ from app.chain.torrents import TorrentsChain from app.core.event import EventManager from app.core.security import verify_token from app.db import get_db +from app.db.models import User from app.db.models.site import Site from app.db.models.siteicon import SiteIcon from app.db.models.sitestatistic import SiteStatistic from app.db.systemconfig_oper import SystemConfigOper +from app.db.userauth import get_current_active_superuser from app.helper.sites import SitesHelper from app.scheduler import Scheduler from app.schemas.types import SystemConfigKey, EventType @@ -96,7 +98,7 @@ def update_site( def delete_site( site_id: int, db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token) + _: User = Depends(get_current_active_superuser) ) -> Any: """ 删除站点 @@ -122,7 +124,7 @@ def cookie_cloud_sync(background_tasks: BackgroundTasks, @router.get("/reset", summary="重置站点", response_model=schemas.Response) def reset(db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: + _: User = Depends(get_current_active_superuser)) -> Any: """ 清空所有站点数据并重新同步CookieCloud站点信息 """ diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py index 3b9201ff..5c416c8c 100644 --- a/app/api/endpoints/system.py +++ b/app/api/endpoints/system.py @@ -14,7 +14,9 @@ from app.chain.system import SystemChain from app.core.config import settings from app.core.module import ModuleManager from app.core.security import verify_token +from app.db.models import User from app.db.systemconfig_oper import SystemConfigOper +from app.db.userauth import get_current_active_superuser from app.helper.message import MessageHelper from app.helper.progress import ProgressHelper from app.helper.sites import SitesHelper @@ -44,7 +46,7 @@ def get_img(imgurl: str, proxy: bool = False) -> Any: @router.get("/env", summary="查询系统环境变量", response_model=schemas.Response) -def get_env_setting(_: schemas.TokenPayload = Depends(verify_token)): +def get_env_setting(_: User = Depends(get_current_active_superuser)): """ 查询系统环境变量，包括当前版本号 """ @@ -63,7 +65,7 @@ def get_env_setting(_: schemas.TokenPayload = Depends(verify_token)): @router.post("/env", summary="更新系统环境变量", response_model=schemas.Response) def set_env_setting(env: dict, - _: schemas.TokenPayload = Depends(verify_token)): + _: User = Depends(get_current_active_superuser)): """ 更新系统环境变量 """ @@ -106,7 +108,7 @@ def get_progress(process_type: str, token: str): @router.get("/setting/{key}", summary="查询系统设置", response_model=schemas.Response) def get_setting(key: str, - _: schemas.TokenPayload = Depends(verify_token)): + _: User = Depends(get_current_active_superuser)): """ 查询系统设置 """ @@ -121,7 +123,7 @@ def get_setting(key: str, @router.post("/setting/{key}", summary="更新系统设置", response_model=schemas.Response) def set_setting(key: str, value: Union[list, dict, bool, int, str] = None, - _: schemas.TokenPayload = Depends(verify_token)): + _: User = Depends(get_current_active_superuser)): """ 更新系统设置 """ @@ -294,7 +296,7 @@ def moduletest(moduleid: str, _: schemas.TokenPayload = Depends(verify_token)): @router.get("/restart", summary="重启系统", response_model=schemas.Response) -def restart_system(_: schemas.TokenPayload = Depends(verify_token)): +def restart_system(_: User = Depends(get_current_active_superuser)): """ 重启系统 """ @@ -306,7 +308,7 @@ def restart_system(_: schemas.TokenPayload = Depends(verify_token)): @router.get("/reload", summary="重新加载模块", response_model=schemas.Response) -def reload_module(_: schemas.TokenPayload = Depends(verify_token)): +def reload_module(_: User = Depends(get_current_active_superuser)): """ 重新加载模块 """ @@ -317,7 +319,7 @@ def reload_module(_: schemas.TokenPayload = Depends(verify_token)): @router.get("/runscheduler", summary="运行服务", response_model=schemas.Response) def execute_command(jobid: str, - _: schemas.TokenPayload = Depends(verify_token)): + _: User = Depends(get_current_active_superuser)): """ 执行命令 """ diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py index d6d6411a..20661149 100644 --- a/app/api/endpoints/user.py +++ b/app/api/endpoints/user.py @@ -87,8 +87,8 @@ def read_current_user( @router.post("/avatar/{user_id}", summary="上传用户头像", response_model=schemas.Response) -async def upload_avatar(user_id: int, db: Session = Depends(get_db), - file: UploadFile = File(...)): +async def upload_avatar(user_id: int, db: Session = Depends(get_db), file: UploadFile = File(...), + _: User = Depends(get_current_active_user)): """ 上传用户头像 """