From f3cf05b74840f57f632af858ee27aab1d937cab8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 11:47:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 0a16b62..fc6d2e8 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -25,7 +25,7 @@
/**
* 閫氱敤http鍙戦�佹柟娉�
- *
+ *
* @author ruoyi
*/
public class HttpUtils
@@ -132,7 +132,7 @@
/**
* 鍚戞寚瀹� URL 鍙戦�丳OST鏂规硶鐨勮姹�
- *
+ *
* @param url 鍙戦�佽姹傜殑 URL
* @param param 璇锋眰鍙傛暟
* @param contentType 鍐呭绫诲瀷
@@ -299,7 +299,7 @@
*/
public static String sendPostJson(String url, String jsonParam) {
// 閲嶈浇璋冪敤锛岄粯璁や娇鐢║TF-8缂栫爜锛孋ontent-Type鍥哄畾涓篴pplication/json
- return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),null);
+ return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(), null, "");
}
/**
@@ -311,7 +311,7 @@
*/
public static String sendPostJson(String url, String jsonParam, String headerValue) {
// 閲嶈浇璋冪敤锛岄粯璁や娇鐢║TF-8缂栫爜锛孋ontent-Type鍥哄畾涓篴pplication/json
- return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),headerValue);
+ return sendPostJson(url, jsonParam, StandardCharsets.UTF_8.name(),headerValue,"");
}
/**
@@ -321,7 +321,7 @@
* @param charset 缂栫爜绫诲瀷锛堝UTF-8銆丟BK绛夛紝寤鸿浣跨敤StandardCharsets甯搁噺锛�
* @return 杩滅▼璧勬簮鐨勫搷搴旂粨鏋�
*/
- public static String sendPostJson(String url, String jsonParam, String charset,String headerValue) {
+ public static String sendPostJson(String url, String jsonParam, String charset,String headerValue,String accessToken) {
PrintWriter out = null;
BufferedReader in = null;
StringBuilder result = new StringBuilder();
@@ -340,6 +340,9 @@
if(StringUtils.isNotEmpty(headerValue)){
conn.setRequestProperty("Authorization", headerValue);
}
+ if (StringUtils.isNotEmpty(accessToken)) {
+ conn.setRequestProperty("x-acs-dingtalk-access-token", accessToken);
+ }
// 2. 寮�鍚緭鍏ヨ緭鍑烘祦锛圥OST璇锋眰蹇呴』锛�
conn.setDoOutput(true);
conn.setDoInput(true);
--
Gitblit v1.9.3