From 65ccea794091cff0d193a5c13284b3b0ae45d483 Mon Sep 17 00:00:00 2001
From: FULaBUla <46469068+FULaBUla@users.noreply.github.com>
Date: Thu, 18 Aug 2022 21:30:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Fix=20(hutool-core):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E7=BC=80=E4=B8=BA=20zip=20=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A2=AB=E8=AF=86=E5=88=AB=E6=88=90=20jar=20=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 修改
1. 由于 jar 和 zip 文件的头类似，会存在被识别成 jar 的情况，在识别成 jar 后进入判断分支时没有判断后缀是 zip 但是被识别成 jar 的情况，特此补充这种情况，避免 zip 被识别成 jar
---
 hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java | 2 ++
 1 file changed, 2 insertions(+)

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 edc265e2a..3736bde99 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
@@ -194,6 +194,8 @@ public class FileTypeUtil {
 			} else if ("pptx".equalsIgnoreCase(extName)) {
 				// issue#I5A0GO
 				typeName = "pptx";
+			} else if ("zip".equalsIgnoreCase(extName)) {
+				typeName = "zip";
 			}
 		}
 		return typeName;

From 8e51df4f2b87d9f5a0024cf462c7a56778e508b3 Mon Sep 17 00:00:00 2001
From: FULaBUla <46469068+FULaBUla@users.noreply.github.com>
Date: Thu, 18 Aug 2022 21:57:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Fix=20(hutool-core):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E7=BC=80=E4=B8=BA=20apk=20=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A2=AB=E8=AF=86=E5=88=AB=E6=88=90=20jar=20=E6=88=96=20zip=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 修改
1. 由于 apk 本质就是 zip 文件，同时 jar 和 zip 文件的头类似，会存在被识别成 jar 或者 zip 的情况，因此增加补充判断避免将 apk 返回为 zip 或者 jar
---
 hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

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 3736bde99..e1052e58a 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
@@ -182,6 +182,8 @@ public class FileTypeUtil {
 				typeName = "war";
 			} else if ("ofd".equalsIgnoreCase(extName)) {
 				typeName = "ofd";
+			} else if ("apk".equalsIgnoreCase(extName)) {
+				typeName = "apk";
 			}
 		} else if ("jar".equals(typeName)) {
 			// wps编辑过的.xlsx文件与.jar的开头相同,通过扩展名判断
@@ -196,6 +198,8 @@ public class FileTypeUtil {
 				typeName = "pptx";
 			} else if ("zip".equalsIgnoreCase(extName)) {
 				typeName = "zip";
+			} else if ("apk".equalsIgnoreCase(extName)) {
+				typeName = "apk";
 			}
 		}
 		return typeName;