From 26fb0b3e76f52212a2cef49a0bc0b94e7425880c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 10:55:10 +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 | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 15c94e1..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
@@ -395,6 +395,9 @@
private static BufferedImage getImgIO(InputStream is) {
if(is ==null){
log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖");
+ }else{
+
+ log.error("=============================qrcode okay 灏忕▼搴忕爜鏈夋湁鏁告摎");
}
try {
return ImageIO.read(is);
@@ -405,7 +408,7 @@
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);
//寰楀埌瀹冪殑缁樺埗鐜(杩欏紶鍥剧墖鐨勭瑪)
@@ -445,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);
@@ -536,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