Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java

@@ -638,7 +638,7 @@
    * @return

    */

   public static String getJDGoodsIdByWeiXin(String url) {

      if (StringUtil.isNullOrEmpty(url))

      if (StringUtil.isNullOrEmpty(url) || url.indexOf("jd.com") < 0)

         return null;



      try {