From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/DAL/Server/HttpUtil.cs | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 5580a99..48d5724 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -13,10 +13,12 @@
{
#region **********鍏ㄥ眬甯搁噺**********
- ///// <summary>
- ///// API_HTTPS
- ///// </summary>
- //public const string API_HTTPS = "https://";
+ /// <summary>
+ /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
+ /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
+ /// </summary>
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
@@ -37,12 +39,6 @@
#endregion
#region **********缃戠粶璇锋眰灏佽**********
- /// <summary>
- /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
- /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
- /// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
/// <summary>
/// Get 璇锋眰鏈嶅姟鍣ㄦ柟娉�
@@ -149,6 +145,12 @@
/// <returns></returns>
static ResponsePackNew RequestHttpsBase(Method method, string apiPath, string bodyParameterJson = null, Dictionary<string, object> queryDictionary = null, Dictionary<string, object> urlSegmentDictionary = null, string urlHead = "", string replaceToken = "", int mTimeout = 10)
{
+ //Dome妯″紡鐧诲綍
+
+ if(MainPage.NoLoginMode)
+ {
+ return new ResponsePackNew() { Code = "0" };
+ }
#region HttpWebRequest
try
{
@@ -159,10 +161,6 @@
}
string requestFullUrl = urlHead + apiPath;
-
- ////**************娴嬭瘯**************
- //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
@@ -281,7 +279,7 @@
/// <summary>
- /// 鍒锋柊Token
+ /// 鍒锋柊 Token
/// </summary>
/// <returns></returns>
static bool RefreshToken()
@@ -330,10 +328,6 @@
urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
-
- ////**************娴嬭瘯**************
- //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
RestRequest request = new RestRequest(Method.POST);
@@ -573,12 +567,15 @@
/// 璁＄畻sign绛惧悕
/// </summary>
/// <returns></returns>
- public static string GetSignRequestJson(object requestObj)
+ public static string GetSignRequestJson(object requestObj,Dictionary<string,object> paramDictionary = null)
{
try
{
//1. 灏唌odel瀹炰綋杞负Dictionary<string, object>
- var paramDictionary = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(Newtonsoft.Json.JsonConvert.SerializeObject(requestObj));
+ if (paramDictionary == null)
+ {
+ paramDictionary = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(Newtonsoft.Json.JsonConvert.SerializeObject(requestObj));
+ }
//2. 璁＄畻sign
if (paramDictionary != null)
{
@@ -653,7 +650,7 @@
/// <summary>
/// 鍝嶅簲閿欒淇℃伅
/// </summary>
- public string message;
+ public string message = "";
/// <summary>
/// 杩欎釜鏄姹傞敊璇椂鐨勬墿灞曟暟鎹�,浠ュ悗鎵�鏈夌殑闄勫甫鎵╁睍鏁版嵁閮戒細鏀惧湪杩欓噷闈㈠姩鎬佺淮鎶�
--
Gitblit v1.8.0