From 2c81a68b6162482637ebb5726df0b227a9d616f5 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 10 十月 2023 18:51:50 +0800
Subject: [PATCH] 237846
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 b1a5698..3e9f99a 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
@@ -54,11 +54,11 @@
* @return 鏂囦欢鍚嶇О
* @throws Exception
*/
- public static final String upload(MultipartFile file) throws IOException
+ public static final String upload(MultipartFile file,String fname) throws IOException
{
try
{
- return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION,fname);
}
catch (Exception e)
{
@@ -74,11 +74,11 @@
* @return 鏂囦欢鍚嶇О
* @throws IOException
*/
- public static final String upload(String baseDir, MultipartFile file) throws IOException
+ public static final String upload(String baseDir, MultipartFile file,String fname) throws IOException
{
try
{
- return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION,fname);
}
catch (Exception e)
{
@@ -98,7 +98,7 @@
* @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃�
* @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父
*/
- public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension,String fname)
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
InvalidExtensionException
{
@@ -110,7 +110,7 @@
assertAllowed(file, allowedExtension);
- String fileName = extractFilename(file);
+ String fileName = extractFilename(file,fname);
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
file.transferTo(Paths.get(absPath));
@@ -120,8 +120,11 @@
/**
* 缂栫爜鏂囦欢鍚�
*/
- public static final String extractFilename(MultipartFile file)
+ public static final String extractFilename(MultipartFile file,String fname)
{
+ if (StringUtils.isNotEmpty(fname)){
+ return fname+'.'+getExtension(file);
+ }
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
}
--
Gitblit v1.9.1