From c7be2ef037c5aebb0cd8f1f33e5fa934389e6083 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 26 十月 2022 17:51:43 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 84 +++++++++++++++--------------------------
1 files changed, 31 insertions(+), 53 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 4f94eb4..0c2fb67 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
@@ -1,12 +1,13 @@
package com.sandu.ximon.admin.utils;
+import com.alibaba.fastjson.JSON;
import com.sandu.ximon.admin.utils.request.CommonHeader;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
+import org.apache.http.client.methods.HttpGet;
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;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader;
@@ -24,7 +25,7 @@
private static final String UTF8 = "utf-8";
- public static String get(String url){
+ public static String get(String url) {
CloseableHttpClient client = HttpClients.createDefault();
HttpGet get = new HttpGet(url);
String result = null;
@@ -32,7 +33,7 @@
HttpResponse httpResponse = client.execute(get);
InputStream inStream = httpResponse.getEntity().getContent();
- result = streamToString(inStream,UTF8);
+ result = streamToString(inStream, UTF8);
inStream.close();
} catch (Exception e) {
@@ -41,62 +42,38 @@
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 {
+ public static String GetWithHeader(String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {
+
+
+ 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 GetWithHeader (String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {
+ HttpResponse httpResponse = client.execute(get);
+ InputStream inStream = httpResponse.getEntity().getContent();
+ result = streamToString(inStream, UTF8);
- 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));
+ inStream.close();
+ } catch (Exception e) {
+ return null;
+ }
+ return result;
}
- 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);
+ public static String PostWithHeader(String URL, String json, CommonHeader header) {
System.out.println("****************************************");
CloseableHttpClient client = HttpClients.createDefault();
HttpPost post = new HttpPost(URL);
- for(String key: header.keySet()) {
+ for (String key : header.keySet()) {
post.setHeader(key, header.get(key));
}
String result = null;
@@ -107,28 +84,29 @@
post.setEntity(s);
HttpResponse httpResponse = client.execute(post);
InputStream inStream = httpResponse.getEntity().getContent();
+ System.out.println("post: " + JSON.toJSONString(post));
- result = streamToString(inStream,UTF8);
+ result = streamToString(inStream, UTF8);
inStream.close();
} catch (Exception e) {
+ System.out.println("error" + e.getMessage());
return null;
}
return result;
}
-
- public static String streamToString(InputStream in, String encoding){
+ public static String streamToString(InputStream in, String encoding) {
// 灏嗘祦杞崲涓哄瓧绗︿覆
try {
StringBuffer sb = new StringBuffer();
byte[] b = new byte[1024];
- for (int n; (n = in.read(b)) != -1;) {
+ for (int n; (n = in.read(b)) != -1; ) {
sb.append(new String(b, 0, n, encoding));
}
return sb.toString();
- } catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
throw new RuntimeException("鎻愬彇 requestBody 寮傚父", e);
}
--
Gitblit v1.9.3