From 4f1f0bdbd306e06c88e99408fb9a5a456f38162c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 14 五月 2020 14:27:47 +0800
Subject: [PATCH] 通用http发送方法增加参数 contentType 编码类型
---
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java | 7 ++++++-
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 3 ++-
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 16 +++++++++++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
index bde0d4a..63ea9ed 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -13,7 +13,12 @@
* UTF-8 瀛楃闆�
*/
public static final String UTF8 = "UTF-8";
-
+
+ /**
+ * GBK 瀛楃闆�
+ */
+ public static final String GBK = "GBK";
+
/**
* 閫氱敤鎴愬姛鏍囪瘑
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 4700436..2078240 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -18,6 +18,7 @@
import javax.net.ssl.X509TrustManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.ruoyi.common.constant.Constants;
/**
* 閫氱敤http鍙戦�佹柟娉�
@@ -37,6 +38,19 @@
*/
public static String sendGet(String url, String param)
{
+ return sendGet(url, param, Constants.UTF8);
+ }
+
+ /**
+ * 鍚戞寚瀹� URL 鍙戦�丟ET鏂规硶鐨勮姹�
+ *
+ * @param url 鍙戦�佽姹傜殑 URL
+ * @param param 璇锋眰鍙傛暟锛岃姹傚弬鏁板簲璇ユ槸 name1=value1&name2=value2 鐨勫舰寮忋��
+ * @param contentType 缂栫爜绫诲瀷
+ * @return 鎵�浠ｈ〃杩滅▼璧勬簮鐨勫搷搴旂粨鏋�
+ */
+ public static String sendGet(String url, String param, String contentType)
+ {
StringBuilder result = new StringBuilder();
BufferedReader in = null;
try
@@ -49,7 +63,7 @@
connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
connection.connect();
- in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+ in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
String line;
while ((line = in.readLine()) != null)
{
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index 8402a0d..c36431f 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.RuoYiConfig;
@@ -34,7 +35,7 @@
{
try
{
- String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true");
+ String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
if (StringUtils.isEmpty(rspStr))
{
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
--
Gitblit v1.9.3