From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
index 3b9e37a..531bb10 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
@@ -2,7 +2,9 @@
import com.sandu.ximon.admin.utils.request.CommonHeader;
import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -12,6 +14,10 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
public class VnnoxRequestUtil {
@@ -35,33 +41,59 @@
return result;
}
- public static String GetWithHeader (String url, String params, CommonHeader header) {
- CloseableHttpClient client = HttpClients.createDefault();
- HttpGet get = new HttpGet(url);
- for(String key: header.keySet()) {
- get.setHeader(key, header.get(key));
- }
- String result = null;
- try {
- StringEntity s = new StringEntity(params, UTF8);
- s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
- "application/json"));
- HttpResponse httpResponse = client.execute(get);
- InputStream inStream = httpResponse.getEntity().getContent();
+// public static String GetWithHeader (String url, String params, CommonHeader header) {
+// CloseableHttpClient client = HttpClients.createDefault();
+// HttpGet get = new HttpGet(url);
+// for(String key: header.keySet()) {
+// get.setHeader(key, header.get(key));
+// }
+// String result = null;
+// try {
+// StringEntity s = new StringEntity(params, UTF8);
+// s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
+// "application/json"));
+// HttpResponse httpResponse = client.execute(get);
+// InputStream inStream = httpResponse.getEntity().getContent();
+//
+// result = streamToString(inStream, UTF8);
+//
+// inStream.close();
+// } catch (Exception e) {
+// return null;
+// }
+// return result;
+// }
+public static String GetWithHeader (String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {
- result = streamToString(inStream, UTF8);
- inStream.close();
- } catch (Exception e) {
- return null;
- }
- return result;
+ URI finalURI = new URIBuilder(url).setParameters(urlParameters).build();
+ CloseableHttpClient client = HttpClients.createDefault();
+ HttpGet get = new HttpGet(finalURI);
+ for(String key: header.keySet()) {
+ get.setHeader(key, header.get(key));
}
+ String result = null;
+ try {
+// StringEntity s = new StringEntity(params, UTF8);
+// s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
+// "application/json"));
+ HttpResponse httpResponse = client.execute(get);
+ InputStream inStream = httpResponse.getEntity().getContent();
+ result = streamToString(inStream, UTF8);
+
+ inStream.close();
+ } catch (Exception e) {
+ return null;
+ }
+ return result;
+}
public static String PostWithHeader (String URL, String json, CommonHeader header) {
+ System.out.println(json);
+ System.out.println("****************************************");
CloseableHttpClient client = HttpClients.createDefault();
HttpPost post = new HttpPost(URL);
for(String key: header.keySet()) {
@@ -80,6 +112,7 @@
inStream.close();
} catch (Exception e) {
+ System.out.println("error" + e.getMessage());
return null;
}
return result;
--
Gitblit v1.9.3