diff --git a/pom.xml b/pom.xml
index 33c06255..0c0dbc3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,6 @@
velocity-engine-core
${velocity.version}
-
commons-collections
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index e8d0b5d4..c39e1ca8 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -137,7 +137,13 @@
cn.hutool
hutool-http
- 5.3.3
+ 5.8.16
+
+
+
+ cn.hutool
+ hutool-core
+ 5.8.16
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 d9f2b138..b0d335d3 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
@@ -3,7 +3,12 @@ package com.ruoyi.common.utils.file;
import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
+
+import cn.hutool.core.img.ImgUtil;
+import cn.hutool.core.io.FileUtil;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
@@ -114,9 +119,42 @@ public class FileUploadUtils
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
file.transferTo(Paths.get(absPath));
+ makeMiniImage(absPath);
return getPathFileName(baseDir, fileName);
}
+ private static void makeMiniImage(String absPath) {
+ try {
+ String ext = FileUtils.getFileExt(absPath).toLowerCase();
+ String exts = Arrays.toString(new String[]{"jpg", "jpeg", "png", "bmp"});
+ if (exts.contains(ext)) {
+ if (new File(absPath).exists()) {
+ int w = ImgUtil.read(FileUtil.file(absPath)).getWidth();
+ if(w>2000) {
+ ImgUtil.scale(FileUtil.file(absPath),
+ FileUtil.file(absPath), (float) (2000.0 / w));
+ }
+ ImgUtil.scale(FileUtil.file(absPath),
+ FileUtil.file(absPath + ".min.jpg"), (float) (300.0 / w));
+ }
+ }
+ }catch (Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+
+ List list= FileUtil.loopFiles("D:/hahaprj/tmp");
+ for(File f :list){
+ System.out.println(f.getAbsolutePath());
+ makeMiniImage(f.getAbsolutePath());
+ }
+
+ //String f="D:\\hahaprj\\tmp\\2023\\07\\30\\840_20230730152314A005.jpg";
+ //makeMiniImage(f);
+ }
+
/**
* 编码文件名
*/