修改代码

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

@@ -15,6 +15,7 @@ import com.upyuns.platform.rs.universal.utils.ImgBase64Util;
 import com.upyuns.platform.rs.universal.utils.PublicMsg;
 import com.upyuns.platform.rs.universal.vo.Ueditor;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.awt.*;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,6 +48,31 @@ public class UploadController{
     @Autowired
     UploadZipService uploadZipService;
 
+    @Data
+    static public class DisposeDTO {
+        private String context = "人民星云";
+        private Integer size = 36;
+        private Integer x = 0;
+        private Integer y = 0;
+        private Integer style = Font.BOLD;
+        private String styleName = "宋体";
+        private Float alpha = 0.5f;
+        private Float scaleHight = 320f;
+        private Color color = Color.WHITE;
+        private Integer colorNum;
+
+        public void setColorNum(Integer colorNum) {
+            this.colorNum = colorNum;
+            if(1 == colorNum) {
+                this.color = Color.WHITE;
+            }else if (2 == colorNum) {
+                this.color = Color.BLACK;
+            }else if (3 == colorNum) {
+                this.color = Color.GRAY;
+            }
+        }
+    }
+
     @RequestMapping(value = "/app/unauth/upload", method = RequestMethod.POST)
     public JSONObject upload(
             @RequestParam("file") MultipartFile file,
@@ -58,7 +85,8 @@ public class UploadController{
     @RequestMapping(value = "/app/unauth/uploadDispose", method = RequestMethod.POST)
     public JSONObject uploadDispose(
             @RequestParam("file") MultipartFile file,
-            @RequestParam(value = "prefix",defaultValue = "app")String prefix
+            @RequestParam(value = "prefix",defaultValue = "app")String prefix,
+            DisposeDTO dto
     )throws Exception {
         String contentType = file.getContentType();   //图片文件类型
         return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFileDispose(file,prefix));

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

@@ -5,6 +5,7 @@ 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;
 import com.upyuns.platform.rs.universal.utils.ImgBase64Util;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
@@ -72,7 +73,7 @@ public class    UploadService {
      * @param file
      * @return
      */
-    public String uploadFileDispose(MultipartFile file,String prefix) throws Exception{
+    public String uploadFileDispose(MultipartFile file, String prefix, UploadController.DisposeDTO dto) throws Exception{
         //创建本日存放目录
         DateTime now = DateTime.now();
         String dirPathToday = "/"+prefix+ "/" + now.toString(DEFAULT_DATE_TIME_FORMATTER);
@@ -88,11 +89,11 @@ public class    UploadService {
 
         //缩略
         BufferedImage bufferedImage = ImgUtil.read(file.getInputStream());
-        Float scale = 320f / bufferedImage.getHeight();
+        Float scale = dto.getScaleHight() / bufferedImage.getHeight();
         Image newImage = ImgUtil.scale(bufferedImage, scale);
         //加水印
-        Font font = new Font("宋体",Font.BOLD,32);
-        Image newImage2 = ImgUtil.pressText(newImage, "人民星云", Color.WHITE, font, 0, 0, 0.8f);
+        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());
 
         //将文件写入指定位置
         ImgUtil.write(newImage2, new File(filePath));