ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复exist分隔符结尾判断错误的问题

Browse Source
This commit is contained in:
yebukong 2022-08-31 12:57:56 +08:00
parent 4852d67bed
commit feb62498fd
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
View File

@ -2,6 +2,7 @@ package cn.hutool.extra.ftp;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -96,6 +97,15 @@ public abstract class AbstractFtp implements Closeable {
* @return 是否存在 * @return 是否存在
*/ */
public boolean exist(String path) { public boolean exist(String path) {
// 目录验证
if (isDir(path)) {
return true;
} else {
if (CharUtil.isFileSeparator(path.charAt(path.length() - 1))) {
return false;
}
}
// 文件验证
final String fileName = FileUtil.getName(path); final String fileName = FileUtil.getName(path);
final String dir = StrUtil.removeSuffix(path, fileName); final String dir = StrUtil.removeSuffix(path, fileName);
final List<String> names; final List<String> names;

33
hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
View File

@ -100,4 +100,37 @@ public class FtpTest {
Console.log(ftp.pwd()); Console.log(ftp.pwd());
} }
} }
@Test
@Ignore
public void existSftpTest() throws Exception {
try (Sftp ftp = new Sftp("127.0.0.1", 22, "test", "test")) {
Console.log(ftp.pwd());
Console.log(ftp.exist("/home/test"));
Console.log(ftp.exist("/home/test/"));
Console.log(ftp.exist("/home/test//////"));
Console.log(ftp.exist("/home/test/file1"));
Console.log(ftp.exist("/home/test/file1/"));
Console.log(ftp.exist("///////////"));
Console.log(ftp.exist("./"));
Console.log(ftp.exist("./file1"));
Console.log(ftp.pwd());
}
}
@Test
@Ignore
public void existFtpTest() throws Exception {
try (Ftp ftp = new Ftp("127.0.0.1", 21)) {
Console.log(ftp.exist("/test/"));
Console.log(ftp.exist("/test/"));
Console.log(ftp.exist("/test//////"));
Console.log(ftp.exist("/file1"));
Console.log(ftp.exist("/file1/"));
Console.log(ftp.exist("///////////"));
Console.log(ftp.exist("./"));
Console.log(ftp.exist("./file1"));
Console.log(ftp.pwd());
}
}
} }