fix: align admin behavior and Kratos integrations

internal/server/handler/system_config.go

@@ -2,7 +2,6 @@ package handler
 
 import (
 	"runtime"
-	"syscall"
 	"time"
 
 	"kra/internal/server/httpx"
@@ -12,6 +11,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/shirou/gopsutil/v4/cpu"
+	"github.com/shirou/gopsutil/v4/disk"
 	"github.com/shirou/gopsutil/v4/mem"
 )
 
@@ -78,24 +78,31 @@ func (h *SystemConfig) Reload(c *gin.Context) {
 }
 
 func (h *SystemConfig) ServerInfo(c *gin.Context) {
-	cpuPercent, _ := cpu.Percent(200*time.Millisecond, false)
-	memory, _ := mem.VirtualMemory()
-	disk := []gin.H{}
-	var stat syscall.Statfs_t
-	if syscall.Statfs(".", &stat) == nil {
-		total := uint64(stat.Blocks) * uint64(stat.Bsize)
-		free := uint64(stat.Bavail) * uint64(stat.Bsize)
-		used := total - free
-		percent := 0
-		if total > 0 {
-			percent = int(used * 100 / total)
+	physicalCores, err := cpu.Counts(false)
+	if err != nil {
+		httpx.Fail(c, "获取失败")
+		return
+	}
+	cpuPercent, err := cpu.Percent(200*time.Millisecond, true)
+	if err != nil {
+		httpx.Fail(c, "获取失败")
+		return
+	}
+	memory, err := mem.VirtualMemory()
+	if err != nil {
+		httpx.Fail(c, "获取失败")
+		return
+	}
+	diskInfo := make([]gin.H, 0)
+	for _, mountPoint := range h.system.DiskMountPoints() {
+		usage, usageErr := disk.Usage(mountPoint)
+		if usageErr != nil {
+			httpx.Fail(c, "获取失败")
+			return
 		}
-		disk = append(disk, gin.H{"mountPoint": ".", "usedMb": used / 1024 / 1024, "usedGb": used / 1024 / 1024 / 1024, "totalMb": total / 1024 / 1024, "totalGb": total / 1024 / 1024 / 1024, "usedPercent": percent})
+		diskInfo = append(diskInfo, gin.H{"mountPoint": mountPoint, "usedMb": usage.Used / 1024 / 1024, "usedGb": usage.Used / 1024 / 1024 / 1024, "totalMb": usage.Total / 1024 / 1024, "totalGb": usage.Total / 1024 / 1024 / 1024, "usedPercent": int(usage.UsedPercent)})
 	}
-	usedMB, totalMB, memoryPercent := uint64(0), uint64(0), float64(0)
-	if memory != nil {
-		usedMB, totalMB, memoryPercent = memory.Used/1024/1024, memory.Total/1024/1024, memory.UsedPercent
-	}
-	server := gin.H{"os": gin.H{"goos": runtime.GOOS, "numCpu": runtime.NumCPU(), "compiler": runtime.Compiler, "goVersion": runtime.Version(), "numGoroutine": runtime.NumGoroutine()}, "cpu": gin.H{"cpus": cpuPercent, "cores": runtime.NumCPU()}, "ram": gin.H{"usedMb": usedMB, "totalMb": totalMB, "usedPercent": memoryPercent}, "disk": disk}
+	usedMB, totalMB, memoryPercent := memory.Used/1024/1024, memory.Total/1024/1024, int(memory.UsedPercent)
+	server := gin.H{"os": gin.H{"goos": runtime.GOOS, "numCpu": runtime.NumCPU(), "compiler": runtime.Compiler, "goVersion": runtime.Version(), "numGoroutine": runtime.NumGoroutine()}, "cpu": gin.H{"cpus": cpuPercent, "cores": physicalCores}, "ram": gin.H{"usedMb": usedMB, "totalMb": totalMB, "usedPercent": memoryPercent}, "disk": diskInfo}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{"server": server}, "获取成功")
 }