From f9ed76e5022a2850eb2533d969b052ef170bf487 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 31 十月 2023 14:14:48 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
SiriIntents/Server/HttpUtil.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 8d4483c..24eaa6c 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -23,6 +23,7 @@
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
//const string APP_KEY = "CPEVRLRT";
//const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+
/// <summary>
/// RegionMark
/// </summary>
@@ -35,9 +36,9 @@
/// 鐗规畩鎺ュ彛璇锋眰瓒呮椂鏃堕棿
/// </summary>
public const int TIME_OUT_LONG = 20;
- /////// <summary>
- /////// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
- /////// </summary>
+ /// <summary>
+ /// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
+ /// </summary>
//public const string TOKEN_BEARER = "Bearer ";
#endregion
@@ -114,6 +115,15 @@
try
{
+
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = HttpServerRequest.Ins.DataManager.GlobalRequestHttpsHost;
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = "https://nearest.hdlcontrol.com";
+ }
+ }
string requestFullUrl = urlHead + apiPath;
@@ -122,9 +132,10 @@
RestRequest request = new RestRequest(method);
request.Timeout = mTimeout * 1000;
request.AddHeader("content-type", "application/json");
+ request.AddHeader("language", "cn");
request.AddHeader("Authorization", HttpServerRequest.Ins.DataManager.AccessToken);
-
+
if (bodyParameterJson != null)
{
request.AddParameter("application/json", bodyParameterJson, ParameterType.RequestBody);
@@ -174,6 +185,8 @@
}
else
{
+ var ddd =Newtonsoft.Json.JsonConvert.SerializeObject(response);
+
return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
}
@@ -204,7 +217,7 @@
{
var responsePackNew = RequestHttpsBase(method, apiPath, bodyParameterJson, queryDictionary, urlSegmentDictionary, urlHead, replaceToken, mTimeout);
//*****************Token杩囨湡澶勭悊*****************
- if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED )
{
//鍒锋柊Token
if (RefreshToken()) {
--
Gitblit v1.8.0