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 | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 edf39f4..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
@@ -26,7 +26,6 @@
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;
@@ -1076,16 +1075,11 @@
}
/**
- * 鑾峰彇鏈弬涓庢帹骞跨殑娣樺疂鍟嗗搧璇︽儏
- * @Title: getTaoBaoGoodsBrief
- * @Description:
- * @param id
- * @return
- * TaoBaoGoodsBrief 鍖呭惈锛堟爣棰樹笌鍥剧墖锛�
- * @throws
+ * 鑾峰彇鏈弬涓庢帹骞跨殑娣樺疂鍟嗗搧璇︽儏 @Title: getTaoBaoGoodsBrief @Description: @param
+ * id @return TaoBaoGoodsBrief 鍖呭惈锛堟爣棰樹笌鍥剧墖锛� @throws
*/
public static TaoBaoGoodsBrief getTaoBaoGoodsBriefNotInPub(Long id) {
- TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(id+"");
+ TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(id + "");
return tb;
}
@@ -2008,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();
@@ -2030,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;
@@ -2124,25 +2121,39 @@
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[] marks = new String[] { "鈧�", "楼", "锟�", "鈧�", "\\$", "鈧�", "垄", "鈧�" };
+ 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, st));
+ 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);
--
Gitblit v1.8.0