update v0.1.5.8

plugins/web_ui/api/group.py

@@ -58,4 +58,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)
+    return Result(code=200, data="修改成功！")

plugins/web_ui/api/plugins.py

@@ -121,7 +121,17 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
                     isinstance(Config.get_config(plugin.model, c.key, c.value), list)
                     or isinstance(c.default_value, list)
                 ):
+                    default_value = Config.get_config(plugin.model, c.key, c.value)
                     c.value = c.value.split(",")
+                    if default_value and isinstance(default_value[0], int):
+                        c.value = [int(x) for x in c.value]
+                    elif default_value and isinstance(default_value[0], float):
+                        c.value = [float(x) for x in c.value]
+                    elif default_value and isinstance(default_value[0], bool):
+                        temp = []
+                        for x in c.value:
+                            temp.append(x.lower() == "true")
+                        c.value = temp
                 Config.set_config(plugin.model, c.key, c.value)
             Config.save(None, True)
         else:
@@ -139,4 +149,4 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
             code=500,
             data=f"WEB_UI POST /webui/plugins model：{plugin.model} 发生错误 {type(e)}：{e}",
         )
-    return Result(code=200)
+    return Result(code=200, data="修改成功！")

plugins/web_ui/api/request.py

@@ -34,7 +34,7 @@ async def _(parma: RequestParma, user: User = Depends(token_to_user)) -> Result:
     操作请求
     :param parma: 参数
     """
-    result = "ok"
+    result = "操作成功！"
     flag = 3
     if bot := get_bot():
         if parma.handle == "approve":

plugins/web_ui/api/system.py

@@ -29,7 +29,7 @@ disk_data = {"data": []}
 
 
 @app.get("/webui/system")
-async def _(user: User = Depends(token_to_user)) -> Result:
+async def _() -> Result:
     return await get_system_data()
 
 
@@ -74,7 +74,7 @@ async def _(user: User = Depends(token_to_user)) -> Result:
     )
 
 
-async def get_system_data():
+async def get_system_data(user: User = Depends(token_to_user)):
     """
     说明：
         获取系统信息，资源文件大小，网络状态等
@@ -92,7 +92,7 @@ async def get_system_data():
         logger.warning(f"访问Google失败... {type(e)}: {e}")
         google = 404
     network = SystemNetwork(baidu=baidu, google=google)
-    disk = await asyncio.get_event_loop().run_in_executor(None, _get_system_disk)
+    disk = await asyncio.get_event_loop().run_in_executor(None, _get_system_disk, None)
     status = await asyncio.get_event_loop().run_in_executor(None, _get_system_status)
     return Result(
         code=200,
@@ -105,7 +105,7 @@ async def get_system_data():
     )
 
 
-def _get_system_status() -> SystemStatus:
+def _get_system_status(user: User = Depends(token_to_user)) -> SystemStatus:
     """
     说明：
         获取系统信息等
@@ -123,7 +123,7 @@ def _get_system_status() -> SystemStatus:
 
 
 def _get_system_disk(
-    type_: Optional[str],
+    type_: Optional[str], user: User = Depends(token_to_user)
 ) -> Union[SystemFolderSize, Dict[str, Union[float, datetime]]]:
     """
     说明：

plugins/web_ui/auth/__init__.py

@@ -1,4 +1,6 @@
+import json
 from datetime import datetime, timedelta
+from configs.path_config import DATA_PATH
 from typing import Optional
 from starlette import status
 from fastapi import Depends, HTTPException
@@ -8,6 +10,8 @@ from configs.config import Config
 from jose import JWTError, jwt
 import nonebot
 
+from ..config import Result
+
 app = nonebot.get_app()
 
 
@@ -18,6 +22,13 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 30
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="webui/login")
 
 
+token_file = DATA_PATH / "web_ui" / "token.json"
+token_file.parent.mkdir(parents=True, exist_ok=True)
+token_data = {"token": []}
+if token_file.exists():
+    token_data = json.load(open(token_file, 'r', encoding='utf8'))
+
+
 class User(BaseModel):
     username: str
     password: str
@@ -62,6 +73,9 @@ async def login_get_token(form_data: OAuth2PasswordRequestForm = Depends()):
     if not user or user.password != form_data.password:
         raise form_exception
     access_token = create_token(user=user, expires_delta=timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
+    token_data["token"].append(access_token)
+    if len(token_data["token"]) > 3:
+        token_data["token"] = token_data["token"][1:]
     return {"access_token": access_token, "token_type": "bearer"}
 
 
@@ -72,16 +86,18 @@ credentials_exception = HTTPException(
 )
 
 
+@app.post("/webui/auth")
 def token_to_user(token: str = Depends(oauth2_scheme)):
-    try:
-        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-        username, expire = payload.get("sub"), payload.get("exp")
-        user = get_user(username)
-        if user is None:
-            raise JWTError
-    except JWTError:
-        raise credentials_exception
-    return user
+    if token not in token_data["token"]:
+        try:
+            payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+            username, expire = payload.get("sub"), payload.get("exp")
+            user = get_user(username)
+            if user is None:
+                raise JWTError
+        except JWTError:
+            return Result(code=401)
+    return Result(code=200, data="ok")
 
 
 if __name__ == '__main__':

plugins/web_ui/config.py

@@ -7,7 +7,7 @@ import nonebot
 
 app = nonebot.get_app()
 
-origins = ["http://localhost"]
+origins = ["*"]
 
 app.add_middleware(
     CORSMiddleware,