From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
utils/src/main/java/org/yeshi/utils/HttpUtil.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/HttpUtil.java b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
index 1ac6855..161c024 100644
--- a/utils/src/main/java/org/yeshi/utils/HttpUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/HttpUtil.java
@@ -10,8 +10,12 @@
import java.net.URL;
import java.net.URLEncoder;
import java.security.KeyStore;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.net.ssl.SSLContext;
@@ -44,10 +48,24 @@
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 {
+
+ public static List<String> getUrlListFromText(String text) {
+ List<String> urlList = new ArrayList<String>();
+ // 閾炬帴
+ String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
+ Pattern p = Pattern.compile(URL_REGEX);
+ Matcher matcher = p.matcher(text);
+ while (matcher.find()) {
+ String url = matcher.group();
+ if (!StringUtil.isNullOrEmpty(url)) {
+ urlList.add(url);
+ }
+ }
+ return urlList;
+ }
public static String getHost(String host) {
try {
@@ -60,11 +78,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 +91,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,15 +104,14 @@
return null;
}
+ // 鎼滅嫄缃戝潃
private static String getShortLink2(String url) {
try {
- String totalUrl = String.format(
- "http://api.t.sina.com.cn/short_url/shorten.json?source=2849184197&url_long=%s", // 3403499693
- 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);
- System.out.println(result);
- 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();
}
@@ -102,12 +120,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();
}
@@ -476,6 +493,24 @@
return "";
}
+ @SuppressWarnings("deprecation")
+ public static String post(String url, String entity, String charset) {
+ HttpClient client = new HttpClient();
+ PostMethod method = new PostMethod(url);
+ method.addRequestHeader("Content-Type", "text/html;charset=" + charset);
+ method.setRequestHeader("Content-Type", "text/html;charset=" + charset);
+ method.setRequestBody(entity);
+ try {
+ client.executeMethod(method);
+ return convertInputStreamToString(method.getResponseBodyAsStream());
+ } catch (HttpException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+
public static String postInputStream(String url, File file) throws FileNotFoundException {
HttpClient client = new HttpClient();
PostMethod postMethod = new PostMethod(url);
@@ -585,4 +620,24 @@
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