From 1830691fd179285d2df7f035e4f7f5a260e819c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 19 九月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/DAL/Server/HttpUtil.cs | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 315e9a2..5235064 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -6,6 +6,7 @@
using System.Text;
using HDL_ON.Entity;
using RestSharp;
+using Shared;
namespace HDL_ON.DAL.Server
{
@@ -18,7 +19,13 @@
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //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";//寮�鍙戠幆澧�
+ //const string APP_KEY = "CPEVRLRT";//寮�鍙戠幆澧傾PP_KEY
+ //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";//寮�鍙戠幆澧僑ECRET_KEY
/// <summary>
/// RegionMark
/// </summary>
@@ -31,15 +38,14 @@
/// 鐗规畩鎺ュ彛璇锋眰瓒呮椂鏃堕棿
/// </summary>
public const int TIME_OUT_LONG = 20;
- /////// <summary>
- /////// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
- /////// </summary>
+ ///// <summary>
+ ///// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
+ ///// </summary>
//public const string TOKEN_BEARER = "Bearer ";
#endregion
#region **********缃戠粶璇锋眰灏佽**********
-
/// <summary>
/// Get 璇锋眰鏈嶅姟鍣ㄦ柟娉�
/// </summary>
@@ -149,7 +155,7 @@
if(MainPage.NoLoginMode)
{
- return new ResponsePackNew() { Code = "0" };
+ return new ResponsePackNew() { Code = "0" ,Data = "" };
}
#region HttpWebRequest
try
@@ -167,6 +173,7 @@
RestRequest request = new RestRequest(method);
request.Timeout = mTimeout * 1000;
request.AddHeader("content-type", "application/json");
+ request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//澧炲姞璇█鏍囪瘑 wxr 2023-03-22 17:03:34
if (string.IsNullOrEmpty(replaceToken))
{
@@ -179,6 +186,7 @@
{
request.AddHeader("Authorization", replaceToken);
}
+
if (bodyParameterJson != null)
{
@@ -200,8 +208,8 @@
request.AddUrlSegment(data.Key, data.Value.ToString());
}
}
-
IRestResponse response = client.Execute(request);
+ HDL_ON.Utlis.WriteLine("鍙戦��", requestFullUrl, response.Request.Body?.Value.ToString());
if (response.StatusCode == HttpStatusCode.OK)
{
try
@@ -219,7 +227,7 @@
revertObj.Data = "";
}
//*****涓�浜涘垽绌哄鐞�*****************
-
+ HDL_ON.Utlis.WriteLine("鎺ユ敹", requestFullUrl, response.Content);
return revertObj;
}
catch (Exception ex)
@@ -230,7 +238,19 @@
}
else
{
- HDL_ON.Utlis.WriteLine(response.Content);
+ HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.Content);
+ if(response.Content!= null)
+ {
+ try
+ {
+ var pack = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+ if (pack != null)
+ {
+ return pack;
+ }
+ }
+ catch { }
+ }
return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
}
@@ -295,6 +315,7 @@
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.AccessToken = revertData.accessToken;
UserInfo.Current.RefreshToken = revertData.refreshToken;
UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.SaveUserInfo();
@@ -304,6 +325,10 @@
sdm.AccessToken = UserInfo.Current.LoginTokenString;
sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
+ }
+ else if (revertObj.Code == StateCode.PasswrodError)
+ {
+ UserInfo.Current.LastTime = DateTime.MinValue;
}
return false;
}
@@ -516,14 +541,6 @@
#endregion
#region **********绛惧悕鏍￠獙**********
- /// <summary>
- ///
- /// </summary>
- const string APP_KEY = "HDL-HOME-APP-TEST";
- /// <summary>
- ///
- /// </summary>
- const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
/// <summary>
/// 鑾峰彇褰撳墠鏃堕棿鎴冲��
--
Gitblit v1.8.0