merge: 合并OMC分支

src/framework/utils/ssh/files.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strings"
 
-	"nms_cxy/src/framework/config"
 	"nms_cxy/src/framework/logger"
 	"nms_cxy/src/framework/utils/cmd"
 	"nms_cxy/src/framework/utils/parse"
@@ -23,35 +22,31 @@ type FileListRow struct {
 }
 
 // 文件列表
-// neIp 网元IP空字符串为本地
 // search 文件名后模糊*
 //
 // return 目录大小，行记录，异常
-func FileList(path, neIp, search string) (string, []FileListRow, error) {
+func FileList(sshClient *ConnSSH, path, search string) (string, []FileListRow, error) {
 	totalSize := ""
 	var rows []FileListRow
 	rowStr := ""
 
 	// 发送命令
-	searchStr := ""
+	searchStr := "*"
 	if search != "" {
-		searchStr = search + "*"
+		searchStr = search + searchStr
 	}
-	pathStr := fmt.Sprintf("cd %s \n", path)
-	cmdStr := fmt.Sprintf("ls -lht --time-style=+%%s %s \n", searchStr)
+	cmdStr := fmt.Sprintf("cd %s && ls -lthd --time-style=+%%s %s", path, searchStr)
 
-	// 是否远程读取
-	if neIp != "" {
-		usernameNe := config.Get("ne.user").(string) // 网元统一用户
-		sshHost := fmt.Sprintf("%s@%s", usernameNe, neIp)
-		resultStr, err := cmd.ExecWithCheck("ssh", sshHost, pathStr, cmdStr)
+	// 是否远程客户端读取
+	if sshClient == nil {
+		resultStr, err := cmd.Execf(cmdStr)
 		if err != nil {
 			logger.Errorf("Ne FileList Path: %s, Search: %s, Error:%s", path, search, err.Error())
 			return totalSize, rows, err
 		}
 		rowStr = resultStr
 	} else {
-		resultStr, err := cmd.Execf(pathStr, cmdStr)
+		resultStr, err := sshClient.RunCMD(cmdStr)
 		if err != nil {
 			logger.Errorf("Ne FileList Path: %s, Search: %s, Error:%s", path, search, err.Error())
 			return totalSize, rows, err