From 06a7debe678e7ae30f39c61a7f71a926d52d1ae7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 13 十一月 2018 10:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 ecde4fd..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
@@ -1688,10 +1688,12 @@
 				for (int i = 0; i < items.size(); i++) {
 					ImageInfo img = new ImageInfo();
 					Element item = items.get(i);
-					if (StringUtil.isNullOrEmpty(item.attr("size")))
+					if (StringUtil.isNullOrEmpty(item.ownText()))
 						continue;
-					img.setWidth(Integer.parseInt(item.attr("size").split("x")[0]));
-					img.setHeight(Integer.parseInt(item.attr("size").split("x")[1]));
+					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

--
Gitblit v1.8.0