From 8665daa7aa863f96d0d8f27c167edae1efc38022 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 31 七月 2026 14:46:19 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index d9f2b13..5ff593f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -102,13 +102,20 @@
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
InvalidExtensionException
{
+ return upload(baseDir, file, allowedExtension, DEFAULT_MAX_SIZE);
+ }
+
+ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension, long maxSize)
+ throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
+ InvalidExtensionException
+ {
int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
{
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
}
- assertAllowed(file, allowedExtension);
+ assertAllowed(file, allowedExtension, maxSize);
String fileName = extractFilename(file);
@@ -158,10 +165,16 @@
public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
throws FileSizeLimitExceededException, InvalidExtensionException
{
+ assertAllowed(file, allowedExtension, DEFAULT_MAX_SIZE);
+ }
+
+ public static final void assertAllowed(MultipartFile file, String[] allowedExtension, long maxSize)
+ throws FileSizeLimitExceededException, InvalidExtensionException
+ {
long size = file.getSize();
- if (size > DEFAULT_MAX_SIZE)
+ if (size > maxSize)
{
- throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+ throw new FileSizeLimitExceededException(maxSize / 1024 / 1024);
}
String fileName = file.getOriginalFilename();
--
Gitblit v1.7.1