Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-17 c3f394fc6d624170d5a0cddff57b7a259fda3f0a

 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();