From aad58640dcaab7bed4f9720b57bb7f0cc2c4e343 Mon Sep 17 00:00:00 2001
From: Sxile <3440626@qq.com>
Date: 星期五, 17 七月 2020 11:10:14 +0800
Subject: [PATCH] 翻转""为equals调用方，防止空指针异常
---
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
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..2003743 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 发送GET方法的请求
+ *
+ * @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)
{
@@ -104,7 +118,7 @@
StringBuilder result = new StringBuilder();
try
{
- String urlNameString = url + "?" + param;
+ String urlNameString = url;
log.info("sendPost - {}", urlNameString);
URL realUrl = new URL(urlNameString);
URLConnection conn = realUrl.openConnection();
@@ -190,7 +204,7 @@
String ret = "";
while ((ret = br.readLine()) != null)
{
- if (ret != null && !ret.trim().equals(""))
+ if (ret != null && !"".equals(ret.trim()))
{
result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
}
--
Gitblit v1.9.2