From cc90558133d431c63f4235d719c5e3abd19fef3f Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期三, 11 三月 2020 10:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
index 476c96d..8f5f1b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -248,7 +248,8 @@
* @param goods
* @return
*/
- public static InputStream drawGoodsPoster(InputStream qrcode, InputStream portraitStream, String inviteCode, GoodsDetailVO goods) {
+ public static InputStream drawGoodsPoster(InputStream qrcode, InputStream portraitStream, String inviteCode,
+ String mainPic, GoodsDetailVO goods) {
try {
String fontPath = "/usr/share/fonts/PingFang_Medium.ttf";
String os = System.getProperty("os.name");
@@ -282,7 +283,7 @@
int spacing = 20; // 鍙宠竟璺�
// 1銆佺敾鍟嗗搧涓诲浘
- InputStream picStream = HttpUtil.getAsInputStream(goods.getPicUrl().replace("https://", "http://"));
+ InputStream picStream = HttpUtil.getAsInputStream(mainPic);
// InputStream picStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/share/test_pic1.jpg");
g2d.drawImage(ImageIO.read(picStream), 0, 0, x, y, null);
--
Gitblit v1.8.0