From 296fc0dbd38fb9528c9d1f91ec9bc3758e27e994 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 19:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
index 7d16eae..eb36ce5 100644
--- a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
@@ -1,6 +1,7 @@
 package com.doumee.core.utils;
 
 import com.google.zxing.common.BitMatrix;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -21,6 +22,7 @@
 import java.math.RoundingMode;
 import java.net.URL;
 
+@Slf4j
 public class GeneratePicUtil {
 
     static String bg="https://shoeslxkj.oss-cn-beijing.aliyuncs.com/file/20230404/SysBaseBackGround/D56231512C0B4A4C9D06B02F9566B0B0.png";
@@ -391,14 +393,22 @@
         }return null;
     }
     private static BufferedImage getImgIO(InputStream is) {
+        if(is ==null){
+          log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖");
+        }else{
+
+            log.error("=============================qrcode okay 灏忕▼搴忕爜鏈夋湁鏁告摎");
+        }
         try {
              return     ImageIO.read(is);
         }catch (Exception e){
+            log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖11111111111:"+e.getMessage());
 
-        }return null;
+        }
+        return null;
     }
 
-    public static InputStream generateShareImg(String imgurl, InputStream mpCode, String title) {
+    public static InputStream generateShareImg(String imgurl, InputStream mpCode1, String title) {
 
         BufferedImage bi =  new BufferedImage(750, 976, BufferedImage.TYPE_INT_RGB);
         //寰楀埌瀹冪殑缁樺埗鐜(杩欏紶鍥剧墖鐨勭瑪)
@@ -438,8 +448,9 @@
         g2.drawString("鏌ョ湅鏇村绮惧僵鍐呭", 40,820+th);
 
 
-        BufferedImage img3 = getImgIO(mpCode);
+        BufferedImage img3 = getImgIO(mpCode1);
         if(img3!=null){
+            g2.setColor(Color.white);
             g2.drawImage(img3, 530, 736, 180, 180, null);
         }
         InputStream inputStream = bufferedImageToInputStream(bi);
@@ -529,16 +540,15 @@
             g2.drawImage(setRadius(img1,img1.getWidth(),0,0), (int)(20*rate), (int)(h-68*rate), (int)(48*rate) ,(int)(48*rate), null);
         }
 
-        Font font =new Font("榛戜綋", Font.PLAIN, (int)(28 * rate));
-        FontMetrics fontMetrics = g2.getFontMetrics(font);
-        int textWidth = fontMetrics.stringWidth(name);
-
+        g2.setColor(Color.white);
+        g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(28 * rate)));
+        g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
+        Font font =new Font("榛戜綋", Font.PLAIN, (int)(24 * rate));
         g2.setColor(Color.white);
         g2.setFont(font);
-        g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
-        g2.setColor(Color.white);
-        g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(24* rate)));
-        g2.drawString("鎵弿鐪嬫洿澶�", (int)(w -(textWidth+30*rate)),h-(int)(rate*(50-th)));
+        FontMetrics fontMetrics = g2.getFontMetrics(font);
+        int textWidth = fontMetrics.stringWidth("鎵爜鐪嬫洿澶�");
+        g2.drawString("鎵爜鐪嬫洿澶�", (int)(w -(textWidth+20*rate)),h-(int)(rate*(50-th)));
 
         BufferedImage img3 = getImgIO(mpCode);
         if(img3!=null){

--
Gitblit v1.9.3