From bd363a576b9459b25ae7cede66ebd46c4b01c5b7 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Wed, 11 Dec 2024 17:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dwebui-api?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builtin_plugins/web_ui/api/tabs/dashboard/__init__.py | 8 ++++++-- .../web_ui/api/tabs/dashboard/data_source.py | 2 +- .../builtin_plugins/web_ui/api/tabs/database/__init__.py | 8 ++++++-- zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py | 6 +++--- .../builtin_plugins/web_ui/api/tabs/manage/__init__.py | 6 +++--- zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py | 2 +- .../web_ui/api/tabs/plugin_manage/__init__.py | 4 ++-- .../web_ui/api/tabs/plugin_manage/store.py | 4 ++-- .../builtin_plugins/web_ui/api/tabs/system/__init__.py | 4 ++-- zhenxun/builtin_plugins/web_ui/auth/__init__.py | 4 ++-- zhenxun/builtin_plugins/web_ui/public/__init__.py | 2 +- zhenxun/builtin_plugins/web_ui/public/data_source.py | 6 +++++- 12 files changed, 34 insertions(+), 22 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 a17c6a8f..22c3835d 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py @@ -8,8 +8,12 @@ from nonebot.config import Config from tortoise.expressions import RawSQL from tortoise.functions import Count -from builtin_plugins.web_ui.base_model import BaseResultModel, QueryModel, Result -from builtin_plugins.web_ui.utils import authentication +from zhenxun.builtin_plugins.web_ui.base_model import ( + BaseResultModel, + QueryModel, + Result, +) +from zhenxun.builtin_plugins.web_ui.utils import authentication from zhenxun.models.bot_connect_log import BotConnectLog from zhenxun.models.chat_history import ChatHistory from zhenxun.models.statistics import Statistics diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py index d1b2ed1f..8e7b0cdf 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py @@ -5,7 +5,7 @@ import nonebot from nonebot.adapters import Bot from nonebot.drivers import Driver -from builtin_plugins.web_ui.api.tabs.main.data_source import bot_live +from zhenxun.builtin_plugins.web_ui.api.tabs.main.data_source import bot_live from zhenxun.models.chat_history import ChatHistory from zhenxun.models.statistics import Statistics from zhenxun.utils.platform import PlatformUtils diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py index 48cba883..beb7e486 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py @@ -5,8 +5,12 @@ from nonebot.drivers import Driver from tortoise import Tortoise from tortoise.exceptions import OperationalError -from builtin_plugins.web_ui.base_model import BaseResultModel, QueryModel, Result -from builtin_plugins.web_ui.utils import authentication +from zhenxun.builtin_plugins.web_ui.base_model import ( + BaseResultModel, + QueryModel, + Result, +) +from zhenxun.builtin_plugins.web_ui.utils import authentication from zhenxun.configs.config import BotConfig from zhenxun.models.plugin_info import PluginInfo from zhenxun.models.task_info import TaskInfo 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 4375fa8f..47ee51da 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py @@ -12,9 +12,9 @@ from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState from tortoise.functions import Count from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK -from builtin_plugins.web_ui.base_model import Result -from builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL, QueryDateType -from builtin_plugins.web_ui.utils import authentication, get_system_status +from zhenxun.builtin_plugins.web_ui.base_model import Result +from zhenxun.builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL, QueryDateType +from zhenxun.builtin_plugins.web_ui.utils import authentication, get_system_status from zhenxun.models.bot_connect_log import BotConnectLog from zhenxun.models.chat_history import ChatHistory from zhenxun.models.group_console import GroupConsole diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py index c59a60be..feaa75a3 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py @@ -4,9 +4,9 @@ import nonebot from nonebot.adapters.onebot.v11 import ActionFailed from tortoise.functions import Count -from builtin_plugins.web_ui.base_model import Result -from builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL -from builtin_plugins.web_ui.utils import authentication +from zhenxun.builtin_plugins.web_ui.base_model import Result +from zhenxun.builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL +from zhenxun.builtin_plugins.web_ui.utils import authentication from zhenxun.configs.config import BotConfig from zhenxun.models.ban_console import BanConsole from zhenxun.models.chat_history import ChatHistory diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py b/zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py index d9b54b82..a96ef9ad 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py @@ -6,7 +6,7 @@ from nonebot_plugin_alconna import At, Hyper, Image, Text, UniMsg from nonebot_plugin_session import EventSession from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState -from builtin_plugins.web_ui.config import AVA_URL +from zhenxun.builtin_plugins.web_ui.config import AVA_URL from zhenxun.models.group_member_info import GroupInfoUser from zhenxun.utils.depends import UserName diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py index 0e59e49e..a9ef17b6 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py @@ -4,8 +4,8 @@ import cattrs from fastapi import APIRouter, Query from fastapi.responses import JSONResponse -from builtin_plugins.web_ui.base_model import Result -from builtin_plugins.web_ui.utils import authentication +from zhenxun.builtin_plugins.web_ui.base_model import Result +from zhenxun.builtin_plugins.web_ui.utils import authentication from zhenxun.configs.config import Config from zhenxun.models.plugin_info import PluginInfo as DbPluginInfo from zhenxun.services.log import logger diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py index 2ed3c03c..518f8266 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py @@ -2,8 +2,8 @@ from fastapi import APIRouter from fastapi.responses import JSONResponse from nonebot import require -from builtin_plugins.web_ui.base_model import Result -from builtin_plugins.web_ui.utils import authentication +from zhenxun.builtin_plugins.web_ui.base_model import Result +from zhenxun.builtin_plugins.web_ui.utils import authentication from zhenxun.models.plugin_info import PluginInfo from .model import PluginIr diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py index 6d6044e9..b1e98216 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py @@ -6,8 +6,8 @@ import aiofiles from fastapi import APIRouter from fastapi.responses import JSONResponse -from builtin_plugins.web_ui.base_model import Result, SystemFolderSize -from builtin_plugins.web_ui.utils import authentication, get_system_disk +from zhenxun.builtin_plugins.web_ui.base_model import Result, SystemFolderSize +from zhenxun.builtin_plugins.web_ui.utils import authentication, get_system_disk from zhenxun.utils._build_image import BuildImage from .model import AddFile, DeleteFile, DirFile, RenameFile, SaveFile diff --git a/zhenxun/builtin_plugins/web_ui/auth/__init__.py b/zhenxun/builtin_plugins/web_ui/auth/__init__.py index f2080f14..02f4bc0a 100644 --- a/zhenxun/builtin_plugins/web_ui/auth/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/auth/__init__.py @@ -6,8 +6,8 @@ from fastapi import APIRouter, Depends from fastapi.security import OAuth2PasswordRequestForm import nonebot -from builtin_plugins.web_ui.base_model import Result -from builtin_plugins.web_ui.utils import ( +from zhenxun.builtin_plugins.web_ui.base_model import Result +from zhenxun.builtin_plugins.web_ui.utils import ( ACCESS_TOKEN_EXPIRE_MINUTES, create_token, get_user, diff --git a/zhenxun/builtin_plugins/web_ui/public/__init__.py b/zhenxun/builtin_plugins/web_ui/public/__init__.py index ff260282..2b1dde5f 100644 --- a/zhenxun/builtin_plugins/web_ui/public/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/public/__init__.py @@ -2,7 +2,7 @@ from fastapi import APIRouter, FastAPI from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles -from builtin_plugins.web_ui.config import PUBLIC_PATH +from zhenxun.builtin_plugins.web_ui.config import PUBLIC_PATH from zhenxun.services.log import logger from .data_source import COMMAND_NAME, update_webui_assets diff --git a/zhenxun/builtin_plugins/web_ui/public/data_source.py b/zhenxun/builtin_plugins/web_ui/public/data_source.py index 18f41cc0..e6eafb45 100644 --- a/zhenxun/builtin_plugins/web_ui/public/data_source.py +++ b/zhenxun/builtin_plugins/web_ui/public/data_source.py @@ -4,7 +4,11 @@ import zipfile from nonebot.utils import run_sync -from builtin_plugins.web_ui.config import PUBLIC_PATH, TMP_PATH, WEBUI_DIST_GITHUB_URL +from zhenxun.builtin_plugins.web_ui.config import ( + PUBLIC_PATH, + TMP_PATH, + WEBUI_DIST_GITHUB_URL, +) from zhenxun.services.log import logger from zhenxun.utils.github_utils import GithubUtils from zhenxun.utils.http_utils import AsyncHttpx