From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
index ea2b1cc..1c6eddb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
@@ -560,9 +560,9 @@
 		try {
 			if (engine instanceof Invocable) {
 				Invocable in = (Invocable) engine;
-				String goodsId = in.invokeFunction("getGoodsId", url).toString();
-				if (!StringUtil.isNullOrEmpty(goodsId))
-					return goodsId.trim();
+				Object goodsId = in.invokeFunction("getGoodsId", url);
+				if (goodsId!=null)
+					return goodsId.toString().trim();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

--
Gitblit v1.8.0