diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java index f5a32b1c5..0550e0958 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java @@ -238,7 +238,7 @@ public class FileNameUtil { // issue#I4W5FS@Gitee final int secondToLastIndex = fileName.substring(0, index).lastIndexOf(StrUtil.DOT); final String substr = fileName.substring(secondToLastIndex == -1 ? index : secondToLastIndex + 1); - if (StrUtil.containsAny(substr, SPECIAL_SUFFIX)) { + if (StrUtil.equalsAny(substr, SPECIAL_SUFFIX)) { return substr; } diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java index b06245d06..44d904e0d 100755 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java @@ -19,4 +19,12 @@ public class FileNameUtilTest { final String s = FileNameUtil.mainName("abc.tar.gz"); assertEquals("abc", s); } + + @Test + public void extNameAndMainNameBugTest() { + // 正确,输出前缀为 "app-v2.3.1-star" + assertEquals("app-v2.3.1-star",FileNameUtil.mainName("app-v2.3.1-star.gz")); + // 当前代码会失败,预期后缀结果 "gz",但是输出 "star.gz" + assertEquals("gz", FileNameUtil.extName("app-v2.3.1-star.gz")); + } }