feat: 图片合成 类型

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/DrawImageUtils.java

@@ -5,13 +5,9 @@ import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
 import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
 import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-import com.tencentcloudapi.tcm.v20210413.models.IstioConfig;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.ResourceUtils;
 import org.springframework.util.StopWatch;
 
 import javax.imageio.ImageIO;
@@ -19,14 +15,11 @@ import java.awt.*;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
-import java.util.Random;
 
 /**
  * @Author MUSI
@@ -177,7 +170,7 @@ public class DrawImageUtils {
             g.dispose();
             byte[] bytes = bos.toByteArray();
             log.info("合成之后的大小 {}", bytes.length);
-            CloudFileInfo cloudFileInfo = CloudFileUtil.uploadFile(bytes, "png", CloudFileTypeEnum.IMAGE, factoryCode, CloudFileBusinessOptEnum.HAOBAN_COMMON);
+            CloudFileInfo cloudFileInfo = CloudFileUtil.uploadFile(bytes, "jpg", CloudFileTypeEnum.IMAGE, factoryCode, CloudFileBusinessOptEnum.HAOBAN_COMMON);
             log.info("上传图片结果:{}", JSON.toJSONString(cloudFileInfo));
             stopWatch.stop();
             log.info("处理耗时: {}", stopWatch.prettyPrint());
@@ -217,8 +210,8 @@ public class DrawImageUtils {
         } catch (Exception ex) {
 
         }
-        //String url = "https://jhdm-1251519181.cos.ap-shanghai.myqcloud.com/image/material_content-7c3bc8061ffb4e2694c0e288a1ce176b.jpeg?imageView2/format/jpg/q/50";
-        String url = "https://newdmwltest-1251519181.cos.ap-shanghai.myqcloud.com/image/material_content-bd89447576b5438d8045def2da2c4c0f.jpg?imageView2/format/jpg/q/50";
+        String url = "https://jhdm-1251519181.cos.ap-shanghai.myqcloud.com/image/material_content-7c3bc8061ffb4e2694c0e288a1ce176b.jpeg?imageView2/format/jpg/q/50";
+        //String url = "https://newdmwltest-1251519181.cos.ap-shanghai.myqcloud.com/image/material_content-bd89447576b5438d8045def2da2c4c0f.jpg?imageView2/format/jpg/q/50";
         System.setProperty("gic.module.name", "haoban-manage3-service");
         DrawImageUtils.addWater("jhdm", url, inputStream);
 //        Random random = new Random();