From 2dbeace45cf38aeb5aeb533068c1eeb0fe12b164 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 23 Aug 2022 16:44:16 +0800 Subject: [PATCH] // add bank --- .../controller/WxMerchantMediaUploadController.java | 3 +-- .../main/java/com/iformall/utils/ImgYwsqhUtil.java | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java index 4490e18a9..7f0fde7d3 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java @@ -156,9 +156,8 @@ public class WxMerchantMediaUploadController extends BaseController { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"生成图片异常"); } try { - InputStream inputStream = new ByteArrayInputStream(bytes); - String url = aliyunOSS.upload(tenantEntity.getTenantId(), ".png", inputStream); + String url = aliyunOSS.upload(tenantEntity.getTenantId(), ".png", new ByteArrayInputStream(bytes)); if(StringUtils.isBlank(url)){ return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"获取图片异常"); } diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index e71bf5cf4..0e0b47e7b 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -38,11 +38,12 @@ public class ImgYwsqhUtil { try { // InputStream backImgUrl = ClassLoader.getSystemResourceAsStream(imgTempPath); -// InputStream backImgUrl = ImgYwsqhUtil.class.getClassLoader().getResourceAsStream(imgTempPath); - ClassPathResource resource = new ClassPathResource(imgTempPath); - InputStream backImgUrl = resource.getInputStream(); + InputStream backImgUrl = ImgYwsqhUtil.class.getClassLoader().getResourceAsStream(imgTempPath); +// ClassPathResource resource = new ClassPathResource(imgTempPath); +// InputStream backImgUrl = resource.getInputStream(); BufferedImage backImg = ImageIO.read(backImgUrl); + backImgUrl.close(); Graphics g = backImg.getGraphics(); Font fTxtBottom = new Font("微软雅黑", Font.PLAIN, 70); @@ -110,8 +111,9 @@ public class ImgYwsqhUtil { ByteArrayOutputStream out = new ByteArrayOutputStream(); ImageIO.write(backImg, "png", out); - - return out.toByteArray(); + byte[] bytes = out.toByteArray(); + out.close(); + return bytes; } catch (Exception e) { e.printStackTrace(); logger.error("生成证书异常", e.getMessage());