图片添加水印

src/main/java/com/poteviohealth/cgp/statistics/utils/OssUtils.java

@@ -9,10 +9,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Base64;
-
 /**
  * 阿里云图片上传工具类
  * @author Qin
@@ -36,15 +32,11 @@ public class OssUtils {
     @Value("${aliyun.oss.dir}")
     private String dir;
 
-    private InputStream base64ToInputStream(String base64String) {
-        byte[] bytes = Base64.getDecoder().decode(base64String);
-        return new ByteArrayInputStream(bytes);
-    }
-
     public VaultsResponse<String> uploadOneFile(MultipartFile dto,Long orderId) {
         // 创建OSSClient实例。
         OSS ossClient = new OSSClientBuilder().build(endPoint, accessKeyId, secretAccessKey);
         try {
+            log.info("fileName==="+dto.getOriginalFilename());
             //设置文件名
                 Integer pos = dto.getOriginalFilename().lastIndexOf('.');
                 String suffix = "";

src/main/java/com/poteviohealth/cgp/statistics/utils/Watermark.java

@@ -170,7 +170,9 @@ public class Watermark {
             ByteArrayOutputStream bo = new ByteArrayOutputStream();
             ImageIO.write(addWatermark(url, textWatermark), "jpg", bo );
             //转换为MultipartFile
-            MultipartFile multipartFile = new MockMultipartFile("test.jpg", bo.toByteArray());
+            String orgName = imageConfig.getUrl().split("/")[imageConfig.getUrl().split("/").length-1];
+
+            MultipartFile multipartFile = new MockMultipartFile(orgName.split("\\.")[0],orgName,imageConfig.getType(), bo.toByteArray());
             return multipartFile;
         } catch (Exception e) {
             e.printStackTrace();