修改运行shell逻辑

This commit is contained in:
junleea 2026-04-07 20:09:24 +08:00
parent e4e12324fe
commit 5525fe6f2f
1 changed files with 2 additions and 5 deletions

View File

@ -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
}