From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 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 d3de45c..52acf3f 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
@@ -12,16 +12,20 @@
import org.springframework.stereotype.Service;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.QRCodeUtil;
+import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.UserInviteUtil;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@Service
public class QrCodeServiceImpl implements QrCodeService {
@@ -70,7 +74,7 @@
String imgUrl = COSManager.getInstance()
.uploadFile(new File(targetPath),
- "ercode/" + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg")
+ FilePathEnum.ercode.getPath() + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg")
.getUrl();
if (new File(erCodeTempPath).exists())
@@ -118,8 +122,8 @@
String newUrl = url.substring(index + 1);
String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));
- String imgUrl = COSManager.getInstance()
- .uploadFile(new File(targetPath), "ercode/" + "ercode_" + uid + "_" + urlMd5 + ".jpg").getUrl();
+ String imgUrl = COSManager.getInstance().uploadFile(new File(targetPath),
+ FilePathEnum.ercode.getPath() + "ercode_" + uid + "_" + urlMd5 + ".jpg").getUrl();
if (new File(erCodeTempPath).exists())
new File(erCodeTempPath).delete();
@@ -188,9 +192,9 @@
if (new File(targetPath).exists() && new File(targetPath).length() > 0) {
String fileUrl = null;
if (uid == null) {
- fileUrl = "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = FilePathEnum.ercode.getPath() + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
} else {
- fileUrl = "ercode/" + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = FilePathEnum.ercode.getPath() + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
}
// 涓婁紶鏂囦欢
@@ -264,9 +268,9 @@
// 涓婁紶鏂囦欢鐩稿浣嶇疆
String fileUrl = null;
if (uid == null) {
- fileUrl = "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = FilePathEnum.ercode.getPath() + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
} else {
- fileUrl = "ercode/" + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = FilePathEnum.ercode.getPath() + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
}
// 涓婁紶
@@ -278,5 +282,51 @@
}
return null;
}
+
+
+
+ @Override
+ public FileUploadResult drawGoodsPoster(String erCodeUrl, String portrait, GoodsDetailVO goods) {
+ // 浜岀淮鐮佹祦
+ InputStream erCodeStream = null;
+ try {
+ erCodeStream = QRCodeUtil.getInstance(250).encode(erCodeUrl);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+
+ // 澶村儚
+ InputStream portraitStream = null;
+ if (!StringUtil.isNullOrEmpty(portrait)) {
+ try {
+ portraitStream = HttpUtil.getAsInputStream(portrait);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if (portraitStream == null) {
+ portraitStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_default_head.jpg");
+ }
+
+ // 鐢诲浘
+ InputStream drawStream = ImageUtil.drawGoodsShareSingle(erCodeStream, portraitStream, goods);
+ // 涓婁紶浣嶇疆
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String upPath = FilePathEnum.shareXCX.getPath() + uuid + "_" + goods.getGoodsId() + "_" + System.currentTimeMillis() + ".png";
+ // 涓婁紶鏂囦欢
+ return COSManager.getInstance().uploadInputStream(drawStream, upPath);
+ }
+
+
+ @Override
+ public FileUploadResult drawGoodsPosterXCX(InputStream erCodeStream,UserInfo user, GoodsDetailVO goods) {
+ // 鐢诲浘
+ InputStream drawStream = ImageUtil.drawGoodsShareXCX(erCodeStream, user, goods);
+ // 涓婁紶浣嶇疆
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String upPath = FilePathEnum.shareXCX.getPath() + uuid + "_" + goods.getGoodsId() + "_" + System.currentTimeMillis() + ".png";
+ // 涓婁紶鏂囦欢
+ return COSManager.getInstance().uploadInputStream(drawStream, upPath);
+ }
}
--
Gitblit v1.8.0