From ca3f1b7738da90c316656f74af5c16a16fda8e7e Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 9 May 2025 20:04:32 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=202.2505.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                      |  9 +++++++++
 src/modules/network_element/service/ne_version.go | 13 ++++++++++++-
 src/modules/trace/service/trace_task_udp_data.go  |  3 ++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ac4a43..c89ea621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # 版本发布日志
 
+## 2.2505.1-20250509
+
+- 修复 获取OMC状态版本号
+- 新增 根据网元显示特有菜单信息添加
+- 新增 网元授权添加用户容量列
+- 新增 网元状态记录内存/CPU/磁盘列表
+- 优化 CDR数据导出添加网元名称列
+- 新增 告警清除自定义的AlarmCode，告警LicenseCode/告警CPU内存磁盘
+
 ## 2.2504.4-20250430
 
 - 修复 捕获数据时跳过延迟超过1毫秒的包
diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go
index 9bf2937f..db49214a 100644
--- a/src/modules/network_element/service/ne_version.go
+++ b/src/modules/network_element/service/ne_version.go
@@ -648,7 +648,18 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string
 					}
 
 					// 命令终止符后继续执行命令
-					suffix := strings.HasSuffix(outputStr, "~]# ") || strings.LastIndex(outputStr, "~# ") != -1 || strings.HasSuffix(outputStr, "~$ ")
+					// "~]# ":麒麟, "~]$ ":欧拉, "~# ":NXP, "~$ ":Ubuntu
+					suffixStr := []string{"~]# ", "~]$ ", "~# ", "~$ "}
+					suffix := false
+					for _, v := range suffixStr {
+						if strings.HasSuffix(outputStr, v) {
+							suffix = true
+							break
+						}
+					}
+					if !suffix {
+						suffix = strings.LastIndex(outputStr, "~# ") != -1
+					}
 					if len(cmdStrArr) > 0 && suffix {
 						if firstRead {
 							firstRead = false
diff --git a/src/modules/trace/service/trace_task_udp_data.go b/src/modules/trace/service/trace_task_udp_data.go
index 2722566c..e4390bd5 100644
--- a/src/modules/trace/service/trace_task_udp_data.go
+++ b/src/modules/trace/service/trace_task_udp_data.go
@@ -27,7 +27,7 @@ func traceHandler(data []byte) (*TraceMsgToOamTraceData, error) {
 	if err != nil {
 		return decodeData, err
 	}
-	fmt.Printf("TraceHandler get oamData: %s,%+v\n, payload=len(%d,%d)", decodeData.TimestampStr, decodeData.NfTraceMsg, decodeData.TracePayloadLen, len(decodeData.TracePayload))
+	// fmt.Printf("TraceHandler get oamData: %s,%+v\n, payload=len(%d,%d)", decodeData.TimestampStr, decodeData.NfTraceMsg, decodeData.TracePayloadLen, len(decodeData.TracePayload))
 	// Return parsed message and payload
 	if len(decodeData.TracePayload) != int(decodeData.TracePayloadLen) {
 		return decodeData, fmt.Errorf("trace payload is bad, len=%d, shall be:%d", len(decodeData.TracePayload), int(decodeData.TracePayloadLen))
@@ -106,6 +106,7 @@ func decodeTraceData(data []byte) (*TraceMsgToOamTraceData, error) {
 		return nil, err
 	}
 	msg.SrcIpStr = net.IP(srcIp).String()
+
 	// 7. Parse DstIp (4 bytes IPv4)
 	dstIp := make([]byte, 4)
 	if flag&0x20 != 0 {