Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java

@@ -83,7 +83,8 @@
      params.put("v", "2.0");

      params.put("timestamp", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));

      params.put("format", "json");

      params.put("adzone_id", app.getAdzoneId());

      if (!StringUtil.isNullOrEmpty(app.getAdzoneId()))

         params.put("adzone_id", app.getAdzoneId());

      params.put("sign", getSign(params, "md5", app).toUpperCase());

      String result = TaoBaoHttpUtil.taoKeGet(params);

      JSONObject data = JSONObject.fromObject(result);