From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 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..37f2d4b 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;
@@ -1073,23 +1074,13 @@
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) {
@@ -2011,14 +2002,14 @@
if (elements.size() >= 0) {
for (int i = 0; i < elements.size(); i++) {
String content = elements.get(i).toString();
- if (content.contains("var _DATA_Mdskip")) {
+ if (content.contains("var _DATA_Detail")) {
content = content.replace("<script>", "");
content = content.replace("</script>", "");
if (content.contains("videoDetail")) {
- content += ";function getData(){ var json={title:_DATA_Mdskip.item.title,pictUrl:_DATA_Mdskip.item.videoDetail.videoThumbnailURL}; return JSON.stringify(json);}";
+ content += ";function getData(){ var json={title:_DATA_Detail.item.title,pictUrl:_DATA_Detail.item.images[0]}; return JSON.stringify(json);}";
} else {
- content += ";function getData(){ var json={title:_DATA_Mdskip.item.title,pictUrl:_DATA_Mdskip.item.videos[0].videoThumbnailURL}; return JSON.stringify(json);}";
+ content += ";function getData(){ var json={title:_DATA_Detail.item.title,pictUrl:_DATA_Detail.item.images[0]}; return JSON.stringify(json);}";
}
ScriptEngineManager manager = new ScriptEngineManager();
@@ -2033,6 +2024,9 @@
taoBaoGoodsBrief = new TaoBaoGoodsBrief();
taoBaoGoodsBrief.setTitle(title.toString());
taoBaoGoodsBrief.setPictUrl(pictUrl.toString());
+ if (!pictUrl.toString().startsWith("http")) {
+ taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize220Img("http:" + pictUrl.toString()));
+ }
}
break;
@@ -2127,17 +2121,41 @@
return false;
}
+ private final static String[] taoTokenSymbols = new String[] { "鈧�-鈧�", "楼-楼", "锟�-锟�", "鈧�-鈧�", "\\$-\\$", "鈧�-鈧�", "垄-垄",
+ "鈧�-鈧�" };
+
/**
- * 浠庢枃鏈腑鎻愬彇娣樺彛浠�
- * @Title: getTokenListFromText
- * @Description:
- * @param str
- * @return
- * List<String> 杩斿洖绫诲瀷
- * @throws
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠� @Title: getTokenListFromText @Description: @param str @return
+ * List<String> 杩斿洖绫诲瀷 @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 = taoTokenSymbols;
+
+ return getTokenListFromText(str, Arrays.asList(marks));
+ }
+
+ /**
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠�(鎷彿鐨勫彛浠や篃绠�)
+ *
+ * @param str
+ * @return
+ */
+ public static List<String> getTokenListFromTextWithKuoHao(String str) {
+ String[] marks = taoTokenSymbols;
+ List<String> list = new ArrayList<>();
+ for (String st : marks)
+ list.add(st);
+ list.add("\\(-\\)");
+ list.add("锛�-锛�");
+ return getTokenListFromText(str, list);
+ }
+
+ 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.split("-")[0], st.split("-")[1]));
+ }
+ String pattern = StringUtil.concat(expressList, "|");
Pattern r = Pattern.compile(pattern);
Matcher m = r.matcher(str);
List<String> urlList = new ArrayList<>();
--
Gitblit v1.8.0