From d3bf339bd64d7b7efddc0afdd4beb1866b8b5a04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 21 九月 2024 00:47:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
index 3f990a0..262f747 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
@@ -18,6 +18,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -75,9 +77,9 @@
// 璁惧畾鍙傛暟锛氬鎴风鐨勬�昏繛鎺ユ暟
manager.getParams().setMaxTotalConnections(400);
// 璁剧疆杩炴帴瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
- manager.getParams().setConnectionTimeout(8000);
+ manager.getParams().setConnectionTimeout(30000);
// 璁剧疆璇锋眰璇诲彇瓒呮椂鏃堕棿锛屽崟浣嶏細姣
- manager.getParams().setSoTimeout(8000);
+ manager.getParams().setSoTimeout(30000);
// 璁剧疆浠庤繛鎺ユ睜涓幏鍙栭摼鎺ユ椂闂达紝 鍗曚綅锛氭绉�
manager.getParams().setParameter(HttpClientParams.CONNECTION_MANAGER_TIMEOUT, 8000);
// 浣跨敤杩炴帴姹犳妧鏈垱寤篐ttpClient瀵硅薄
@@ -164,7 +166,7 @@
if (inputStream == null) {
throw new HttpRequestException(RESPONSE_NULL_ERROR_CODE, "鍝嶅簲涓簄ull");
}
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("GB2312")));
StringBuffer stringBuffer = new StringBuffer();
String str = "";
while ((str = reader.readLine()) != null) {
@@ -186,7 +188,7 @@
RESPBODY respBody = JSON.parseObject(respStr, respBodyClass);
rep = new HttpEntity<RESPBODY>(respHeaders, respBody);
} else {
- rep = new HttpEntity<RESPBODY>(respHeaders, (RESPBODY) respStr);
+ rep = new HttpEntity<RESPBODY>(respHeaders, (RESPBODY) new String(respStr.getBytes("ISO8859-1"), StandardCharsets.UTF_8));
}
}
return rep;
--
Gitblit v1.9.3