From b4ddab035a0cf90848794ca63e626858ed79125e Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 26 May 2022 10:24:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96mime=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=9B=A0=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=8C=85=E9=87=8C=E5=8C=85=E5=90=ABmine.types=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=8A=A0=E8=BD=BD=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/java/com/jeesite/common/io/FileUtils.java | 7 ++++++- .../resources/META-INF/{mime.types => jeesite.mime.types} | 0 2 files changed, 6 insertions(+), 1 deletion(-) rename common/src/main/resources/META-INF/{mime.types => jeesite.mime.types} (100%) diff --git a/common/src/main/java/com/jeesite/common/io/FileUtils.java b/common/src/main/java/com/jeesite/common/io/FileUtils.java index 86b21dfe..4fb1b703 100644 --- a/common/src/main/java/com/jeesite/common/io/FileUtils.java +++ b/common/src/main/java/com/jeesite/common/io/FileUtils.java @@ -655,7 +655,12 @@ public class FileUtils extends org.apache.commons.io.FileUtils { */ public static String getContentType(String fileName) { if (mimetypesFileTypeMap == null){ - mimetypesFileTypeMap = new MimetypesFileTypeMap(); + try { + mimetypesFileTypeMap = new MimetypesFileTypeMap(ResourceUtils + .getResourceFileStream("/META-INF/jeesite.mime.types")); + }catch (IOException e) { + mimetypesFileTypeMap = new MimetypesFileTypeMap(); + } } return mimetypesFileTypeMap.getContentType(fileName); } diff --git a/common/src/main/resources/META-INF/mime.types b/common/src/main/resources/META-INF/jeesite.mime.types similarity index 100% rename from common/src/main/resources/META-INF/mime.types rename to common/src/main/resources/META-INF/jeesite.mime.types