From a00482d5d7ad4a29532779a696fc5ceffa99c138 Mon Sep 17 00:00:00 2001
From: runphp <runphp@qq.com>
Date: Fri, 11 Feb 2022 15:46:11 +0800
Subject: [PATCH] Condition 'DEFAULT_MAX_SIZE != -1' is always 'true'
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 ae55945..5e87091 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 文件名太长
@@ -123,15 +116,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 +162,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