From 0aaf50a27fa66ac49f97c3b717c33b0900ab09d2 Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 26 Feb 2022 23:08:16 +0800 Subject: [PATCH] fix bug --- CHANGELOG.md | 2 +- .../src/main/java/cn/hutool/extra/ssh/GanymedUtil.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 061c40fbb..2ed832a7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.7.22 (2022-02-25) +# 5.7.22 (2022-02-26) ### 🐣新特性 * 【poi 】 ExcelUtil.readBySax增加对POI-5.2.0的兼容性（issue#I4TJF4@gitee） diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java index a681eea14..cbe3313a7 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java @@ -79,7 +79,7 @@ public class GanymedUtil { result = IoUtil.read(new StreamGobbler(session.getStdout()), charset); // 错误输出 - IoUtil.copy(new StreamGobbler(session.getStdout()), errStream); + IoUtil.copy(new StreamGobbler(session.getStderr()), errStream); } catch (IOException e) { throw new IORuntimeException(e); } finally { @@ -91,7 +91,7 @@ public class GanymedUtil { /** * 执行Shell命令 *

- * 此方法单次发送一个命令到服务端，自动读取环境变量，执行结束后自动关闭Session，不会产生阻塞。 + * 此方法单次发送一个命令到服务端，自动读取环境变量，执行结束后自动关闭Session，可能产生阻塞。 *

* * @param session Session会话 @@ -109,7 +109,7 @@ public class GanymedUtil { result = IoUtil.read(new StreamGobbler(session.getStdout()), charset); if(null != errStream){ // 错误输出 - IoUtil.copy(new StreamGobbler(session.getStdout()), errStream); + IoUtil.copy(new StreamGobbler(session.getStderr()), errStream); } } catch (IOException e) { throw new IORuntimeException(e);