From 5f60a37d8a76d3d7f99b340f70eb98593d1c9add Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 12 Feb 2022 14:05:33 +0800
Subject: [PATCH] !148 Condition 'DEFAULT_MAX_SIZE != -1' is always 'true' Merge pull request !148 from runphp/N/A
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
index 8c5a198..bf1171a 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -3,7 +3,6 @@
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
@@ -31,12 +30,6 @@
public static final int DEFAULT_FILE_NAME_LENGTH = 100;
/**
- * 资源映射路径 前缀
- */
- @Value("${file.prefix}")
- public String localFilePrefix;
-
- /**
* 根据文件路径上传
*
* @param baseDir 相对应用的基目录
@@ -61,7 +54,7 @@
*
* @param baseDir 相对应用的基目录
* @param file 上传的文件
- * @param extension 上传文件类型
+ * @param allowedExtension 上传文件类型
* @return 返回上传成功的文件名
* @throws FileSizeLimitExceededException 如果超出最大大小
* @throws FileNameLengthLimitExceededException 文件名太长
@@ -93,10 +86,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);
}
private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
@@ -110,7 +100,7 @@
desc.getParentFile().mkdirs();
}
}
- return desc;
+ return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
}
private static final String getPathFileName(String fileName) throws IOException
@@ -123,15 +113,14 @@
* 文件大小校验
*
* @param file 上传的文件
- * @return
* @throws FileSizeLimitExceededException 如果超出最大大小
- * @throws InvalidExtensionException
+ * @throws InvalidExtensionException 文件校验异常
*/
public static final 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);
}
@@ -170,9 +159,9 @@
/**
* 判断MIME类型是否是允许的MIME类型
*
- * @param extension
- * @param allowedExtension
- * @return
+ * @param extension 上传文件类型
+ * @param allowedExtension 允许上传文件类型
+ * @return true/false
*/
public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
{
--
Gitblit v1.9.3