chore: 更新升级gopsutil/v3到gopsutil/v4

features/state/getstate.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"

features/state/state_linux.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"be.ems/lib/log"
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 type SysInfo struct {

features/state/state_windows.go

@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 type SysInfo struct {

features/state/sysinfo.go

@@ -2,55 +2,10 @@ package state
 
 import (
 	"be.ems/lib/log"
-	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/host"
-	"github.com/shirou/gopsutil/mem"
 )
 
-func getSystemInfo() {
-	// 获取主机信息
-	hostInfo, err := host.Info()
-	if err != nil {
-		log.Errorf("Failed to get host info: %v", err)
-		return
-	}
-	log.Tracef("Host info: %+v", hostInfo)
-
-	// 获取CPU信息
-	cpuInfo, err := cpu.Info()
-	if err != nil {
-		log.Errorf("Failed to get CPU info: %v", err)
-		return
-	}
-	log.Tracef("CPU info: %+v", cpuInfo)
-
-	// 获取内存信息
-	memInfo, err := mem.VirtualMemory()
-	if err != nil {
-		log.Errorf("Failed to get memory info: %v", err)
-		return
-	}
-	log.Tracef("Memory info: %+v", memInfo)
-
-	// 获取磁盘分区信息
-	diskPartitions, err := disk.Partitions(true)
-	if err != nil {
-		log.Errorf("Failed to get disk partitions: %v", err)
-		return
-	}
-	log.Tracef("Disk partitions: %+v", diskPartitions)
-	for _, partition := range diskPartitions {
-		// 获取每个磁盘分区的使用情况
-		usage, err := disk.Usage(partition.Mountpoint)
-		if err != nil {
-			log.Errorf("Failed to get disk usage for %s: %v", partition.Mountpoint, err)
-			continue
-		}
-		log.Tracef("%s usage: %+v", partition.Mountpoint, usage)
-	}
-}
-
 func getCpuNumber() int {
 	// 获取CPU信息
 	cpuInfo, err := cpu.Info()

src/modules/monitor/service/monitor.impl.go

@@ -9,11 +9,11 @@ import (
 	"be.ems/src/modules/monitor/model"
 	"be.ems/src/modules/monitor/repository"
 	systemService "be.ems/src/modules/system/service"
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/load"
+	"github.com/shirou/gopsutil/v4/load"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 
 // 实例化服务层 MonitorImpl 结构体

src/modules/monitor/service/monitor_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/load"
+	"github.com/shirou/gopsutil/v4/load"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 
 func init() {

src/modules/monitor/service/system_info.impl.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"runtime"
@@ -10,11 +11,11 @@ import (
 	"be.ems/src/framework/config"
 	"be.ems/src/framework/utils/parse"
 
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v4/host"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 
 // 实例化服务层 SystemInfoImpl 结构体
@@ -150,9 +151,12 @@ func (s *SystemInfoImpl) NetworkInfo() map[string]string {
 // DiskInfo 磁盘信息
 func (s *SystemInfoImpl) DiskInfo() []map[string]string {
 	disks := make([]map[string]string, 0)
+	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
+	defer cancel()
 
-	partitions, err := disk.Partitions(false)
+	partitions, err := disk.PartitionsWithContext(ctx, false)
-	if err != nil {
+	if err != context.DeadlineExceeded {
 		return disks
 	}
 

src/modules/ws/model/net_connect.go

@@ -1,6 +1,6 @@
 package model
 
-import "github.com/shirou/gopsutil/v3/net"
+import "github.com/shirou/gopsutil/v4/net"
 
 // NetConnectData 网络连接进程数据
 type NetConnectData struct {

src/modules/ws/processor/net_connect.go

@@ -8,8 +8,8 @@ import (
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/ws/model"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 // GetNetConnections 获取网络连接进程

src/modules/ws/processor/ps_process.go

@@ -12,7 +12,7 @@ import (
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/ws/model"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 // GetProcessData 获取进程数据