From 54c202bd4867092fca2bc6f96bec0cfd1056a46a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 11:24:20 +0800
Subject: [PATCH] 2023年11月06日11:23:46

---
 HDL_ON/DAL/Server/HttpUtil.cs |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 4766d4f..0c95e74 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,13 +18,14 @@
         /// 鍥哄畾鍩熷悕,姝e紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙f瀽
         /// </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";
-        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
-        //const string APP_KEY = "CPEVRLRT";
-        //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+
+        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//寮�鍙戠幆澧�
+        //const string APP_KEY = "CPEVRLRT";//寮�鍙戠幆澧傾PP_KEY
+        //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";//寮�鍙戠幆澧僑ECRET_KEY
         /// <summary>
         /// RegionMark
         /// </summary>
@@ -154,7 +155,7 @@
 
             if(MainPage.NoLoginMode)
             {
-                return new ResponsePackNew() { Code = "0" };
+                return new ResponsePackNew() { Code = "0" ,Data = "" };
             }
             #region HttpWebRequest
             try
@@ -207,8 +208,13 @@
                         request.AddUrlSegment(data.Key, data.Value.ToString());
                     }
                 }
-
                 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
@@ -226,7 +232,7 @@
                             revertObj.Data = "";
                         }
                         //*****涓�浜涘垽绌哄鐞�*****************
-
+                        HDL_ON.Utlis.WriteLine("鎺ユ敹", requestFullUrl, response.Content);
                         return revertObj;
                     }
                     catch (Exception ex)
@@ -301,7 +307,7 @@
         /// 鍒锋柊  Token
         /// </summary>
         /// <returns></returns>
-        static bool RefreshToken()
+        static bool RefreshToken(bool canRefresh = true)
         {
             try
             {
@@ -318,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)
                 {
@@ -537,7 +543,7 @@
 
         }
 
-        #endregion
+#endregion
 
         #region **********绛惧悕鏍¢獙**********
 

--
Gitblit v1.8.0