From 8f3b68f5333130d3120287e688fe794ff3c48381 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 25 Dec 2024 18:04:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20OMC=E7=BD=91=E5=85=83=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E4=B8=8D=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/state/getstate.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/features/state/getstate.go b/features/state/getstate.go index 2aa21d15..8ac2d6f6 100644 --- a/features/state/getstate.go +++ b/features/state/getstate.go @@ -1031,6 +1031,19 @@ func GetEMSState(ip string) *SysState { } } + CapabilityInt := config.GetYamlConfig().OMC.Capability + if CapabilityInt == 0 { + CapabilityInt = 5000 + } + snStr := config.GetYamlConfig().OMC.Sn + if snStr == "" { + snStr = "-" + } + expiryDateStr := config.GetYamlConfig().OMC.ExpiryDate + if expiryDateStr == "" { + expiryDateStr = "-" + } + hostName, _ := os.Hostname() dbInfo, _ := dborm.XormGetMySQLVersion() emsState := &SysState{ @@ -1040,9 +1053,9 @@ func GetEMSState(ip string) *SysState { IpAddr: ipAddrs, Port: config.GetYamlConfig().Rest[0].Port, Version: global.Version, - Capability: config.GetYamlConfig().OMC.Capability, - SerialNum: config.GetYamlConfig().OMC.Sn, - ExpiryDate: config.GetYamlConfig().OMC.ExpiryDate, + Capability: CapabilityInt, + SerialNum: snStr, + ExpiryDate: expiryDateStr, HardwareInfo: HardwareInfo{CPUs: getCpuNumber(), Memory: getTotalMemory()}, CpuUsage: *cpuUsage, MemUsage: *memUsage,