diff --git a/app/api/endpoints/dashboard.py b/app/api/endpoints/dashboard.py index 8b883ac9..f8782698 100644 --- a/app/api/endpoints/dashboard.py +++ b/app/api/endpoints/dashboard.py @@ -134,7 +134,7 @@ def cpu(_: schemas.TokenPayload = Depends(verify_token)) -> Any: return SystemUtils.cpu_usage() -@router.get("/memory", summary="获取当前内存使用率", response_model=int) +@router.get("/memory", summary="获取当前内存使用量和使用率", response_model=List[int]) def memory(_: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 获取当前内存使用率 diff --git a/app/utils/system.py b/app/utils/system.py index 6bcc3086..a2092450 100644 --- a/app/utils/system.py +++ b/app/utils/system.py @@ -287,8 +287,8 @@ class SystemUtils: return psutil.cpu_percent() @staticmethod - def memory_usage(): + def memory_usage() -> List[int]: """ - 获取内存使用大小 + 获取内存使用量和使用率 """ - return psutil.virtual_memory().used + return [psutil.virtual_memory().used, int(psutil.virtual_memory().percent)]