From d711c7c01484a7d011ba1113f94917e23ef9f691 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 10 Oct 2025 17:46:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96UDM=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A7=A3=E5=AF=86=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2SSH=E6=96=87=E4=BB=B6=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93=E4=B8=BA=E6=9C=AC=E5=9C=B0=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/ne_data/controller/udm_auth.go | 24 +++++-----------------
 src/modules/trace/service/tcpdump.go       | 10 ++++-----
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/modules/ne_data/controller/udm_auth.go b/src/modules/ne_data/controller/udm_auth.go
index 3c5582c8..22b12b3e 100644
--- a/src/modules/ne_data/controller/udm_auth.go
+++ b/src/modules/ne_data/controller/udm_auth.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"be.ems/src/framework/cmd"
 	"be.ems/src/framework/constants"
 	"be.ems/src/framework/i18n"
 	"be.ems/src/framework/reqctx"
@@ -692,8 +693,8 @@ func (s *UDMAuthController) ExportDec(c *gin.Context) {
 	// 发送MML
 	// 导出解密的ki和opc 需要执行 dec authdat:imsi=all
 	// 生成文件 /user/local/etc/udm/authdata.txt
-	cmd := "dec authdat:imsi=all"
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
+	cmdStr := "dec authdat:imsi=all"
+	data, err := telnet.ConvertToStr(telnetClient, cmdStr)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -701,32 +702,17 @@ func (s *UDMAuthController) ExportDec(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		// 网元主机的SSH客户端
-		sshClient, err := s.neInfoService.NeRunSSHClient("UDM", neId)
-		if err != nil {
-			c.JSON(200, resp.ErrMsg(err.Error()))
-			return
-		}
-		defer sshClient.Close()
-		// 网元主机的SSH客户端进行文件传输
-		sftpClient, err := sshClient.NewClientSFTP()
-		if err != nil {
-			c.JSON(200, resp.ErrMsg(err.Error()))
-			return
-		}
-		defer sftpClient.Close()
-
 		// 复制到本地
 		nePath := "/usr/local/etc/udm/authdata.txt"
 		localFilePath := filepath.Join("/tmp/omc/pull", filepath.Base(nePath))
 		if runtime.GOOS == "windows" {
 			localFilePath = fmt.Sprintf("C:%s", localFilePath)
 		}
-		if err = sftpClient.CopyFileRemoteToLocal(nePath, localFilePath); err != nil {
+		if err = file.CopyFile(nePath, localFilePath); err != nil {
 			c.JSON(200, resp.ErrMsg(err.Error()))
 			return
 		}
-		sshClient.RunCMD(fmt.Sprintf("sudo rm -rf %s", nePath))
+		cmd.Exec(fmt.Sprintf("sudo rm -rf %s", nePath))
 		defer os.Remove(localFilePath)
 		c.FileAttachment(localFilePath, filepath.Base(nePath))
 		return
diff --git a/src/modules/trace/service/tcpdump.go b/src/modules/trace/service/tcpdump.go
index 0a73e96e..ec4d5f20 100644
--- a/src/modules/trace/service/tcpdump.go
+++ b/src/modules/trace/service/tcpdump.go
@@ -224,11 +224,11 @@ func (s *TCPdump) UPFTrace(neType, neId, cmdStr string) (string, error) {
 		return "", fmt.Errorf("app.common.noNEInfo")
 	}
 	// 网元主机的SSH客户端
-	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
-	if err != nil {
-		return "", err
-	}
-	defer sshClient.Close()
+	// sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	// if err != nil {
+	// 	return "", err
+	// }
+	// defer sshClient.Close()
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UPF", neInfo.NeId, 2)
 	if err != nil {