add

api/system.py

@@ -7,6 +7,8 @@
 
 from fastapi import APIRouter, Depends
 import git
+import httpx
+from loguru import logger
 from api.users import verify_token
 from core.db import get_mongo_db
 from core.config import *
@@ -19,18 +21,25 @@ router = APIRouter()
 
 @router.get("/system/version")
 async def get_system_version(redis_con=Depends(get_redis_pool), _: dict = Depends(verify_token)):
-    try:
+    server_lversion = ""
-        r = requests.get(f"{UPDATEURL}/get/version?name=server", timeout=5).json()
+    server_msg = ""
-        server_lversion = r["value"]
+    scan_lversion = ""
-        server_msg = r['msg']
+    scan_msg = ""
-        r = requests.get(f"{UPDATEURL}/get/version?name=scan", timeout=5).json()
+
-        scan_lversion = r["value"]
+    async with httpx.AsyncClient() as client:
-        scan_msg = r['msg']
+        try:
-    except:
+            r = await client.get(f"{UPDATEURL}/get/version?name=server", timeout=5)
-        server_lversion = ""
+            r_json = r.json()
-        server_msg = ""
+            server_lversion = r_json["value"]
-        scan_lversion = ""
+            server_msg = r_json['msg']
-        scan_msg = ""
+
+            r = await client.get(f"{UPDATEURL}/get/version?name=scan", timeout=5)
+            r_json = r.json()
+            scan_lversion = r_json["value"]
+            scan_msg = r_json['msg']
+        except Exception as e:
+            # 这里可以添加一些日志记录错误信息
+            logger.error(str(e))
 
     result_list = [{"name": "ScopeSentry-Server", "cversion": VERSION, "lversion": server_lversion, "msg": server_msg}]
 

version.json

@@ -1 +1 @@
-{"server":"1.2", "scan": "1,2"}
+{"server":"1.2", "scan": "1.2"}