修改代码

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/controller/UploadController.java

@@ -58,6 +58,7 @@ public class UploadController{
         private String styleName = "宋体";
         private Float alpha = 0.5f;
         private Float scaleHight = 320f;
+        private Float scaleWidth = 360f;
         private Color color = Color.WHITE;
         private Integer colorNum;
         private Integer degree = -40;

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/service/UploadService.java

@@ -2,7 +2,6 @@ package com.upyuns.platform.rs.universal.service;
 
 
 import cn.hutool.core.img.ImgUtil;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.upyuns.platform.rs.universal.constant.RedisKey;
 import com.upyuns.platform.rs.universal.controller.UploadController;
@@ -22,12 +21,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.ImageOutputStream;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -90,8 +86,18 @@ public class    UploadService {
 
         //缩略
         BufferedImage bufferedImage = ImgUtil.read(file.getInputStream());
-        Float scale = dto.getScaleHight() / bufferedImage.getHeight();
-        Image newImage = ImgUtil.scale(bufferedImage, scale);
+        Image newImage = null;
+        if(bufferedImage.getHeight() > dto.getScaleHight() && bufferedImage.getWidth() > dto.getScaleWidth()) {
+            Float scale = 1.0f;
+            if(bufferedImage.getHeight() < bufferedImage.getWidth()) {
+                scale = dto.getScaleHight() / bufferedImage.getHeight();
+            }else {
+                scale = dto.getScaleWidth() / bufferedImage.getWidth();
+            }
+            newImage = ImgUtil.scale(bufferedImage, scale);
+        }else {
+            newImage = bufferedImage;
+        }
         //加水印
         Font font = new Font(dto.getStyleName(),dto.getStyle(),dto.getSize());
         //Image newImage2 = ImgUtil.pressText(newImage, dto.getContext(), dto.getColor(), font, dto.getX(), dto.getY(), dto.getAlpha());