github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/141/head
dqjdda 2019-09-29 14:52:04 +08:00
parent 0a2ae87e44 db1d6e4efe
commit d6fb61be09
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
View File

@ -8,6 +8,8 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import me.zhengjie.exception.BadRequestException; import me.zhengjie.exception.BadRequestException;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.activation.MimetypesFileTypeMap;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
@ -231,7 +233,12 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
return "视频"; return "视频";
} else 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) { public static void checkSize(long maxSize, long size) {
if(size > (maxSize * 1024 * 1024)){ if(size > (maxSize * 1024 * 1024)){
throw new BadRequestException("文件超出规定大小"); throw new BadRequestException("文件超出规定大小");

2
eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
View File

@ -63,7 +63,7 @@ public class LocalStorageServiceImpl implements LocalStorageService {
public LocalStorageDTO create(String name, MultipartFile multipartFile) { public LocalStorageDTO create(String name, MultipartFile multipartFile) {
FileUtil.checkSize(maxSize, multipartFile.getSize()); FileUtil.checkSize(maxSize, multipartFile.getSize());
String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename()); 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); File file = FileUtil.upload(multipartFile, path + type + File.separator);
try { try {
name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name; name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;