ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复SshjSftpSession关闭导致的问题

Browse Source
This commit is contained in:
Looly 2024-01-24 10:09:22 +08:00
parent b7508cc0e9
commit dd1ec90fd4
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSftp.java
View File

@ -89,6 +89,7 @@ public class SshjSftp extends AbstractFtp {
private SSHClient ssh;
private SFTPClient sftp;
private Session session;
/**
* 构造
@ -120,7 +121,9 @@ public class SshjSftp extends AbstractFtp {
* @since 5.7.18
*/
public void init() {
this.ssh = SshjUtil.openClient(this.ftpConfig.getConnector());
if(null == this.ssh){
this.ssh = SshjUtil.openClient(this.ftpConfig.getConnector());
}
try {
ssh.setRemoteCharset(ftpConfig.getCharset());
@ -248,12 +251,9 @@ public class SshjSftp extends AbstractFtp {
@Override
public void close() {
try {
sftp.close();
ssh.disconnect();
} catch (final IOException e) {
throw new FtpException(e);
}
IoUtil.closeQuietly(this.session);
IoUtil.closeQuietly(this.sftp);
IoUtil.closeQuietly(this.ssh);
}
/**
@ -283,16 +283,36 @@ public class SshjSftp extends AbstractFtp {
* @since 5.7.19
*/
public String command(final String exec) {
Session session = null;
final Session session = this.initSession();
Session.Command command = null;
try {
session = ssh.startSession();
final Session.Command command = session.exec(exec);
command = session.exec(exec);
final InputStream inputStream = command.getInputStream();
return IoUtil.read(inputStream, DEFAULT_CHARSET);
return IoUtil.read(inputStream, this.ftpConfig.getCharset());
} catch (final Exception e) {
throw new FtpException(e);
} finally {
IoUtil.closeQuietly(session);
IoUtil.closeQuietly(command);
}
}
/**
* 初始化Session并返回
*
* @return session
*/
private Session initSession() {
Session session = this.session;
if (null == session || !session.isOpen()) {
IoUtil.closeQuietly(session);
try {
session = this.ssh.startSession();
} catch (final Exception e) {
throw new FtpException(e);
}
this.session = session;
}
return session;
}
}