From fa31efaf2debc820ca4ac2bd1c67801eda510465 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Tue, 24 Dec 2024 17:34:17 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BC=98=E5=8C=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95API=E5=8F=8A=E6=A8=A1=E5=9E=8B=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8DWebUi=E6=8F=92=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8Api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/template/check/main.css                          | 2 +-
 zhenxun/builtin_plugins/web_ui/api/menu/__init__.py        | 6 +++---
 zhenxun/builtin_plugins/web_ui/api/menu/data_source.py     | 4 ++--
 zhenxun/builtin_plugins/web_ui/api/menu/model.py           | 7 +++++++
 .../web_ui/api/tabs/plugin_manage/data_source.py           | 3 +--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/template/check/main.css b/resources/template/check/main.css
index f6790712..645efa15 100644
--- a/resources/template/check/main.css
+++ b/resources/template/check/main.css
@@ -44,7 +44,7 @@ body {
 }
 
 .main {
-    height: 448px;
+    height: 444px;
     width: 335px;
     padding: 0 30px;
     position: relative;
diff --git a/zhenxun/builtin_plugins/web_ui/api/menu/__init__.py b/zhenxun/builtin_plugins/web_ui/api/menu/__init__.py
index 4d795145..aca8baef 100644
--- a/zhenxun/builtin_plugins/web_ui/api/menu/__init__.py
+++ b/zhenxun/builtin_plugins/web_ui/api/menu/__init__.py
@@ -6,7 +6,7 @@ from zhenxun.services.log import logger
 from ...base_model import Result
 from ...utils import authentication
 from .data_source import menu_manage
-from .model import MenuItem
+from .model import MenuData
 
 router = APIRouter(prefix="/menu")
 
@@ -14,11 +14,11 @@ router = APIRouter(prefix="/menu")
 @router.get(
     "/get_menus",
     dependencies=[authentication()],
-    response_model=Result[list[MenuItem]],
+    response_model=Result[list[MenuData]],
     response_class=JSONResponse,
     deprecated="获取菜单列表",  # type: ignore
 )
-async def _() -> Result[list[MenuItem]]:
+async def _() -> Result[list[MenuData]]:
     try:
         return Result.ok(menu_manage.get_menus(), "拿到菜单了哦！")
     except Exception as e:
diff --git a/zhenxun/builtin_plugins/web_ui/api/menu/data_source.py b/zhenxun/builtin_plugins/web_ui/api/menu/data_source.py
index e0dcb49e..1f530a3c 100644
--- a/zhenxun/builtin_plugins/web_ui/api/menu/data_source.py
+++ b/zhenxun/builtin_plugins/web_ui/api/menu/data_source.py
@@ -3,7 +3,7 @@ import ujson as json
 from zhenxun.configs.path_config import DATA_PATH
 from zhenxun.services.log import logger
 
-from .model import MenuItem
+from .model import MenuData, MenuItem
 
 
 class MenuManage:
@@ -52,7 +52,7 @@ class MenuManage:
             self.save()
 
     def get_menus(self):
-        return self.menu
+        return MenuData(menus=self.menu)
 
     def save(self):
         self.file.parent.mkdir(parents=True, exist_ok=True)
diff --git a/zhenxun/builtin_plugins/web_ui/api/menu/model.py b/zhenxun/builtin_plugins/web_ui/api/menu/model.py
index c9d7193f..abd73a69 100644
--- a/zhenxun/builtin_plugins/web_ui/api/menu/model.py
+++ b/zhenxun/builtin_plugins/web_ui/api/menu/model.py
@@ -12,3 +12,10 @@ class MenuItem(BaseModel):
     """图标"""
     default: bool = False
     """默认选中"""
+
+
+class MenuData(BaseModel):
+    bot_type: str = "zhenxun"
+    """bot类型"""
+    menus: list[MenuItem]
+    """菜单列表"""
diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/data_source.py b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/data_source.py
index f6c5e86c..ee0992d6 100644
--- a/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/data_source.py
+++ b/zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/data_source.py
@@ -5,11 +5,10 @@ from fastapi import Query
 
 from zhenxun.configs.config import Config
 from zhenxun.configs.utils import ConfigGroup
-from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.plugin_info import PluginInfo as DbPluginInfo
 from zhenxun.utils.enum import BlockType, PluginType
 
-from .model import PluginConfig, PluginDetail, UpdatePlugin
+from .model import PluginConfig, PluginDetail, PluginInfo, UpdatePlugin
 
 
 class ApiDataSource: