2.2 代码优化

dwc361 · Sep 29, 2019 · 8b5c04c · 8b5c04c
1 parent d6fb61b
commit 8b5c04c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -5,10 +5,8 @@
 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 static String getFileType(String type) {
             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
@@ -63,7 +63,9 @@ public LocalStorageDTO findById(Long id) {
     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;