From 28cd97d04c68bd8c5fd4adf7780200f61da13654 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 20 九月 2019 14:39:36 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 utils/src/main/java/org/yeshi/utils/HttpUtil.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/HttpUtil.java b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
index 98cf891..336e675 100644
--- a/utils/src/main/java/org/yeshi/utils/HttpUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
@@ -70,24 +70,30 @@
 
 	private static String getShortLink1(String url) {
 		try {
-			String totalUrl = String.format("http://api.suolink.cn/api.php?url=%s", URLEncoder.encode(url));
+			String totalUrl = String.format(
+					"http://suo.im/api.htm?format=json&url=%s&key=5d7728078e676d45275f816b@681bb0446f1e6af4f8fc6ce3cad2a684",
+				URLEncoder.encode(url));
 			String result = get(totalUrl, null);
-			if (!StringUtil.isNullOrEmpty(result) && result.startsWith("http"))
-				return result.trim();
+			System.out.println(result);
+			try {
+				JSONObject json = JSONObject.fromObject(result);
+				return json.optString("url");
+			} catch (Exception e) {
+			}
 		} catch (Exception e) {
-			return url;
 		}
 		return null;
 	}
 
+	//鎼滅嫄缃戝潃
 	private static String getShortLink2(String url) {
 		try {
 			String totalUrl = String.format(
-					"http://api.t.sina.com.cn/short_url/shorten.json?source=3403499693&url_long=%s",
-					URLEncoder.encode(url));
+					"https://sohu.gg/api/?key=2zumZxsL8MuX&url=%s",
+					URLEncoder.encode(url,"UTF-8"));
 			String result = get(totalUrl, null);
-			JSONObject data = JSONArray.fromObject(result).optJSONObject(0);
-			return data.optString("url_short");
+			if(result!=null&&result.startsWith("http"))
+				return result;
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

--
Gitblit v1.8.0