From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改

---
 utils/src/main/java/org/yeshi/utils/HttpUtil.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 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..cafc9f0 100644
--- a/utils/src/main/java/org/yeshi/utils/HttpUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
@@ -60,34 +60,40 @@
 	}
 
 	public static String getShortLink(String url) {
-		String shortLink = getShortLink2(url);
-		if (StringUtil.isNullOrEmpty(shortLink))
-			shortLink = getShortLink3(url);
-		if (StringUtil.isNullOrEmpty(shortLink))
-			shortLink = getShortLink1(url);
-		return shortLink;
+		return url;
+		// String shortLink = getShortLink3(url);
+		// if (StringUtil.isNullOrEmpty(shortLink))
+		// shortLink = getShortLink1(url);
+		// if (StringUtil.isNullOrEmpty(shortLink))
+		// shortLink = getShortLink2(url);
+		// return shortLink;
 	}
 
 	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));
+			String totalUrl = String.format("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();
 		}
@@ -97,11 +103,11 @@
 	private static String getShortLink3(String url) {
 		try {
 			String totalUrl = String.format(
-					"http://api.t.sina.com.cn/short_url/shorten.json?source=2963429064&url_long=%s",
-					URLEncoder.encode(url));
+					"http://api.ft12.com/api.php?format=json&url=%s&apikey=Lqh4eXURkvKhbboXwz@ddd",
+					URLEncoder.encode(url, "UTF-8"));
 			String result = get(totalUrl, null);
-			JSONObject data = JSONArray.fromObject(result).optJSONObject(0);
-			return data.optString("url_short");
+			JSONObject data = JSONObject.fromObject(result);
+			return data.optString("url");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

--
Gitblit v1.8.0