From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期六, 03 八月 2019 12:13:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index e3cc4e2..a49eb0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -16,7 +16,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -33,6 +32,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.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -57,6 +57,7 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -117,6 +118,8 @@
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
}
+ //鍘婚櫎鍓嶅悗绌烘牸
+ text=text.trim();
if (text.length() > 256) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
@@ -129,17 +132,9 @@
Pattern p = Pattern.compile(URL_REGEX);
Matcher matcher = p.matcher(text);
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
- // 鍟嗗搧璇︽儏
- // 鍙戠幇
- // 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
- if (text.startsWith("銆�") && text.contains("銆�")) {
- int end = text.indexOf("銆�");
- if (end > 2)
- text = text.substring(1, end);
- }
-
- if (NumberUtil.isNumeric(text)) {
- out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佺函鏁板瓧"));
+ String pattern = "^[A-Za-z0-9-]+$";
+ if (Pattern.matches(pattern, text)) {
+ out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
return;
}
@@ -149,6 +144,11 @@
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
}
+
+ if (analysisTaoToken(text, out)) {
+ return;
+ }
+
JSONObject root = new JSONObject();
root.put("type", 2);
@@ -218,6 +218,44 @@
out.print(JsonUtil.loadTrueResult(root));
}
+ private boolean analysisTaoToken(String text, PrintWriter out) {
+ String token = StringUtil.picUpTaoToken(text);
+ if (!StringUtil.isNullOrEmpty(token)) {
+ Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ if (auctionId != null) {
+ TaoBaoGoodsBrief tb = null;
+ try {
+ tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+
+ if (tb != null) {
+ JSONObject data = new JSONObject();
+ JSONObject taoBaoGoodsJSON = new JSONObject();
+ taoBaoGoodsJSON.put("title", tb.getTitle());
+ taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
+ taoBaoGoodsJSON.put("id", tb.getAuctionId());
+ taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
+ taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
+ data.put("goods", taoBaoGoodsJSON);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
+ if (tb.getImgList() == null)
+ tb.setImgList(new ArrayList<>());
+ tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ }
+ data.put("imgs", tb.getImgList());
+ JSONObject root = new JSONObject();
+ root.put("type", 1);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
/**
* 鎼滅储鍊欓�夎瘝
*
--
Gitblit v1.8.0