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
---
HDL_ON/DAL/Server/HttpUtil.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index b659327..0c95e74 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
@@ -210,6 +210,11 @@
}
IRestResponse response = client.Execute(request);
HDL_ON.Utlis.WriteLine("鍙戦��", requestFullUrl, response.Request.Body?.Value.ToString());
+ if(apiPath == NewAPI.API_POST_Login)
+ {
+ var ddd = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+ Console.WriteLine(ddd);
+ }
if (response.StatusCode == HttpStatusCode.OK)
{
try
@@ -302,7 +307,7 @@
/// 鍒锋柊 Token
/// </summary>
/// <returns></returns>
- static bool RefreshToken()
+ static bool RefreshToken(bool canRefresh = true)
{
try
{
@@ -319,12 +324,12 @@
UserInfo.Current.RefreshToken = revertData.refreshToken;
UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.SaveUserInfo();
- return true;
#if __IOS__
var sdm = new SiriKit.SceneDateManager();
sdm.AccessToken = UserInfo.Current.LoginTokenString;
sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
+ return true;
}
else if (revertObj.Code == StateCode.PasswrodError)
{
@@ -538,7 +543,7 @@
}
- #endregion
+#endregion
#region **********绛惧悕鏍￠獙**********
--
Gitblit v1.8.0