From e269e1d6de043ebf9d858619559bf270fddbb8be Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 10:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index 19cdcb3..05ab445 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -12,6 +12,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.BigDecimalUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
@@ -74,6 +75,7 @@
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.ImageToBase64;
+import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
@@ -523,7 +525,6 @@
throw new UserCloudException(1, "璇ュ唴瀹瑰寘鍚彲杞摼鍙ｄ护鎴栭摼鎺�");
- String qrCode = null;
ImgInfo imgVideo = null;
List<String> listImg = new ArrayList<>();
@@ -565,26 +566,22 @@
sendContent.setType(UserCloudSendContent.TYPE_CIRCLE);
if (imgVideo == null) {
+ // 鍙戦�佸浘鏂�
String picUrl = "";
- if (!StringUtil.isNullOrEmpty(qrCode))
- picUrl += qrCode;
-
if (listImg.size() > 0) {
for (String img: listImg) {
- picUrl += img + ";" ;
+ picUrl += TbImgUtil.getTBSize220Img(img) + ";" ;
}
+ if (picUrl.endsWith(";"))
+ picUrl = picUrl.substring(0, picUrl.length()-1);
}
-
- if (picUrl.endsWith(";"))
- picUrl = picUrl.substring(0, picUrl.length()-1);
sendContent.setTitle(title);
sendContent.setPicUrl(picUrl);
- // 鍙戦�佸浘鏂�
circleId = AitaokerApiUtil.macsendCircle(robotId, title, picUrl);
} else {
+ // 鍙戦�佽棰�
sendContent.setPicUrl(imgVideo.getUrl());
sendContent.setVideoUrl(imgVideo.getVideoUrl());
- // 鍙戦�佽棰�
circleId = AitaokerApiUtil.macsendCircleVideo(robotId, imgVideo.getVideoUrl(), imgVideo.getUrl());
}
@@ -1093,15 +1090,15 @@
String picUrl = "";
if (listImg.size() > 0) {
for (String img: listImg) {
- picUrl += img + ";" ;
+ picUrl += TbImgUtil.getTBSize220Img(img) + ";" ;
}
}
if (picUrl.endsWith(";"))
picUrl = picUrl.substring(0, picUrl.length()-1);
+
sendContent.setTitle(title);
sendContent.setPicUrl(picUrl);
-
// 鍙戝湀鍐呭
String circleId = AitaokerApiUtil.macsendCircle(robotId, title, picUrl);
// 璇勮鏂囨湰
--
Gitblit v1.8.0