From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
index 65040f8..bbde1c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
@@ -60,6 +60,12 @@
InputStream portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
InputStream erCodeInputStream = new FileInputStream(new File(erCodeTempPath)); // 浜岀淮鐮�
+ // 瀹樻柟榛樿澶村儚
+ if (portraitInputStream == null) {
+ portraitInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_icon.png");
+ }
+
+
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode);
@@ -109,6 +115,11 @@
InputStream portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
InputStream erCodeInputStream = new FileInputStream(new File(erCodeTempPath)); // 浜岀淮鐮�
+ // 瀹樻柟榛樿澶村儚
+ if (portraitInputStream == null) {
+ portraitInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_icon.png");
+ }
+
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath,
erCodePostionX, erCodePostionY, erCodeSize, inviteCode);
@@ -161,7 +172,6 @@
portraitInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_icon.png");
} else {
-
targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";
erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";
@@ -175,7 +185,13 @@
portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
erCodeInputStream = new FileInputStream(new File(erCodeTempPath)); // 浜岀淮鐮�
}
-
+
+ // 瀹樻柟榛樿澶村儚
+ if (portraitInputStream == null) {
+ portraitInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_icon.png");
+ }
+
+
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
ImageUtil.inviteFriendImgWhitecustom(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, pX, pY,
size, inviteCode);
@@ -247,6 +263,11 @@
portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
}
+ // 瀹樻柟榛樿澶村儚
+ if (portraitInputStream == null) {
+ portraitInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_icon.png");
+ }
+
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
ImageUtil.drawInviteToGreet(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode,
content, date);
@@ -286,7 +307,8 @@
@Override
- public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode, GoodsDetailVO goods) {
+ public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode,
+ String mainPic, GoodsDetailVO goods) {
// 浜岀淮鐮佹祦
InputStream erCodeStream = null;
try {
@@ -309,7 +331,7 @@
}
// 鐢诲浘
- InputStream drawStream = ImageUtil.drawGoodsPoster(erCodeStream, portraitStream,inviteCode, goods);
+ InputStream drawStream = ImageUtil.drawGoodsPoster(erCodeStream, portraitStream,inviteCode,mainPic, goods);
// 涓婁紶浣嶇疆
String uuid = UUID.randomUUID().toString().replace("-", "");
String upPath = FilePathEnum.shareGoods.getPath() + uuid + "_" + goods.getGoodsId() + "_" + System.currentTimeMillis() + ".png";
--
Gitblit v1.8.0