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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
#	eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
pull/135/head
Your Name 2019-09-29 17:05:33 +08:00
parent 9727dd6c39 8b5c04cb04
commit 85a8bb2e54
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)){

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

@ -72,7 +72,7 @@ public class EmailServiceImpl implements EmailService {
}
account.setFrom(emailConfig.getUser()+"<"+emailConfig.getFromUser()+">");
//ssl方式发送
account.setStartttlsEnable(true);
account.setSslEnable(true);
String content = emailVo.getContent();
/**
* 发送

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

@ -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;