From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 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 ac9fdd0..4cced74 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
@@ -1664,6 +1664,56 @@
 	}
 
 	/**
+	 * 
+	 * @param auctionId
+	 * @return
+	 */
+
+	public static List<ImageInfo> getTBDetailImageWithSizev2(Long auctionId) {
+		List<ImageInfo> imgList = new ArrayList<>();
+		try {
+			String url = String.format("https://hws.m.taobao.com/cache/desc/5.0?id=" + auctionId);
+			String result = HttpUtil.get(url);
+			JSONObject data = JSONObject.fromObject(result);
+
+			JSONArray array = data.optJSONObject("wdescContent").optJSONArray("pages");
+			if (array != null) {
+				String html = "";
+				for (int i = 0; i < array.size(); i++) {
+					String itemStr = array.optString(i).replace("<img", "<a").replace("</img>", "<a>");
+					html += itemStr;
+				}
+				Document doc = Jsoup.parse(html);
+				Elements items = doc.getElementsByTag("a");
+				for (int i = 0; i < items.size(); i++) {
+					ImageInfo img = new ImageInfo();
+					Element item = items.get(i);
+					if (StringUtil.isNullOrEmpty(item.ownText()))
+						continue;
+					if (!StringUtil.isNullOrEmpty(item.attr("size"))) {
+						img.setWidth(Integer.parseInt(item.attr("size").split("x")[0]));
+						img.setHeight(Integer.parseInt(item.attr("size").split("x")[1]));
+					}
+					if (item.ownText().startsWith("http"))
+						img.setPicture(item.ownText().trim());
+					else
+						img.setPicture("http:" + item.ownText().trim());
+					imgList.add(img);
+				}
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+		return imgList;
+	}
+
+	/**
 	 * 闃块噷鐧惧窛杞摼鎺ュ彛锛堟殏鏃舵棤娉曚娇鐢級
 	 * 
 	 * @param auctionId

--
Gitblit v1.8.0