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