From a8189589cbaecc2efba4e7fe8af7f9f2b8652ed4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 23 Oct 2025 17:30:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4SSH=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=96=87=E4=BB=B6=E5=B7=A5=E5=85=B7=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=87=E4=BB=BD=E5=AF=BC=E5=87=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup_export_log_ne.go                   | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/modules/crontask/processor/backup_export_log_ne/backup_export_log_ne.go b/src/modules/crontask/processor/backup_export_log_ne/backup_export_log_ne.go
index 2da57cfb..0239b2d1 100644
--- a/src/modules/crontask/processor/backup_export_log_ne/backup_export_log_ne.go
+++ b/src/modules/crontask/processor/backup_export_log_ne/backup_export_log_ne.go
@@ -9,7 +9,7 @@ import (
 	"be.ems/src/framework/cron"
 	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/ssh"
+	"be.ems/src/framework/utils/file"
 	neModel "be.ems/src/modules/ne/model"
 	neService "be.ems/src/modules/ne/service"
 	neDataService "be.ems/src/modules/ne_data/service"
@@ -56,33 +56,33 @@ func (s *BackupExportLogNEProcessor) Execute(data any) (any, error) {
 			continue
 		}
 
-		// 网元主机的SSH客户端
-		sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
-		if err != nil {
-			result[neInfo.NeName] = err.Error()
-			continue
-		}
-		defer sshClient.Close()
-		// 网元主机的SSH客户端进行文件传输
-		sftpClient, err := sshClient.NewClientSFTP()
-		if err != nil {
-			result[neInfo.NeName] = err.Error()
-			continue
-		}
-		defer sftpClient.Close()
+		// // 网元主机的SSH客户端
+		// sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+		// if err != nil {
+		// 	result[neInfo.NeName] = err.Error()
+		// 	continue
+		// }
+		// defer sshClient.Close()
+		// // 网元主机的SSH客户端进行文件传输
+		// sftpClient, err := sshClient.NewClientSFTP()
+		// if err != nil {
+		// 	result[neInfo.NeName] = err.Error()
+		// 	continue
+		// }
+		// defer sftpClient.Close()
 
 		// 备份导出日志
 		if neInfo.NeType == "IMS" {
 			imsDirArr := [...]string{"icscf", "bgcf", "mmtel", "pcscf", "scscf", "iwf", "bsf", "ismc"}
 			for _, dirPath := range imsDirArr {
 				logFilePathIMS := filepath.ToSlash(filepath.Join(s.logFilePath, "ims", dirPath))
-				output := s.backup(timeDir, logFilePathIMS, neInfo, sshClient, sftpClient)
+				output := s.backup(timeDir, logFilePathIMS, neInfo)
 				for k, v := range output {
 					result[k+"-"+dirPath] = v
 				}
 			}
 		} else {
-			output := s.backup(timeDir, s.logFilePath, neInfo, sshClient, sftpClient)
+			output := s.backup(timeDir, s.logFilePath, neInfo)
 			for k, v := range output {
 				result[k] = v
 			}
@@ -95,7 +95,7 @@ func (s *BackupExportLogNEProcessor) Execute(data any) (any, error) {
 }
 
 // backup 备份导出日志
-func (s *BackupExportLogNEProcessor) backup(timeDir string, logFilePath string, neInfo neModel.NeInfo, sshClient *ssh.ConnSSH, sftpClient *ssh.SSHClientSFTP) map[string]string {
+func (s *BackupExportLogNEProcessor) backup(timeDir string, logFilePath string, neInfo neModel.NeInfo) map[string]string {
 	var result = map[string]string{}
 
 	// 获取文件列表
@@ -103,7 +103,7 @@ func (s *BackupExportLogNEProcessor) backup(timeDir string, logFilePath string,
 	if neInfo.NeType == "IMS" {
 		search = ""
 	}
-	rows, err := ssh.FileList(sshClient, logFilePath, search)
+	rows, err := file.FileList(logFilePath, search)
 	if err != nil {
 		result[neInfo.NeName] = err.Error()
 		return result
@@ -125,7 +125,7 @@ func (s *BackupExportLogNEProcessor) backup(timeDir string, logFilePath string,
 			neDirPath = strings.Replace(neFilePath, s.logFilePath, "", 1)
 		}
 		localFilePath := filepath.Join(s.backupService.BACKUP_DIR, "/log/ne_log", timeDir, neDirPath)
-		if err := sftpClient.CopyFileRemoteToLocal(neFilePath, localFilePath); err != nil {
+		if err := file.CopyFile(neFilePath, localFilePath); err != nil {
 			result[neInfo.NeName+"-copy"] = err.Error()
 			continue
 		}