From c85e77c8011a9104d4307e78ddcd23c20f1c2c77 Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Fri, 20 Sep 2024 00:25:40 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20web=20api=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_bison/admin_page/api.py | 12 ++++++------ nonebot_bison/admin_page/types.py | 12 ++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nonebot_bison/admin_page/api.py b/nonebot_bison/admin_page/api.py index 0ff0df4..b907813 100644 --- a/nonebot_bison/admin_page/api.py +++ b/nonebot_bison/admin_page/api.py @@ -202,7 +202,7 @@ async def update_weigth_config(platformName: str, target: str, weight_config: We @router.get("/cookie", dependencies=[Depends(check_is_superuser)]) -async def get_cookie() -> list[Cookie]: +async def get_cookie(site_name: str = None, target: str = None) -> list[Cookie]: pass @@ -211,21 +211,21 @@ async def add_cookie(site_name: str, content: str) -> StatusResp: pass -@router.delete("/cookie", dependencies=[Depends(check_is_superuser)]) -async def del_cookie(site_name: str, content: str) -> StatusResp: +@router.delete("/cookie/{cookie_id}", dependencies=[Depends(check_is_superuser)]) +async def del_cookie(cookie_id: int) -> StatusResp: pass @router.get("/cookie_target", dependencies=[Depends(check_is_superuser)]) -async def get_cookie_target() -> list[CookieTarget]: +async def get_cookie_target(site_name: str = None, target: str = None, cookie_id: int = None) -> list[CookieTarget]: pass @router.post("/cookie_target", dependencies=[Depends(check_is_superuser)]) -async def add_cookie_target(site_name: str, target: str) -> StatusResp: +async def add_cookie_target(site_name: str, target: str, cookie_id: int) -> StatusResp: pass @router.delete("/cookie_target", dependencies=[Depends(check_is_superuser)]) -async def del_cookie_target(site_name: str, target: str) -> StatusResp: +async def del_cookie_target(site_name: str, target: str, cookie_id: int) -> StatusResp: pass diff --git a/nonebot_bison/admin_page/types.py b/nonebot_bison/admin_page/types.py index ccbbd8e..3c7ffd8 100644 --- a/nonebot_bison/admin_page/types.py +++ b/nonebot_bison/admin_page/types.py @@ -71,11 +71,9 @@ class Target(BaseModel): target_name: str target: str - class Config: - orm_mode = True - class Cookie(BaseModel): + id: int site_name: str friendly_name: str last_usage: datetime @@ -85,13 +83,7 @@ class Cookie(BaseModel): is_anonymous: bool tags: dict[str, Any] - class Config: - orm_mode = True - class CookieTarget(BaseModel): target: Target - cookie: Cookie - - class Config: - orm_mode = True + cookie_id: int