From 67443feab8afa7171b31b8ccac94440e52b98f98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
index f071f6f..7ce03fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
@@ -20,6 +20,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -64,7 +65,6 @@
TaoBaoGoodsBrief tb = null;
String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
-
Pattern p = Pattern.compile(URL_REGEX);
Matcher matcher = p.matcher(url);
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
@@ -153,7 +153,15 @@
// 鍟嗗搧璇︽儏
// 鍙戠幇
// 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
- if (text.length() > 50) {
+ if (text.startsWith("銆�") && text.contains("銆�")) {
+ int end = text.indexOf("銆�");
+ if (end > 2)
+ text = text.substring(1, end);
+ }
+
+ LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:"+text);
+
+ if (text.length() > 80) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
}
--
Gitblit v1.8.0