Merge remote-tracking branch 'origin/main' into practical-training

src/modules/network_element/service/ne_version.impl.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/ssh"
 	"be.ems/src/modules/network_element/model"
@@ -515,6 +516,8 @@ func (r *NeVersionImpl) operateRun(sshClient *ssh.ConnSSH, preinput map[string]s
 		for {
 			select {
 			case <-timeoutTicker.C:
+				logger.Warnf("NeVersion operateRun %s", commandLineText)
+				logger.Errorf("neinfo ssh client session read timeout")
 				done <- true
 				return
 			case <-msTicker.C:
@@ -558,7 +561,8 @@ func (r *NeVersionImpl) operateRun(sshClient *ssh.ConnSSH, preinput map[string]s
 					}
 
 					// 命令终止符后继续执行命令
-					if len(cmdStrArr) > 0 && strings.LastIndex(outputStr, "~$ ") > 2 {
+					suffix := strings.HasSuffix(outputStr, "~]# ") || strings.HasSuffix(outputStr, "~$ ")
+					if len(cmdStrArr) > 0 && suffix {
 						if firstRead {
 							firstRead = false
 						}