diff --git a/util/device/device.go b/util/device/device.go index 3ef27a7..4c9f021 100644 --- a/util/device/device.go +++ b/util/device/device.go @@ -3,6 +3,7 @@ package device import ( "fmt" "runtime" + "strings" "time" "github.com/shirou/gopsutil/v3/cpu" @@ -51,28 +52,30 @@ func GetMemory() (memInfo MemInfo) { func GetDisk() (diskInfos []DiskInfo) { stats, _ := disk.Partitions(true) - if runtime.GOOS != "windows" { - usage, _ := disk.Usage("/") - diskInfos = append(diskInfos, DiskInfo{ - DiskName: "/", - Total: usage.Total, - Used: usage.Used, - Free: usage.Free, - Percent: usage.UsedPercent, - }) - return - } - for _, stat := range stats { usage, _ := disk.Usage(stat.Mountpoint) - if usage != nil { + if usage == nil { + continue + } + if strings.ToLower(runtime.GOOS) == "windows" { diskInfos = append(diskInfos, DiskInfo{ - DiskName: stat.Mountpoint, + DiskName: usage.Path, Total: usage.Total, Used: usage.Used, Free: usage.Free, Percent: usage.UsedPercent, }) + } else { + fstype := strings.ToLower(usage.Fstype) + if strings.Contains(fstype, "ext") || strings.Contains(fstype, "ntfs") || strings.Contains(fstype, "fat") { + diskInfos = append(diskInfos, DiskInfo{ + DiskName: usage.Path, + Total: usage.Total, + Used: usage.Used, + Free: usage.Free, + Percent: usage.UsedPercent, + }) + } } } return diff --git a/web/pages/admin/dashboard.vue b/web/pages/admin/dashboard.vue index 35b20a0..b3c536b 100644 --- a/web/pages/admin/dashboard.vue +++ b/web/pages/admin/dashboard.vue @@ -481,7 +481,7 @@ export default { }, { label: 'Mhz', - value: res.data.cpu.mhz, + value: (res.data.cpu.mhz || 0).toFixed(0), }, { label: '',