diff --git a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java index 168ea37c..48678f90 100644 --- a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java +++ b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java @@ -1,11 +1,5 @@ package com.shuili.common.utils; -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; - import com.shuili.common.config.ShuiliConfig; import com.shuili.common.constant.Constants; import com.shuili.common.exception.FileNameLengthLimitExceededException; @@ -13,14 +7,19 @@ import com.shuili.common.exception.FileSizeLimitExceededException; import com.shuili.common.exception.InvalidExtensionException; import com.shuili.common.utils.file.MimeTypeUtils; import com.shuili.common.utils.uuid.IdUtils; +import lombok.Getter; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; /** * 文件上传工具类 * * @author shuili */ -public class FileUploadUtils -{ +public class FileUploadUtils { /** * 默认大小 50M */ @@ -34,18 +33,13 @@ public class FileUploadUtils /** * 默认上传的地址 */ + @Getter private static String defaultBaseDir = ShuiliConfig.getProfile(); - public static void setDefaultBaseDir(String defaultBaseDir) - { + public static void setDefaultBaseDir(String defaultBaseDir) { FileUploadUtils.defaultBaseDir = defaultBaseDir; } - public static String getDefaultBaseDir() - { - return defaultBaseDir; - } - /** * 以默认配置进行文件上传 * @@ -53,14 +47,10 @@ public class FileUploadUtils * @return 文件名称 * @throws Exception */ - public static final String upload(MultipartFile file) throws IOException - { - try - { + public static String upload(MultipartFile file) throws IOException { + try { return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (Exception e) - { + } catch (Exception e) { throw new IOException(e.getMessage(), e); } } @@ -69,18 +59,14 @@ public class FileUploadUtils * 根据文件路径上传 * * @param baseDir 相对应用的基目录 - * @param file 上传的文件 + * @param file 上传的文件 * @return 文件名称 * @throws IOException */ - public static final String upload(String baseDir, MultipartFile file) throws IOException - { - try - { + public static String upload(String baseDir, MultipartFile file) throws IOException { + try { return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (Exception e) - { + } catch (Exception e) { throw new IOException(e.getMessage(), e); } } @@ -88,67 +74,75 @@ public class FileUploadUtils /** * 文件上传 * - * @param baseDir 相对应用的基目录 - * @param file 上传的文件 + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 * @param allowedExtension 上传文件类型 * @return 返回上传成功的文件名 - * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws FileNameLengthLimitExceededException 文件名太长 - * @throws IOException 比如读写文件出错时 - * @throws InvalidExtensionException 文件校验异常 + * @throws IOException 比如读写文件出错时 + * @throws InvalidExtensionException 文件校验异常 */ - public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) + public static String upload(String baseDir, MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, - InvalidExtensionException - { + InvalidExtensionException { int fileNamelength = file.getOriginalFilename().length(); - if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) - { + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) { throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); } assertAllowed(file, allowedExtension); - String fileName = extractFilename(file); + String fileName = file.getOriginalFilename(); + + String localSubPath = DateUtils.datePath() + File.separator + fileName; + + File targetFile = new File(baseDir + File.separator + localSubPath); - File desc = getAbsoluteFile(baseDir, fileName); - file.transferTo(desc); - String pathFileName = getPathFileName(baseDir, fileName); - return pathFileName; + if (!targetFile.getParentFile().exists()) { + targetFile.getParentFile().mkdirs(); + } + if (targetFile.exists()) { + localSubPath = DateUtils.datePath() + File.separator + IdUtils.fastUUID() + File.separator + fileName; + targetFile = new File(baseDir + File.separator + localSubPath); + if (!targetFile.getParentFile().exists()) { + targetFile.getParentFile().mkdirs(); + } + } + targetFile.createNewFile(); + file.transferTo(targetFile); + return Constants.RESOURCE_PREFIX + localSubPath; } /** * 编码文件名 */ - public static final String extractFilename(MultipartFile file) - { + public static String extractFilename(MultipartFile file) { String fileName = file.getOriginalFilename(); String extension = getExtension(file); - fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; - return fileName; + if (StringUtils.isNotBlank(fileName)) { + return DateUtils.datePath() + "/" + fileName; + } else { + return DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; + } } - private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException - { + private static File getAbsoluteFile(String uploadDir, String fileName) throws IOException { File desc = new File(uploadDir + File.separator + fileName); - if (!desc.getParentFile().exists()) - { + if (!desc.getParentFile().exists()) { desc.getParentFile().mkdirs(); } - if (!desc.exists()) - { + if (!desc.exists()) { desc.createNewFile(); } return desc; } - private static final String getPathFileName(String uploadDir, String fileName) throws IOException - { + private static String getPathFileName(String uploadDir, String fileName) throws IOException { int dirLastIndex = ShuiliConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); - String pathFileName = Constants.RESOURCE_PREFIX + currentDir + "/" + fileName; - return pathFileName; + return Constants.RESOURCE_PREFIX + currentDir + "/" + fileName; } /** @@ -159,36 +153,26 @@ public class FileUploadUtils * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws InvalidExtensionException */ - public static final void assertAllowed(MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, InvalidExtensionException - { + public static void assertAllowed(MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException { long size = file.getSize(); - if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE) - { + if (size > DEFAULT_MAX_SIZE) { throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); } String fileName = file.getOriginalFilename(); String extension = getExtension(file); - if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) - { - if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) - { + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) { throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, fileName); - } - else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) - { + } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) { throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, fileName); - } - else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) - { + } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) { throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, fileName); - } - else - { + } else { throw new InvalidExtensionException(allowedExtension, extension, fileName); } } @@ -202,12 +186,9 @@ public class FileUploadUtils * @param allowedExtension * @return */ - public static final boolean isAllowedExtension(String extension, String[] allowedExtension) - { - for (String str : allowedExtension) - { - if (str.equalsIgnoreCase(extension)) - { + public static boolean isAllowedExtension(String extension, String[] allowedExtension) { + for (String str : allowedExtension) { + if (str.equalsIgnoreCase(extension)) { return true; } } @@ -220,11 +201,9 @@ public class FileUploadUtils * @param file 表单文件 * @return 后缀名 */ - public static final String getExtension(MultipartFile file) - { + public static String getExtension(MultipartFile file) { String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - if (StringUtils.isEmpty(extension)) - { + if (StringUtils.isEmpty(extension)) { extension = MimeTypeUtils.getExtension(file.getContentType()); } return extension;