yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: ftp/sftp功能优化 

1. 更换jsch依赖库
2. 增加超时设置
3. sftp创建上层目录时，与ftp方式保持一致，因为hutool包的FileUtil.getParent在不同操作系统上不一致
pull/207/head
Henry 2025-08-31 17:08:34 +08:00
parent cb5f05b421
commit e01ee4e01d
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-dependencies/pom.xml
View File

@ -67,7 +67,7 @@
<transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
<commons-net.version>3.11.1</commons-net.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<jsch.version>0.1.55</jsch.version>
<jsch.version>2.27.3</jsch.version>
<tika-core.version>3.2.2</tika-core.version>
<ip2region.version>2.7.0</ip2region.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
@ -576,7 +576,7 @@
<version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<groupId>com.github.mwiede</groupId>
<artifactId>jsch</artifactId> <!-- 解决 sftp 连接 -->
<version>${jsch.version}</version>
</dependency>

9
yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClient.java
View File

@ -27,8 +27,11 @@ public class FtpFileClient extends AbstractFileClient<FtpFileClientConfig> {
@Override
protected void doInit() {
// 初始化 Ftp 对象
this.ftp = new Ftp(config.getHost(), config.getPort(), config.getUsername(), config.getPassword(),
CharsetUtil.CHARSET_UTF_8, null, null, FtpMode.valueOf(config.getMode()));
FtpConfig ftpConfig = new FtpConfig(config.getHost(), config.getPort(), config.getUsername(), config.getPassword(),
CharsetUtil.CHARSET_UTF_8, null, null);
ftpConfig.setConnectionTimeout(3000L);
ftpConfig.setSoTimeout(10000L);
this.ftp = new Ftp(ftpConfig, FtpMode.valueOf(config.getMode()));
}
@Override
@ -72,4 +75,4 @@ public class FtpFileClient extends AbstractFileClient<FtpFileClientConfig> {
ftp.reconnectIfTimeout();
}
}
}

22
yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClient.java
View File

@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.infra.framework.file.core.client.sftp;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.extra.ftp.FtpConfig;
import cn.hutool.extra.ssh.Sftp;
import cn.iocoder.yudao.framework.common.util.io.FileUtils;
import cn.iocoder.yudao.module.infra.framework.file.core.client.AbstractFileClient;
@ -14,6 +16,11 @@ import java.io.File;
*/
public class SftpFileClient extends AbstractFileClient<SftpFileClientConfig> {
static {
// 某些旧的sftp服务器仅支持ssh-dss协议，该协议并不安全，默认不支持该协议，按需添加
JSch.setConfig("server_host_key", JSch.getConfig("server_host_key") + ",ssh-dss");
}
private Sftp sftp;
public SftpFileClient(Long id, SftpFileClientConfig config) {
@ -23,17 +30,26 @@ public class SftpFileClient extends AbstractFileClient<SftpFileClientConfig> {
@Override
protected void doInit() {
// 初始化 Ftp 对象
this.sftp = new Sftp(config.getHost(), config.getPort(), config.getUsername(), config.getPassword());
FtpConfig ftpConfig = new FtpConfig(config.getHost(), config.getPort(), config.getUsername(), config.getPassword(),
CharsetUtil.CHARSET_UTF_8, null, null);
ftpConfig.setConnectionTimeout(3000L);
ftpConfig.setSoTimeout(10000L);
this.sftp = new Sftp(ftpConfig);
}
@Override
public String upload(byte[] content, String path, String type) {
// 执行写入
String filePath = getFilePath(path);
String fileName = FileUtil.getName(filePath);
String dir = StrUtil.removeSuffix(filePath, fileName);
File file = FileUtils.createTempFile(content);
reconnectIfTimeout();
sftp.mkDirs(FileUtil.getParent(filePath, 1)); // 需要创建父目录，不然会报错
sftp.upload(filePath, file);
sftp.mkDirs(dir); // 需要创建父目录，不然会报错
boolean success = sftp.upload(filePath, file);
if (!success) {
throw new JschRuntimeException(StrUtil.format("上传文件到目标目录 ({}) 失败", filePath));
}
// 拼接返回路径
return super.formatFileUrl(config.getDomain(), path);
}