From f16fd06aa226e9f97a27858624d4ea7cf8975d25 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 五月 2024 17:24:38 +0800
Subject: [PATCH] 增加了萤石摄像头
---
SiriIntents/Server/HttpUtil.cs | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 2ed7d35..7722010 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,9 +16,13 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ const string APP_KEY = "QWERREWQ";
+ const string SECRET_KEY = "CPBUCTRLCPBUABCD";
+ //const string APP_KEY = "HDL-HOME-APP";
+ //const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
+
/// <summary>
/// RegionMark
/// </summary>
@@ -110,6 +114,15 @@
try
{
+
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = HttpServerRequest.Ins.DataManager.GlobalRequestHttpsHost;
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = "https://nearest.hdlcontrol.com";
+ }
+ }
string requestFullUrl = urlHead + apiPath;
@@ -118,9 +131,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);
@@ -170,6 +184,8 @@
}
else
{
+ var ddd =Newtonsoft.Json.JsonConvert.SerializeObject(response);
+
return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
}
@@ -200,7 +216,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()) {
@@ -249,14 +265,6 @@
#endregion
#region **********绛惧悕鏍￠獙**********
- /// <summary>
- ///
- /// </summary>
- const string APP_KEY = "QWERREWQ";//"COSDFPIN";
- /// <summary>
- ///
- /// </summary>
- const string SECRET_KEY = "CPBUCTRLCPBUABCD";//"COSDFPJDCOSDFPJT";
/// <summary>
/// 鑾峰彇褰撳墠鏃堕棿鎴冲��
--
Gitblit v1.8.0