From 81a2c8e297787cc7dc405d6db4972cb917cd80b5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 一月 2020 16:50:57 +0800
Subject: [PATCH] 无用代码删除,单品分享接口修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index a3b21f9..edf39f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -6,6 +6,7 @@
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,7 @@
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.hibernate.cache.spi.NaturalIdCacheKey;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -1073,23 +1075,18 @@
 		return tg;
 	}
 
-	public static TaoBaoGoodsBrief getTaoBaoGoodsBrief(String id) {
-		Map<String, String> params = new HashMap<String, String>();
-		params.put("q", String.format("http://item.taobao.com/item.htm?id=%s", id));
-		params.put("_t", System.currentTimeMillis() + "");
-		params.put("auctionTag", "");
-		params.put("perPageSize", 40 + "");
-		params.put("t", System.currentTimeMillis() + "");
-		String result = TaoBaoHttpUtil.get(SEARCH_URL, params);
-		result = result.replace("</span>", "").replace("<span class=H>", "");
-		TaoBaoSearchResult presult = parseTaoBao(result);
-		if (presult != null && presult.getTaoBaoGoodsBriefs().size() > 0) {
-			// TaoBaoGoodsBrief taoBaoGoodsBrief =
-			// presult.getTaoBaoGoodsBriefs().get(0);
-
-			return presult.getTaoBaoGoodsBriefs().get(0);
-		} else
-			return null;
+	/**
+	 * 鑾峰彇鏈弬涓庢帹骞跨殑娣樺疂鍟嗗搧璇︽儏
+	 * @Title: getTaoBaoGoodsBrief
+	 * @Description: 
+	 * @param id
+	 * @return 
+	 * TaoBaoGoodsBrief 鍖呭惈锛堟爣棰樹笌鍥剧墖锛�
+	 * @throws
+	 */
+	public static TaoBaoGoodsBrief getTaoBaoGoodsBriefNotInPub(Long id) {
+		TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(id+"");
+		return tb;
 	}
 
 	public static List<String> getSuguestSearch(String key) {
@@ -2137,7 +2134,17 @@
 	 * @throws
 	 */
 	public static List<String> getTokenListFromText(String str) {
-		String pattern = "(鈧硔1}[A-Za-z0-9]+鈧硔1})|(楼{1}[A-Za-z0-9]+楼{1})|(锟1}[A-Za-z0-9]+锟1})|(鈧瑊1}[A-Za-z0-9]+鈧瑊1})";
+		String[] marks = new String[] { "鈧�", "楼", "锟�", "鈧�", "\\$", "鈧�", "垄", "鈧�" };
+
+		return getTokenListFromText(str, Arrays.asList(marks));
+	}
+
+	public static List<String> getTokenListFromText(String str, List<String> markList) {
+		List<String> expressList = new ArrayList<>();
+		for (String st : markList) {
+			expressList.add(String.format("(%s{1}[A-Za-z0-9]{11,13}+%s{1})", st, st));
+		}
+		String pattern = StringUtil.concat(expressList, "|");
 		Pattern r = Pattern.compile(pattern);
 		Matcher m = r.matcher(str);
 		List<String> urlList = new ArrayList<>();

--
Gitblit v1.8.0