From 8c04d27e5cebb7e654c208533e9567c4df2c8acc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:21:44 +0800
Subject: [PATCH] 券时间限制
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java | 110 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 49 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 119389b..8fa984d 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
@@ -21,6 +21,7 @@
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.UserInviteUtil;
@Service
public class QrCodeServiceImpl implements QrCodeService {
@@ -42,7 +43,7 @@
String targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";
String erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";
- String erCode = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ String erCode = ("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
// 鐢熸垚
try {
@@ -91,7 +92,7 @@
String targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";
String erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";
- String erCode = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ String erCode = ("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
// 鐢熸垚
try {
@@ -131,21 +132,21 @@
}
return null;
}
-
-
+
@Override
- public String drawInviteQrCodeNew(String url, Long uid, String portrait, String inviteCode) throws IOException {
-
+ public String drawInviteQrCodeNew(String url, Long uid, String portrait, Integer pX, Integer pY, Integer size,
+ String inviteCode) throws IOException {
+
if (StringUtil.isNullOrEmpty(url)) {
return null;
}
-
+
String targetPath = null;
String erCodeTempPath = null;
- InputStream erCodeInputStream = null; // 浜岀淮鐮�
+ InputStream erCodeInputStream = null; // 浜岀淮鐮�
InputStream portraitInputStream = null; // 澶村儚
InputStream urlInputStream = HttpUtil.getAsInputStream(url); // 鑳屾櫙
-
+
String uuid = UUID.randomUUID().toString().replace("-", "");
if (uid == null) {
targetPath = FileUtil.getCacheDir() + "/share_" + uuid + "_" + System.currentTimeMillis() + ".jpg";
@@ -155,67 +156,74 @@
erCodeInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official.png");
// 瀹樻柟榛樿澶村儚
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";
-
- String erCode = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
- + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
+
+ String erCode = UserInviteUtil.getShareUrl(uid);
// 鐢熸垚
try {
QRCodeUtil.getInstance(250).encode(erCode, erCodeTempPath);
} catch (Exception e) {
e.printStackTrace();
}
-
+
urlInputStream = HttpUtil.getAsInputStream(url); // 鑳屾櫙
portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
erCodeInputStream = new FileInputStream(new File(erCodeTempPath)); // 浜岀淮鐮�
}
- // 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
- ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode);
+ // 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
+ ImageUtil.inviteFriendImgWhitecustom(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, pX, pY,
+ size, inviteCode);
+
+ // 鍒犻櫎浜岀淮鐮佹枃浠�
+ if (erCodeInputStream != null) {
+ erCodeInputStream.close();
+ }
+ if (erCodeTempPath != null && new File(erCodeTempPath).exists()) {
+ new File(erCodeTempPath).delete();
+ }
+
+ // 涓婁紶鏂囦欢鐩稿浣嶇疆
if (new File(targetPath).exists() && new File(targetPath).length() > 0) {
-
int index = url.lastIndexOf("/");
String newUrl = url.substring(index + 1);
String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));
-
- String fileUrl= null;
+ String fileUrl = null;
if (uid == null) {
- fileUrl= "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
} else {
-
fileUrl = "ercode/" + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
- if (new File(erCodeTempPath).exists())
- new File(erCodeTempPath).delete();
}
-
+
+ // 涓婁紶鏂囦欢
String imgUrl = COSManager.getInstance().uploadFile(new File(targetPath), fileUrl).getUrl();
- if (new File(targetPath).exists())
- new File(targetPath).delete();
+
+ // 鍒犻櫎鏈湴缂撳瓨鏂囦欢
+ new File(targetPath).delete();
return imgUrl;
}
return null;
}
-
+
@Override
- public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content,
- Date date) throws IOException {
-
+ public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content, Date date)
+ throws IOException {
+
if (StringUtil.isNullOrEmpty(url)) {
return null;
}
String targetPath = null;
String erCodeTempPath = null;
- InputStream erCodeInputStream = null; // 浜岀淮鐮�
+ InputStream erCodeInputStream = null; // 浜岀淮鐮�
InputStream portraitInputStream = null; // 澶村儚
InputStream urlInputStream = HttpUtil.getAsInputStream(url); // 鑳屾櫙
-
+
String uuid = UUID.randomUUID().toString().replace("-", "");
if (uid == null) {
targetPath = FileUtil.getCacheDir() + "/share_" + uuid + "_" + System.currentTimeMillis() + ".jpg";
@@ -225,11 +233,11 @@
erCodeInputStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official.png");
// 瀹樻柟榛樿澶村儚
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";
- String erCode = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ String erCode = ("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
// 鐢熸垚
try {
@@ -237,13 +245,21 @@
} catch (Exception e) {
e.printStackTrace();
}
- erCodeInputStream = new FileInputStream(new File(erCodeTempPath));
+ erCodeInputStream = new FileInputStream(new File(erCodeTempPath));
portraitInputStream = HttpUtil.getAsInputStream(portrait); // 澶村儚
}
-
-
+
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
- ImageUtil.drawInviteToGreet(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode, content, date);
+ ImageUtil.drawInviteToGreet(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode,
+ content, date);
+
+ // 鍒犻櫎浜岀淮鐮佹枃浠�
+ if (erCodeInputStream != null) {
+ erCodeInputStream.close();
+ }
+ if (erCodeTempPath != null && new File(erCodeTempPath).exists()) {
+ new File(erCodeTempPath).delete();
+ }
// 涓婁紶鏂囦欢
if (new File(targetPath).exists() && new File(targetPath).length() > 0) {
@@ -252,24 +268,20 @@
String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl= null;
+ String fileUrl = null;
if (uid == null) {
- fileUrl= "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
+ fileUrl = "ercode/" + "ercode_" + uuid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
} else {
-
fileUrl = "ercode/" + "ercode_" + uid + "_" + System.currentTimeMillis() + "_" + urlMd5 + ".jpg";
- if (new File(erCodeTempPath).exists())
- new File(erCodeTempPath).delete();
}
+ // 涓婁紶
String imgUrl = COSManager.getInstance().uploadFile(new File(targetPath), fileUrl).getUrl();
-
- if (new File(targetPath).exists())
- new File(targetPath).delete();
+ // 鍒犻櫎缂撳瓨鏂囦欢
+ new File(targetPath).delete();
return imgUrl;
- }
-
+ }
return null;
}
--
Gitblit v1.8.0