From 25a41fd7608f8514ff0f0e715f0a21a66e73febd Mon Sep 17 00:00:00 2001
From: weisz <weishengze@onlinesign.com.cn>
Date: Mon, 22 Mar 2021 11:41:00 +0800
Subject: [PATCH] =?UTF-8?q?ofd=20=E6=A0=BC=E5=BC=8F=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=90=8D=E8=BE=85=E5=8A=A9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/io/FileTypeUtil.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 b5250bb07..07809fef0 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
@@ -60,7 +60,6 @@ public class FileTypeUtil {
 		FILE_TYPE_MAP.put("4d546864000000060001", "mid"); // MIDI (mid)
 		FILE_TYPE_MAP.put("526172211a0700cf9073", "rar"); // WinRAR
 		FILE_TYPE_MAP.put("235468697320636f6e66", "ini");
-		FILE_TYPE_MAP.put("504B0304140000000800", "ofd"); // ofd文件 国标版式文件
 		FILE_TYPE_MAP.put("504B03040a0000000000", "jar");
 		FILE_TYPE_MAP.put("504B0304140008000800", "jar");
 		// MS Excel 注意：word、msi 和 excel的文件头一样
@@ -140,7 +139,7 @@ public class FileTypeUtil {
 	 * <pre>
 	 *     1、无法识别类型默认按照扩展名识别
 	 *     2、xls、doc、msi头信息无法区分，按照扩展名区分
-	 *     3、zip可能为docx、xlsx、pptx、jar、war头信息无法区分，按照扩展名区分
+	 *     3、zip可能为docx、xlsx、pptx、jar、war、ofd头信息无法区分，按照扩展名区分
 	 * </pre>
 	 * @param in {@link InputStream}
 	 * @param filename 文件名
@@ -162,7 +161,7 @@ public class FileTypeUtil {
 				typeName = "msi";
 			}
 		} else if ("zip".equals(typeName)) {
-			// zip可能为docx、xlsx、pptx、jar、war等格式，扩展名辅助判断
+			// zip可能为docx、xlsx、pptx、jar、war、ofd等格式，扩展名辅助判断
 			final String extName = FileUtil.extName(filename);
 			if ("docx".equalsIgnoreCase(extName)) {
 				typeName = "docx";
@@ -174,6 +173,8 @@ public class FileTypeUtil {
 				typeName = "jar";
 			} else if ("war".equalsIgnoreCase(extName)) {
 				typeName = "war";
+			} else if ("ofd".equalsIgnoreCase(extName)) {
+				typeName = "ofd";
 			}
 		}
 		return typeName;