From 24996ea75ec4ca3b7d154387bfe37ec9dd387255 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 29 五月 2025 14:40:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java b/iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java
index ad149fb..343c0f6 100644
--- a/iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java
+++ b/iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java
@@ -1,6 +1,6 @@
package com.iailab.sdk.util.http;
-import com.iailab.sdk.auth.client.IailabAuthClient;
+import com.iailab.sdk.auth.client.IailabClient;
import com.iailab.sdk.auth.config.SdkAutoConfiguration;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -54,7 +54,7 @@
//设置参数
httpGet.addHeader("Accept", "application/json");
httpGet.addHeader("Content-Type", "application/json;charset=UTF-8");
- httpGet.addHeader("Authorization", "Bearer " + IailabAuthClient.accessToken);
+ httpGet.addHeader("Authorization", "Bearer " + IailabClient.accessToken);
httpGet.addHeader("Tenant-Id", SdkAutoConfiguration.TENANT_ID.toString());
HttpResponse response = httpClient.execute(httpGet);
if (response != null) {
@@ -88,9 +88,9 @@
//设置参数
httpPost.addHeader("Accept", "application/json");
httpPost.addHeader("Content-Type", "application/json;charset=UTF-8");
- httpPost.addHeader("Authorization", "Bearer " + IailabAuthClient.accessToken);
+ httpPost.addHeader("Authorization", "Bearer " + IailabClient.accessToken);
httpPost.addHeader("Tenant-Id", SdkAutoConfiguration.TENANT_ID.toString());
- StringEntity stringEntity = new StringEntity(json);
+ StringEntity stringEntity = new StringEntity(json,"UTF-8");
stringEntity.setContentEncoding("UTF-8");
stringEntity.setContentType("application/json");
httpPost.setEntity(stringEntity);
@@ -109,10 +109,10 @@
private static void checkToken() throws Exception {
//第一次请求或者token过期，需要重新获取token
- if(ObjectUtils.isEmpty(IailabAuthClient.accessToken)) {
- IailabAuthClient.authenticate();
- } else if (IailabAuthClient.expireTime < System.currentTimeMillis() / 1000) {
- IailabAuthClient.refreshToken();
+ if(ObjectUtils.isEmpty(IailabClient.accessToken)) {
+ IailabClient.authenticate();
+ } else if (IailabClient.expireTime < System.currentTimeMillis() / 1000) {
+ IailabClient.refreshToken();
}
}
--
Gitblit v1.9.3