From 34d87784df7535c30ad9dfb7065568820e13ea24 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 13 二月 2022 21:03:21 +0800
Subject: [PATCH] 优化代码
---
src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index afed94d..ef29444 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.constant.Constants;
@@ -15,7 +16,7 @@
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class FileUploadUtils
@@ -89,7 +90,7 @@
*
* @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
* @param file 涓婁紶鐨勬枃浠�
- * @param extension 涓婁紶鏂囦欢绫诲瀷
+ * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
* @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
* @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
* @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
@@ -100,7 +101,7 @@
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
InvalidExtensionException
{
- int fileNamelength = file.getOriginalFilename().length();
+ int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
{
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
@@ -112,8 +113,7 @@
File desc = getAbsoluteFile(baseDir, fileName);
file.transferTo(desc);
- String pathFileName = getPathFileName(baseDir, fileName);
- return pathFileName;
+ return getPathFileName(baseDir, fileName);
}
/**
@@ -121,10 +121,7 @@
*/
public static final String extractFilename(MultipartFile file)
{
- String fileName = file.getOriginalFilename();
- String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
- return fileName;
+ return DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + getExtension(file);
}
public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
@@ -145,8 +142,7 @@
{
int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
- String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
- return pathFileName;
+ return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
}
/**
@@ -161,7 +157,7 @@
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);
}
@@ -219,7 +215,7 @@
/**
* 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
+ *
* @param file 琛ㄥ崟鏂囦欢
* @return 鍚庣紑鍚�
*/
@@ -228,8 +224,8 @@
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
if (StringUtils.isEmpty(extension))
{
- extension = MimeTypeUtils.getExtension(file.getContentType());
+ extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
}
return extension;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3