Merge branch 'master' of github.com:elunez/eladmin into 2.3dev

elunez · elunez · commit d6fb61be09f4 · 2019-09-29T14:52:04.000+08:00
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -8,6 +8,8 @@
 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;
 import java.io.*;
@@ -231,7 +233,12 @@ 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];
+    }
     public static void checkSize(long maxSize, long size) {
         if(size > (maxSize * 1024 * 1024)){
             throw new BadRequestException("文件超出规定大小");
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,7 @@ 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.getFileType(suffix);
+        String type = FileUtil.getFileTypeByMimeType(suffix);
         File file = FileUtil.upload(multipartFile, path + type +  File.separator);
         try {
             name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;
@@ -115,4 +115,4 @@ public void deleteAll(Long[] ids) {
             localStorageRepository.delete(storage);
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public LocalStorageDTO findById(Long id) {`
`63`	`63`	`public LocalStorageDTO create(String name, MultipartFile multipartFile) {`
`64`	`64`	`FileUtil.checkSize(maxSize, multipartFile.getSize());`
`65`	`65`	`String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());`
`66`		`- String type = FileUtil.getFileType(suffix);`
	`66`	`+ String type = FileUtil.getFileTypeByMimeType(suffix);`
`67`	`67`	`File file = FileUtil.upload(multipartFile, path + type + File.separator);`
`68`	`68`	`try {`
`69`	`69`	`name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;`
`@@ -115,4 +115,4 @@ public void deleteAll(Long[] ids) {`
`115`	`115`	`localStorageRepository.delete(storage);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`		`-}`
	`118`	`+}`