From 5737c1229b265456415a20c71f12229b941a4629 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 27 九月 2019 00:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
utils/src/main/java/org/yeshi/utils/HttpUtil.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/HttpUtil.java b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
index 336e675..62d8130 100644
--- a/utils/src/main/java/org/yeshi/utils/HttpUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
@@ -44,7 +44,6 @@
import org.apache.http.util.EntityUtils;
import org.yeshi.utils.entity.ProxyIP;
-import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
public class HttpUtil {
@@ -60,11 +59,12 @@
}
public static String getShortLink(String url) {
- String shortLink = getShortLink2(url);
- if (StringUtil.isNullOrEmpty(shortLink))
- shortLink = getShortLink3(url);
+ // return url;
+ String shortLink = getShortLink3(url);
if (StringUtil.isNullOrEmpty(shortLink))
shortLink = getShortLink1(url);
+ if (StringUtil.isNullOrEmpty(shortLink))
+ shortLink = getShortLink2(url);
return shortLink;
}
@@ -72,7 +72,7 @@
try {
String totalUrl = String.format(
"http://suo.im/api.htm?format=json&url=%s&key=5d7728078e676d45275f816b@681bb0446f1e6af4f8fc6ce3cad2a684",
- URLEncoder.encode(url));
+ URLEncoder.encode(url));
String result = get(totalUrl, null);
System.out.println(result);
try {
@@ -85,14 +85,13 @@
return null;
}
- //鎼滅嫄缃戝潃
+ // 鎼滅嫄缃戝潃
private static String getShortLink2(String url) {
try {
- String totalUrl = String.format(
- "https://sohu.gg/api/?key=2zumZxsL8MuX&url=%s",
- URLEncoder.encode(url,"UTF-8"));
+ String totalUrl = String.format("https://sohu.gg/api/?key=2zumZxsL8MuX&url=%s",
+ URLEncoder.encode(url, "UTF-8"));
String result = get(totalUrl, null);
- if(result!=null&&result.startsWith("http"))
+ if (result != null && result.startsWith("http"))
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -102,12 +101,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));
+ String totalUrl = String.format("http://h5.flq001.com/short/createShort?url=%s",
+ 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("short_url");
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0