From 8ac95891d046c3dd1d66628903fe4be5f2924274 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 20 Sep 2023 10:39:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=A1=E4=BB=A4=E6=8A=93=E5=8C=85?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=89=A7=E8=A1=8C=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/trace/tcpdump.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/features/trace/tcpdump.go b/features/trace/tcpdump.go
index 8d95a2ed..3ab91274 100644
--- a/features/trace/tcpdump.go
+++ b/features/trace/tcpdump.go
@@ -58,16 +58,18 @@ func TcpdumpNeTask(w http.ResponseWriter, r *http.Request) {
 
 	filePcapName := fmt.Sprintf("tmp_%s_%s_%d.pcap", body.NeType, body.NeId, time.Now().UnixMilli())
 	fileLogName := fmt.Sprintf("tmp_%s_%s_%d.log", body.NeType, body.NeId, time.Now().UnixMilli())
-	cmdStr := fmt.Sprintf("cd /tmp \n timeout %d tcpdump -i any %s -s0 -w %s >> %s 2>&1 \n cat %s", body.Timeout, body.Cmd, filePcapName, fileLogName, fileLogName)
+	writeLog := fmt.Sprintf(" >> %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件，放置弹出code 127
+	cmdStr := fmt.Sprintf("cd /tmp \ntimeout %d tcpdump -i any %s -s0 -w %s", body.Timeout, body.Cmd, filePcapName)
 	usernameNe := conf.Get("ne.user").(string) // 网元统一用户
 	sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.Ip)
-	msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr)
+	msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr+writeLog)
 	if err != nil {
 		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 		return
 	}
 
 	ctx.JSON(w, 200, result.OkData(map[string]any{
+		"cmd":      cmdStr,
 		"msg":      msg,
 		"fileName": filePcapName,
 	}))