From 27da69050dcbc92174fdeb07a53b74fccd61cc93 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 4 Mar 2025 18:12:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=AE=89=E8=A3=85Para?=
 =?UTF-8?q?5G=E5=8F=82=E6=95=B0=E8=AF=BB=E5=8F=96nil=E5=92=8C=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E7=BB=88=E6=AD=A2=E7=AC=A6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_element/service/ne_info.go    | 2 +-
 src/modules/network_element/service/ne_version.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go
index 13437225..9fd015e3 100644
--- a/src/modules/network_element/service/ne_info.go
+++ b/src/modules/network_element/service/ne_info.go
@@ -821,7 +821,7 @@ func (r NeInfo) NeConfPara5GRead() (map[string]any, error) {
 }
 
 // NeConfPara5GWirte 网元公共配置文件写入 content内容 syncNE同步到网元端NeType@NeId
-func (r NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) error {
+func (r *NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) error {
 	// 网管本地路径
 	omcFilePath := "/usr/local/etc/omc/para5G.yaml"
 	if runtime.GOOS == "windows" {
diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go
index 6ce1ba13..7ba23642 100644
--- a/src/modules/network_element/service/ne_version.go
+++ b/src/modules/network_element/service/ne_version.go
@@ -648,7 +648,7 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string
 					}
 
 					// 命令终止符后继续执行命令
-					suffix := strings.HasSuffix(outputStr, "~]# ") || strings.HasSuffix(outputStr, "~$ ")
+					suffix := strings.HasSuffix(outputStr, "~]# ") || strings.LastIndex(outputStr, "~# ") != -1 || strings.HasSuffix(outputStr, "~$ ")
 					if len(cmdStrArr) > 0 && suffix {
 						if firstRead {
 							firstRead = false