admin/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-12-06 17:18:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4142 from ZhonglinGui/v5-dev

Browse Source 
修复FileNameUtil.extName 方法对特殊后缀判断逻辑过于宽松导致误判
This commit is contained in:
Golden Looly 2025-11-23 23:14:42 +08:00 committed by GitHub
commit c6cbaeabff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java
View File

@ -238,7 +238,7 @@ public class FileNameUtil {
// issue#I4W5FS@Gitee // issue#I4W5FS@Gitee
final int secondToLastIndex = fileName.substring(0, index).lastIndexOf(StrUtil.DOT); final int secondToLastIndex = fileName.substring(0, index).lastIndexOf(StrUtil.DOT);
final String substr = fileName.substring(secondToLastIndex == -1 ? index : secondToLastIndex + 1); final String substr = fileName.substring(secondToLastIndex == -1 ? index : secondToLastIndex + 1);
if (StrUtil.containsAny(substr, SPECIAL_SUFFIX)) { if (StrUtil.equalsAny(substr, SPECIAL_SUFFIX)) {
return substr; return substr;
} }

8
hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java
View File

@ -19,4 +19,12 @@ public class FileNameUtilTest {
final String s = FileNameUtil.mainName("abc.tar.gz"); final String s = FileNameUtil.mainName("abc.tar.gz");
assertEquals("abc", s); 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"));
}
} }