From c07a76d3365e0eface853648816e41d7b8cb2f07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 16 五月 2019 18:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
index deeae3c..7d18465 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -2,6 +2,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -18,9 +19,11 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
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.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
@@ -44,6 +47,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
/**
* 鑾峰彇鍟嗗搧淇℃伅
*
@@ -58,6 +64,7 @@
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()) {// 涓嶅寘鍚摼鎺�
@@ -168,6 +175,18 @@
return;
}
}
+
+ // 鏌ヨ澶ф窐瀹㈡爣棰�
+ List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
+ if (list != null && list.size() > 0) {
+ root.put("type", 2);
+ JSONObject data = new JSONObject();
+ data.put("title", list.get(0).getdTitle());
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return;
+ }
+
out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
return;
}
--
Gitblit v1.8.0