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

yujian

2019-08-28 565c0a03a299de5a619f4d5b5fe593e46dbf35dd

 utils/src/main/java/org/yeshi/utils/HttpUtil.java

@@ -76,15 +76,11 @@
   private static String getShortLink2(String url) {

      try {

         String totalUrl = String.format(

               "https://api.weibo.com/2/short_url/shorten.json?source=3403499693&url_long=%s",

               "http://api.t.sina.com.cn/short_url/shorten.json?source=3403499693&url_long=%s",

               URLEncoder.encode(url));

         String result = get(totalUrl, null);

         JSONObject data = JSONObject.fromObject(result);

         JSONArray array = data.optJSONArray("urls");

         data = array.optJSONObject(0);

         String shortUrl = data.optString("url_short");

         if (!StringUtil.isNullOrEmpty(shortUrl))

            return shortUrl;

         JSONObject data = JSONArray.fromObject(result).optJSONObject(0);

         return data.optString("url_short");

      } catch (Exception e) {

         e.printStackTrace();

      }

@@ -94,15 +90,11 @@
   private static String getShortLink3(String url) {

      try {

         String totalUrl = String.format(

               "https://api.weibo.com/2/short_url/shorten.json?source=2963429064&url_long=%s",

               "http://api.t.sina.com.cn/short_url/shorten.json?source=2963429064&url_long=%s",

               URLEncoder.encode(url));

         String result = get(totalUrl, null);

         JSONObject data = JSONObject.fromObject(result);

         JSONArray array = data.optJSONArray("urls");

         data = array.optJSONObject(0);

         String shortUrl = data.optString("url_short");

         if (!StringUtil.isNullOrEmpty(shortUrl))

            return shortUrl;

         JSONObject data = JSONArray.fromObject(result).optJSONObject(0);

         return data.optString("url_short");

      } catch (Exception e) {

         e.printStackTrace();

      }

@@ -321,7 +313,6 @@
      return null;

   }



	
   public static String postSimple(String url) {

      HttpClient client = new HttpClient();

      PostMethod method = new PostMethod(url);

@@ -335,7 +326,6 @@
      }

      return "";

   }

	
   

   public static String post(String url) {

      HttpClient client = new HttpClient();