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
}