From 86bfe8877f4e9e8a44953556fd87a1f77d4705d6 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Sun, 26 Feb 2023 10:59:40 +0800
Subject: [PATCH] [agent][executor]- bug - 8

---
 .../wdd/agent/executor/CommandExecutor.java   | 28 ++++++++++++++++++-
 .../executor/thread/CommandExecLogCache.java  |  1 -
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
index db649d7..dd186b0 100644
--- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
+++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
@@ -19,6 +19,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -227,7 +228,32 @@ public class CommandExecutor {
                         throw new RuntimeException(e);
                     }
 
-                    process.destroy();
+                    //process.destroy();
+                    try {
+
+                        byte[] bytes = process
+                                .getInputStream()
+                                .readAllBytes();
+
+                        String s = new String(
+                                bytes,
+                                StandardCharsets.UTF_8
+                        );
+
+                        log.debug(
+                                "从process中获取到的 所有字符内容为 {}",
+                                s
+                        );
+
+                        // 关闭这个命令执行的inputStream
+                        process
+                                .getInputStream()
+                                .close();
+
+
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
 
                     try {
                         Process exitProcess = process
diff --git a/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java b/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
index 060d3d3..b2110cc 100644
--- a/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
+++ b/agent/src/main/java/io/wdd/agent/executor/thread/CommandExecLogCache.java
@@ -54,7 +54,6 @@ public class CommandExecLogCache {
                 process
         );
 
-
     }