From 792bcaa711376a7a9570270509c6fe5096a5c45e Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Wed, 16 Oct 2024 12:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96nb=E9=85=8D=E7=BD=AEapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web_ui/api/tabs/dashboard/__init__.py | 15 +++++++++++++++ .../web_ui/api/tabs/main/__init__.py | 1 - .../builtin_plugins/web_ui/api/tabs/main/model.py | 2 -- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py index 2e3d6f21..2375d4bf 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py @@ -1,7 +1,9 @@ from datetime import datetime, timedelta +import nonebot from nonebot import require from fastapi import APIRouter +from nonebot.config import Config from tortoise.functions import Count from tortoise.expressions import RawSQL from fastapi.responses import JSONResponse @@ -19,6 +21,8 @@ require("plugin_store") router = APIRouter(prefix="/dashboard") +driver = nonebot.get_driver() + @router.get( "/get_bot_list", @@ -184,3 +188,14 @@ async def _(query: QueryModel) -> Result[BaseResultModel]: for v in data: v.connect_time = v.connect_time.replace(tzinfo=None).replace(microsecond=0) return Result.ok(BaseResultModel(total=total, data=data)) + + +@router.get( + "/get_nonebot_config", + dependencies=[authentication()], + response_model=Result[Config], + response_class=JSONResponse, + deprecated="获取nb配置", # type: ignore +) +async def _() -> Result[Config]: + return Result.ok(driver.config) diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py index 28e2d759..98361268 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py @@ -108,7 +108,6 @@ async def _(bot_id: str | None = None) -> Result[list[BaseInfo]]: day_call = await Statistics.filter( create_time__gte=now - timedelta(hours=now.hour) ).count() - select_bot.config = driver.config select_bot.day_call = day_call select_bot.connect_count = await BotConnectLog.filter( bot_id=select_bot.self_id diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py b/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py index e6aa4bf3..92834245 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py @@ -46,8 +46,6 @@ class BaseInfo(BaseModel): is_select: bool = False """当前选择""" - config: Config | None - """nb配置""" day_call: int = 0 """今日调用插件次数""" version: str = "unknown"