From f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 18 五月 2020 16:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index d8abe36..e9613d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -644,9 +644,9 @@
continue;
}
// 璺宠浆杩囨浮椤�
- String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
- jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
- evaluateNew.setJumpLink(jumpLink);
+ //String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
+ //jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
+ //evaluateNew.setJumpLink(jumpLink);
// 鍥剧墖鏁伴噺
if (evaluateNew.getImgList() != null && evaluateNew.getImgList().size() > 0) {
@@ -1262,6 +1262,12 @@
comment = shareInfo.getComment();
}
}
+
+ if (!StringUtil.isNullOrEmpty(comment)) { // 鏇挎崲娣樺疂瀹樻柟娲诲姩
+ List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(comment);
+ for (String st : activityIdList)
+ comment = comment.replace(st, "");
+ }
JSONObject data = new JSONObject();
data.put("title", title);
--
Gitblit v1.8.0