From 7fe72ce51bca25ae5a93a123c0ee806a9a5b891d Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 18 Oct 2022 09:20:34 +0800 Subject: [PATCH 1/2] add ppt type --- CHANGELOG.md | 3 ++- hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75f4991d1..8fa5a7ff9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.9.M1 (2022-10-16) +# 5.8.9.M1 (2022-10-18) ### 🐣新特性 * 【core 】 DateUtil增加isLastDayOfMonth、getLastDayOfMonth方法(pr#824@Gitee) @@ -14,6 +14,7 @@ * 【core 】 UrlBuilder增加getPortWithDefault方法(pr#835@Gitee) * 【core 】 FuncKeyMap的子类,传入可被序列化的keyFunc(pr#838@Gitee) * 【extra 】 SpringUtil支持SpringBoot3自动配置(pr#839@Gitee) +* 【core 】 FileTypeUtil增加ppt识别(issue#2663@Github) ### 🐞Bug修复 * 【poi 】 修复ExcelReader读取只有标题行报错问题(issue#I5U1JA@Gitee) diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java index e1052e58a..e9fec0772 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java @@ -166,6 +166,8 @@ public class FileTypeUtil { typeName = "doc"; } else if ("msi".equalsIgnoreCase(extName)) { typeName = "msi"; + } else if ("ppt".equalsIgnoreCase(extName)) { + typeName = "ppt"; } } else if ("zip".equals(typeName)) { // zip可能为docx、xlsx、pptx、jar、war、ofd等格式,扩展名辅助判断 From 108b583e3ad7fd54c95eb4cf95077568d92e2541 Mon Sep 17 00:00:00 2001 From: PisecesPeng Date: Tue, 18 Oct 2022 21:29:34 +0800 Subject: [PATCH 2/2] fix doc --- .../main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java index b1da492d6..e7257e0f9 100755 --- a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java +++ b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java @@ -8,7 +8,7 @@ import cn.hutool.bloomfilter.filter.SDBMFilter; import cn.hutool.core.util.NumberUtil; /** - * BlommFilter 实现
+ * BloomFilter 实现
* 1.构建hash算法
* 2.散列hash映射到数组的bit位置
* 3.验证
@@ -79,4 +79,4 @@ public class BitMapBloomFilter implements BloomFilter { } return true; } -} \ No newline at end of file +}