From 2dc52e3ba49433a54368c3b64ba3539b4bb051ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 16:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index c2d92e7..7b95163 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -685,6 +685,7 @@
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
auctionId + "");
+
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
@@ -753,7 +754,7 @@
ShareInfoDTO shareInfo = userShareGoodsRecordService.saveShareRecord(uid,
ShareSourceTypeEnum.activity, title, listGoods);
data.put("shareId", shareInfo.getShareId());
- data.put("clickUrl", shareInfo.getCodeUrl());
+ data.put("clickUrl", shareInfo.getShareUrl());
data.put("pictUrl", TbImgUtil.getTBSizeImg(picUrl, 500));
// 甯姪閾炬帴
data.put("helpLink","http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
--
Gitblit v1.8.0