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 1/3] =?UTF-8?q?fix:=20OMC=E7=BD=91=E5=85=83=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E4=B8=8D=E4=B8=BA?=
 =?UTF-8?q?=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,

From 9c9a0fd3de184f719f1f749dce5988641e126e79 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 25 Dec 2024 18:52:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20omc=E5=AE=89=E8=A3=85out=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=E6=9D=83=E9=99=90=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_element/service/ne_version.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go
index 31aa4ad9..d8730bd0 100644
--- a/src/modules/network_element/service/ne_version.go
+++ b/src/modules/network_element/service/ne_version.go
@@ -265,6 +265,7 @@ func (r *NeVersion) operateCommand(action, neType string, neFilePaths []string)
 		omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " ")))
 
 		// 2s后执行omc相关命令
+		cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/omc_%s.out \n", action))
 		cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/omc_%s.out 2>&1 & \n", strings.Join(omcStrArr, " && "), action))
 		cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr))
 		return okFlagStr, cmdStrArr, nil

From 62ca93d8cce9f80d295653261d6a9b453a440daa Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 25 Dec 2024 18:53:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20omc=E5=AE=89=E8=A3=85out=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=E6=9D=83=E9=99=90=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_element/service/ne_version.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go
index 31aa4ad9..d8730bd0 100644
--- a/src/modules/network_element/service/ne_version.go
+++ b/src/modules/network_element/service/ne_version.go
@@ -265,6 +265,7 @@ func (r *NeVersion) operateCommand(action, neType string, neFilePaths []string)
 		omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " ")))
 
 		// 2s后执行omc相关命令
+		cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/omc_%s.out \n", action))
 		cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/omc_%s.out 2>&1 & \n", strings.Join(omcStrArr, " && "), action))
 		cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr))
 		return okFlagStr, cmdStrArr, nil