Merge branch 'lichang' into lite

src/modules/network_element/service/ne_version.go

@@ -651,7 +651,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