lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-03 20:27:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix ftp bug

Browse Source
This commit is contained in:
Looly 2020-05-07 15:52:16 +08:00
parent 7480d710cb
commit d544dde3c0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
### 新特性 ### 新特性
### Bug修复 ### Bug修复
* 【extra 】 修复Ftp设置超时问题
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

7
hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
View File

@ -13,7 +13,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.SocketException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -156,14 +155,10 @@ public class Ftp extends AbstractFtp {
final FTPClient client = new FTPClient(); final FTPClient client = new FTPClient();
client.setControlEncoding(config.getCharset().toString()); client.setControlEncoding(config.getCharset().toString());
client.setConnectTimeout((int) config.getConnectionTimeout()); client.setConnectTimeout((int) config.getConnectionTimeout());
try {
client.setSoTimeout((int)config.getSoTimeout());
} catch (SocketException e) {
//ignore
}
try { try {
// 连接ftp服务器 // 连接ftp服务器
client.connect(config.getHost(), config.getPort()); client.connect(config.getHost(), config.getPort());
client.setSoTimeout((int)config.getSoTimeout());
// 登录ftp服务器 // 登录ftp服务器
client.login(config.getUser(), config.getPassword()); client.login(config.getUser(), config.getPassword());
} catch (IOException e) { } catch (IOException e) {