From c955afd86134b38620a884e9e6540eda398392e4 Mon Sep 17 00:00:00 2001 From: Sun <95302870@qq.com> Date: Fri, 5 Jan 2024 21:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E7=A3=81?= =?UTF-8?q?=E7=9B=98=E6=8C=82=E8=BD=BD=E7=82=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/api/api_v1/system/monitor.go | 11 ++++++++++- service/lib/monitor/monitor.go | 4 ++++ service/router/system/monitor.go | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/service/api/api_v1/system/monitor.go b/service/api/api_v1/system/monitor.go index f830ae8..7a14d2c 100644 --- a/service/api/api_v1/system/monitor.go +++ b/service/api/api_v1/system/monitor.go @@ -70,7 +70,7 @@ func (a *MonitorApi) GetDiskStateByPath(c *gin.Context) { cacheDiskName := global.SystemMonitor_DISK_INFO + req.Path if v, ok := global.SystemMonitor.Get(cacheDiskName); ok { - global.Logger.Debugln("读取缓存的的RAM信息") + global.Logger.Debugln("读取缓存的的DISK信息") apiReturn.SuccessData(c, v) return } @@ -85,3 +85,12 @@ func (a *MonitorApi) GetDiskStateByPath(c *gin.Context) { global.SystemMonitor.Set(cacheDiskName, diskState, cacheSecond*time.Second) apiReturn.SuccessData(c, diskState) } + +func (a *MonitorApi) GetDiskMountpoints(c *gin.Context) { + if list, err := monitor.GetDiskMountpoints(); err != nil { + apiReturn.Error(c, err.Error()) + return + } else { + apiReturn.SuccessData(c, list) + } +} diff --git a/service/lib/monitor/monitor.go b/service/lib/monitor/monitor.go index 9c19435..72c2904 100644 --- a/service/lib/monitor/monitor.go +++ b/service/lib/monitor/monitor.go @@ -97,6 +97,10 @@ func GetDiskInfo() ([]DiskInfo, error) { return disks, nil } +func GetDiskMountpoints() ([]disk.PartitionStat, error) { + return disk.Partitions(true) +} + func GetDiskInfoByPath(path string) (*DiskInfo, error) { diskInfo := DiskInfo{} usage, err := disk.Usage(path) diff --git a/service/router/system/monitor.go b/service/router/system/monitor.go index 43caa02..d4f3ff0 100644 --- a/service/router/system/monitor.go +++ b/service/router/system/monitor.go @@ -9,7 +9,8 @@ import ( func InitMonitorRouter(router *gin.RouterGroup) { api := api_v1.ApiGroupApp.ApiSystem.MonitorApi - // r := router.Group("", middleware.LoginInterceptor) + r := router.Group("", middleware.LoginInterceptor) + r.POST("/system/monitor/getDiskMountpoints", api.GetDiskMountpoints) // 公开模式 rPublic := router.Group("", middleware.PublicModeInterceptor)