simonzhangsz/omc_api
1
0
Fork 0
Code Activity

merge: 合并代码20241018

Browse Source
This commit is contained in:
TsMask
2024-10-18 17:26:59 +08:00
parent 49860c2f28
commit 17f57175c7
289 changed files with 21476 additions and 12863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
features/state/getstate.go
View File

@@ -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"
@@ -506,11 +506,11 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
if systemState.HostName != "" {
hostName = systemState.HostName
}
osInfo := "Linux 5gc 4.15.0-29-generic #31-Ubuntu SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
osInfo := "Linux 5gc 4.15.0-29-generic SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
if systemState.OsInfo != "" {
osInfo = systemState.OsInfo
}
dbInfo := "adb v1.0.1"
dbInfo := "db v1.4.15"
if systemState.OsInfo != "" {
dbInfo = systemState.DbInfo
}
@@ -652,11 +652,11 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
if systemState.HostName != "" {
hostName = systemState.HostName
}
osInfo := "Linux 5gc 4.15.0-29-generic #31-Ubuntu SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
osInfo := "Linux 5gc 4.15.0-29-generic SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
if systemState.OsInfo != "" {
osInfo = systemState.OsInfo
}
dbInfo := "adb v1.0.1"
dbInfo := "db v1.4.15"
if systemState.OsInfo != "" {
dbInfo = systemState.DbInfo
}

8
features/state/state_linux.go
View File

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

8
features/state/state_windows.go
View File

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

49
features/state/sysinfo.go
View File

@@ -2,55 +2,10 @@ package state
import (
"be.ems/lib/log"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/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()