From 5525fe6f2fdb2a87846136dcb59cfc965475c106 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Tue, 7 Apr 2026 20:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8Cshell?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/shellService.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/service/shellService.go b/service/shellService.go
index 5bf9bda..48bc351 100644
--- a/service/shellService.go
+++ b/service/shellService.go
@@ -130,13 +130,10 @@ func GetShellWillRunFromMaster(server string) ([]dao.Shell, error) {
 
 func RunShell(script string) (res, err string) {
 	cmd := exec.Command("/bin/bash", "-c", script)
-	// 使用bytes.Buffer捕获输出
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err3 := cmd.Run()
+	output, err3 := cmd.CombinedOutput()
 	err3_info := ""
 	if err3 != nil {
 		err3_info = err3.Error()
 	}
-	return strings.TrimSpace(out.String()), err3_info
+	return strings.TrimSpace(string(output)), err3_info
 }