From f80b8f0d427bb25a750fdd4c57bcf3fdad7bd7fe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 五月 2021 17:58:03 +0800
Subject: [PATCH] update springboot 升级 2.3.11 update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 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 9552d0d..cb4a225 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
@@ -1,21 +1,23 @@
package com.ruoyi.common.utils.file;
-import java.io.File;
-import java.io.IOException;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class FileUploadUtils
@@ -89,7 +91,7 @@
*
* @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
* @param file 涓婁紶鐨勬枃浠�
- * @param extension 涓婁紶鏂囦欢绫诲瀷
+ * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
* @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
* @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
* @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
@@ -123,7 +125,7 @@
{
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+ fileName = DateUtils.datePath() + "/" + IdUtil.fastUUID() + "." + extension;
return fileName;
}
@@ -131,22 +133,20 @@
{
File desc = new File(uploadDir + File.separator + fileName);
- if (!desc.getParentFile().exists())
+ if (!desc.exists())
{
- desc.getParentFile().mkdirs();
+ if (!desc.getParentFile().exists())
+ {
+ desc.getParentFile().mkdirs();
+ }
}
- // 瑙ｅ喅undertow鏂囦欢涓婁紶bug,鍥犲簳灞傚疄鐜颁笉鍚�,鏃犻渶鍒涘缓鏂版枃浠�
-// if (!desc.exists())
-// {
-// desc.createNewFile();
-// }
return desc;
}
private static final String getPathFileName(String uploadDir, String fileName) throws IOException
{
int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
- String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+ String currentDir = StrUtil.subSuf(uploadDir, dirLastIndex);
String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
return pathFileName;
}
@@ -187,6 +187,11 @@
throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
fileName);
}
+ else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+ fileName);
+ }
else
{
throw new InvalidExtensionException(allowedExtension, extension, fileName);
@@ -216,17 +221,17 @@
/**
* 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
+ *
* @param file 琛ㄥ崟鏂囦欢
* @return 鍚庣紑鍚�
*/
public static final String getExtension(MultipartFile file)
{
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- if (StringUtils.isEmpty(extension))
+ if (Validator.isEmpty(extension))
{
extension = MimeTypeUtils.getExtension(file.getContentType());
}
return extension;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3