From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/common/utils/HttpClientUtils.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/common/utils/HttpClientUtils.java b/src/main/java/org/springblade/common/utils/HttpClientUtils.java
index e75f430..8e27f08 100644
--- a/src/main/java/org/springblade/common/utils/HttpClientUtils.java
+++ b/src/main/java/org/springblade/common/utils/HttpClientUtils.java
@@ -100,13 +100,13 @@
/**
* 执行有参GET请求,带请求头
*
- * @param url 请求url
- * @param params 参数
- * @param key 请求头Key
+ * @param url 请求url
+ * @param params 参数
+ * @param key 请求头Key
* @param secretKey 秘钥
* @return
*/
- public static String doGetHeader(String url, String key, String secretKey,Map<String, String> params) {
+ public static String doGetHeader(String url, String key, String secretKey, Map<String, String> params) {
//获取httpclient客户端
CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -120,7 +120,7 @@
if (null != params) {
for (String keys : params.keySet()) {
- builder.addParameter(keys,params.get(keys));
+ builder.addParameter(keys, params.get(keys));
//builder.setParameter(keys, params.get(keys));
}
}
@@ -128,7 +128,7 @@
HttpGet httpGet = new HttpGet(builder.build());
//设置请求头
- httpGet.addHeader(key,secretKey);
+ httpGet.addHeader(key, secretKey);
// 传输的类型
httpGet.addHeader("Content-Type", "application/x-www-form-urlencoded");
//执行Http请求调用
@@ -164,13 +164,13 @@
/**
* 执行有参GET请求,带请求头,接收图片流
*
- * @param url 请求url
- * @param params 参数
- * @param key 请求头Key
+ * @param url 请求url
+ * @param params 参数
+ * @param key 请求头Key
* @param secretKey 秘钥
* @return
*/
- public static String doGetHeaderPictureBase64(String url, String key, String secretKey,Map<String, String> params) {
+ public static String doGetHeaderPictureBase64(String url, String key, String secretKey, Map<String, String> params) {
//获取httpclient客户端
CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -180,12 +180,12 @@
URIBuilder builder = new URIBuilder(url);
if (null != params) {
for (String keys : params.keySet()) {
- builder.addParameter(keys,params.get(keys));
+ builder.addParameter(keys, params.get(keys));
}
}
HttpGet httpGet = new HttpGet(builder.build());
//设置请求头
- httpGet.addHeader(key,secretKey);
+ httpGet.addHeader(key, secretKey);
// 传输的类型
httpGet.addHeader("Content-Type", "application/x-www-form-urlencoded");
//执行Http请求调用
@@ -328,6 +328,7 @@
/**
* post 请求 header 带 秘钥
+ *
* @param url
* @param appKey
* @param appKeyValue
@@ -439,7 +440,6 @@
}
return "";
}
-
//适用于post请求并传送form-data数据（同样适用于post的Raw类型的application-json格式）
@@ -562,6 +562,7 @@
/**
* json body
+ *
* @param url
* @param json
* @return
--
Gitblit v1.9.3