slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 16:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(LocalRunnerClient): correctly capture stdout and stderr to avoid missing output in method exec

Browse Source
This commit is contained in:
slhafzjw
2025-12-16 21:30:51 +08:00
parent ad58c0cc7c
commit 534dcd5ade
1 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Partner-Main/src/main/java/work/slhaf/partner/core/action/runner/LocalRunnerClient.java
View File

@@ -114,29 +114,53 @@ public class LocalRunnerClient extends RunnerClient {
private SystemExecResult exec(String... command) {
SystemExecResult result = new SystemExecResult();
List<String> resultList = new ArrayList<>();
result.setResultList(resultList);
StringBuilder s = new StringBuilder();
List<String> output = new ArrayList<>();
List<String> error = new ArrayList<>();
try {
Process process = Runtime.getRuntime().exec(command);
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
while ((line = reader.readLine()) != null) {
s.append(line);
resultList.add(line);
}
Process process = new ProcessBuilder(command)
.redirectErrorStream(false) // 分开读
.start();
Thread stdoutThread = new Thread(() -> {
try (BufferedReader r = new BufferedReader(
new InputStreamReader(process.getInputStream()))) {
String line;
while ((line = r.readLine()) != null) {
output.add(line);
}
} catch (Exception ignored) {
}
});
Thread stderrThread = new Thread(() -> {
try (BufferedReader r = new BufferedReader(
new InputStreamReader(process.getErrorStream()))) {
String line;
while ((line = r.readLine()) != null) {
error.add(line);
}
} catch (Exception ignored) {
}
});
stdoutThread.start();
stderrThread.start();
int exitCode = process.waitFor();
stdoutThread.join();
stderrThread.join();
result.setOk(exitCode == 0);
result.setTotal(s.toString().isEmpty() ? "响应为空" : s.toString());
result.setResultList(output.isEmpty() ? error : output);
result.setTotal(String.join("\n",
output.isEmpty() ? error : output));
} catch (Exception e) {
result.setOk(false);
result.setTotal(e.getLocalizedMessage());
}
if (result.getTotal().isEmpty()) {
result.setOk(false);
result.setTotal(e.getMessage());
}
return result;
}