修改优化开箱显示图片

plugins/web_ui/api/group.py

@@ -1,4 +1,5 @@
 from pydantic.error_wrappers import ValidationError
+
 from services.log import logger
 from utils.manager import group_manager
 from utils.utils import get_bot
@@ -7,8 +8,8 @@ from ..auth import Depends, User, token_to_user
 from ..config import *
 
 
-@app.get("/webui/group")
-async def _(user: User = Depends(token_to_user)) -> Result:
+@router.get("/group", dependencies=[token_to_user()])
+async def _() -> Result:
     """
     获取群信息
     """
@@ -47,8 +48,8 @@ async def _(user: User = Depends(token_to_user)) -> Result:
     return Result(code=200, data=group_list_result)
 
 
-@app.post("/webui/group")
-async def _(group: GroupResult, user: User = Depends(token_to_user)) -> Result:
+@router.post("/group", dependencies=[token_to_user()])
+async def _(group: GroupResult) -> Result:
     """
     修改群信息
     """
@@ -58,4 +59,4 @@ async def _(group: GroupResult, user: User = Depends(token_to_user)) -> Result:
         group_manager.turn_on_group_bot_status(group_id)
     else:
         group_manager.shutdown_group_bot_status(group_id)
-    return Result(code=200, data="修改成功！")
+    return Result(data="修改成功！")

plugins/web_ui/api/plugins.py

@@ -1,9 +1,14 @@
 from pydantic import ValidationError
+
 from configs.config import Config
 from services.log import logger
-from utils.manager import (plugins2block_manager, plugins2cd_manager,
-                           plugins2count_manager, plugins2settings_manager,
-                           plugins_manager)
+from utils.manager import (
+    plugins2block_manager,
+    plugins2cd_manager,
+    plugins2count_manager,
+    plugins2settings_manager,
+    plugins_manager,
+)
 from utils.utils import get_matchers
 
 from ..auth import Depends, User, token_to_user
@@ -12,8 +17,8 @@ from ..config import *
 plugin_name_list = None
 
 
-@app.get("/webui/plugins")
-def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
+@router.get("/plugins", dependencies=[token_to_user()])
+def _(type_: Optional[str]) -> Result:
     """
     获取插件列表
     :param type_: 类型 normal, superuser, hidden, admin
@@ -101,7 +106,7 @@ def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
     return Result(code=200, data=plugin_list)
 
 
-@app.post("/webui/plugins")
+@router.post("/plugins", dependencies=[token_to_user()])
 def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
     """
     修改插件信息
@@ -126,7 +131,9 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
                 ) or isinstance(c.default_value, float):
                     c.value = float(c.value)
                 elif isinstance(c.value, str) and (
-                    isinstance(Config.get_config(plugin.model, c.key, c.value), (list, tuple))
+                    isinstance(
+                        Config.get_config(plugin.model, c.key, c.value), (list, tuple)
+                    )
                     or isinstance(c.default_value, (list, tuple))
                 ):
                     default_value = Config.get_config(plugin.model, c.key, c.value)
@@ -161,7 +168,9 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
         )
     for key in plugins2settings_manager.keys():
         if isinstance(plugins2settings_manager[key].cmd, str):
-            plugins2settings_manager[key].cmd = plugins2settings_manager[key].cmd.split(',')
+            plugins2settings_manager[key].cmd = plugins2settings_manager[key].cmd.split(
+                ","
+            )
     plugins2settings_manager.save()
     plugins_manager.save()
     return Result(code=200, data="修改成功！")

plugins/web_ui/api/request.py

@@ -6,8 +6,8 @@ from ..auth import Depends, User, token_to_user
 from ..config import *
 
 
-@app.get("/webui/request")
-def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
+@router.get("/webui/request", dependencies=[token_to_user()])
+def _(type_: Optional[str]) -> Result:
     req_data = requests_manager.get_data()
     req_list = []
     if type_ in ["group", "private"]:
@@ -19,8 +19,8 @@ def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
     return Result(code=200, data=req_list)
 
 
-@app.delete("/webui/request")
-def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
+@router.delete("/webui/request", dependencies=[token_to_user()])
+def _(type_: Optional[str]) -> Result:
     """
     清空请求
     :param type_: 类型
@@ -29,8 +29,8 @@ def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
     return Result(code=200)
 
 
-@app.post("/webui/request")
-async def _(parma: RequestParma, user: User = Depends(token_to_user)) -> Result:
+@router.post("/webui/request", dependencies=[token_to_user()])
+async def _(parma: RequestParma) -> Result:
     """
     操作请求
     :param parma: 参数

plugins/web_ui/api/system.py

@@ -4,6 +4,7 @@ from pathlib import Path
 
 import psutil
 import ujson as json
+
 from configs.path_config import (
     DATA_PATH,
     FONT_PATH,
@@ -28,21 +29,21 @@ memory_data = {"data": []}
 disk_data = {"data": []}
 
 
-@app.get("/webui/system")
+@router.get("/system", dependencies=[token_to_user()])
 async def _() -> Result:
     return await get_system_data()
 
 
-@app.get("/webui/system/status")
-async def _(user: User = Depends(token_to_user)) -> Result:
+@router.get("/webui/system/status", dependencies=[token_to_user()])
+async def _() -> Result:
     return Result(
         code=200,
         data=await asyncio.get_event_loop().run_in_executor(None, _get_system_status),
     )
 
 
-@app.get("/webui/system/disk")
-async def _(type_: Optional[str] = None, user: User = Depends(token_to_user)) -> Result:
+@router.get("/webui/system/disk", dependencies=[token_to_user()])
+async def _(type_: Optional[str] = None) -> Result:
     return Result(
         code=200,
         data=await asyncio.get_event_loop().run_in_executor(
@@ -51,8 +52,8 @@ async def _(type_: Optional[str] = None, user: User = Depends(token_to_user)) ->
     )
 
 
-@app.get("/webui/system/statusList")
-async def _(user: User = Depends(token_to_user)) -> Result:
+@router.get("/webui/system/statusList", dependencies=[token_to_user()])
+async def _() -> Result:
     global cpu_data, memory_data, disk_data
     await asyncio.get_event_loop().run_in_executor(None, _get_system_status)
     cpu_rst = cpu_data["data"][-10:] if len(cpu_data["data"]) > 10 else cpu_data["data"]
@@ -74,7 +75,7 @@ async def _(user: User = Depends(token_to_user)) -> Result:
     )
 
 
-async def get_system_data(user: User = Depends(token_to_user)):
+async def get_system_data():
     """
     说明:
         获取系统信息，资源文件大小，网络状态等
@@ -105,7 +106,7 @@ async def get_system_data(user: User = Depends(token_to_user)):
     )
 
 
-def _get_system_status(user: User = Depends(token_to_user)) -> SystemStatus:
+def _get_system_status() -> SystemStatus:
     """
     说明:
         获取系统信息等
@@ -123,7 +124,7 @@ def _get_system_status(user: User = Depends(token_to_user)) -> SystemStatus:
 
 
 def _get_system_disk(
-    type_: Optional[str], user: User = Depends(token_to_user)
+    type_: Optional[str],
 ) -> Union[SystemFolderSize, Dict[str, Union[float, datetime]]]:
     """
     说明: