From 78f08353d1894c4601c4dfd706202a16da66ed3c Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 29 Sep 2019 15:12:49 +0800
Subject: [PATCH] =?UTF-8?q?2.3=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/utils/FileUtil.java          | 7 ++-----
 .../me/zhengjie/service/impl/LocalStorageServiceImpl.java  | 4 +++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index d0d24649..95f6d1dc 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -5,10 +5,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import me.zhengjie.exception.BadRequestException;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.activation.MimetypesFileTypeMap;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -233,11 +231,10 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
             return "视频";
         } else return "其他";
     }
+
     public static String getFileTypeByMimeType(String type) {
-//        URLConnection.guessContentTypeFromName("." + type)
-//        way 2 new MimetypesFileTypeMap().getContentType("."+ "txt")
         String mimeType = new MimetypesFileTypeMap().getContentType("." + type);
-         return mimeType.split("\\/")[0];
+        return mimeType.split("\\/")[0];
     }
     public static void checkSize(long maxSize, long size) {
         if(size > (maxSize * 1024 * 1024)){
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
index fd917699..f0830b5f 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
@@ -63,7 +63,9 @@ public class LocalStorageServiceImpl implements LocalStorageService {
     public LocalStorageDTO create(String name, MultipartFile multipartFile) {
         FileUtil.checkSize(maxSize, multipartFile.getSize());
         String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
-        String type = FileUtil.getFileTypeByMimeType(suffix);
+        // 可自行选择方式
+//        String type = FileUtil.getFileTypeByMimeType(suffix);
+        String type = FileUtil.getFileType(suffix);
         File file = FileUtil.upload(multipartFile, path + type +  File.separator);
         try {
             name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;