From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +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 | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/HttpUtil.java b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
index cafc9f0..cd6654a 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,13 +59,13 @@
}
public static String getShortLink(String url) {
- return url;
- // String shortLink = getShortLink3(url);
- // if (StringUtil.isNullOrEmpty(shortLink))
- // shortLink = getShortLink1(url);
- // if (StringUtil.isNullOrEmpty(shortLink))
- // shortLink = getShortLink2(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) {
@@ -102,12 +101,11 @@
private static String getShortLink3(String url) {
try {
- String totalUrl = String.format(
- "http://api.ft12.com/api.php?format=json&url=%s&apikey=Lqh4eXURkvKhbboXwz@ddd",
+ String totalUrl = String.format("http://h5.flq001.com/short/createShort?url=%s",
URLEncoder.encode(url, "UTF-8"));
String result = get(totalUrl, null);
JSONObject data = JSONObject.fromObject(result);
- return data.optString("url");
+ return data.optString("short_url");
} catch (Exception e) {
e.printStackTrace();
}
@@ -585,4 +583,25 @@
return result;
}
+
+
+
+ /**
+ * 鑾峰彇post杩斿洖location
+ * @param url
+ * @return
+ */
+ public static String getLocation(String url) {
+ HttpClient client = new HttpClient();
+ PostMethod method = new PostMethod(url);
+ try {
+ client.executeMethod(method);
+ return method.getResponseHeader("location").getValue();
+ } catch (HttpException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0