From 3069c032027eeea7a14fa9f462440bb2d802d9a9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:25:09 +0800
Subject: [PATCH] 20210111-合并代码

---
 HDL_ON/DAL/Server/HttpUtil.cs |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 3b85363..d6422ae 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -39,6 +39,7 @@
         #region **********缃戠粶璇锋眰灏佽**********
         /// <summary>
         /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
+        /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
         /// </summary>
         //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
         public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
@@ -95,7 +96,7 @@
         /// <returns></returns>
         public static ResponsePackNew RequestHttpsPostFroHome(string apiPath, string bodyParameterJson, int mTimeout = 10)
         {
-            string urlHead = DB_ResidenceData.residenceData.residecenInfo.regionUrl;
+            string urlHead = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
             //var replaceToken = "";
             //if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
             //{
@@ -154,7 +155,7 @@
 
                 if (string.IsNullOrEmpty(urlHead))
                 {
-                    urlHead = UserInfo.Current.RequestHttpsHost;
+                    urlHead = OnAppConfig.Instance.RequestHttpsHost;
                 }
                 string requestFullUrl = urlHead + apiPath;
 
@@ -212,7 +213,7 @@
                         //*****涓�浜涘垽绌哄鐞�*****************
                         if (revertObj.Code == null)
                         {
-                            revertObj.Code = "DATA_EXCEPTION";
+                            revertObj.Code = StateCode.DATA_EXCEPTION;
                         }
 
                         if (revertObj.Data == null)
@@ -226,20 +227,20 @@
                     catch (Exception ex)
                     {
                         HDL_ON.Utlis.WriteLine(ex.Message);
-                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
+                        return new ResponsePackNew() { Code = StateCode.DATA_EXCEPTION };
                     }
                 }
                 else
                 {
                     HDL_ON.Utlis.WriteLine(response.Content);
-                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
+                    return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                 }
 
             }
             catch (Exception ex)
             {
                 HDL_ON.Utlis.WriteLine(ex.Message);
-                return new ResponsePackNew() { Code = "NETWORK_ERROR" };
+                return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
             }
 
             #endregion
@@ -326,7 +327,7 @@
             {
                 if (string.IsNullOrEmpty(urlHead))
                 {
-                    urlHead = UserInfo.Current.RequestHttpsHost;
+                    urlHead = OnAppConfig.Instance.RequestHttpsHost;
                 }
                 string requestFullUrl = urlHead + apiPath;
 
@@ -396,7 +397,7 @@
 
                 if (string.IsNullOrEmpty(urlHead))
                 {
-                    urlHead = UserInfo.Current.RequestHttpsHost;
+                    urlHead = OnAppConfig.Instance.RequestHttpsHost;
                 }
                 string requestFullUrl = urlHead + apiPath;
 
@@ -453,7 +454,7 @@
                         revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                         if (revertObj.Code == null)
                         {
-                            revertObj.Code = "DATA_EXCEPTION";
+                            revertObj.Code = StateCode.DATA_EXCEPTION;
                         }
                         ////缁熶竴杞垚澶у啓
                         //revertObj.StateCode = revertObj.StateCode.ToUpper ();
@@ -462,20 +463,20 @@
                     catch (Exception ex)
                     {
                         HDL_ON.Utlis.WriteLine(ex.Message);
-                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
+                        return new ResponsePackNew() { Code = StateCode.DATA_EXCEPTION };
                     }
                 }
                 else
                 {
                     HDL_ON.Utlis.WriteLine(response.Content);
-                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
+                    return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                 }
 
             }
             catch (Exception ex)
             {
                 HDL_ON.Utlis.WriteLine(ex.Message);
-                return new ResponsePackNew() { Code = "NETWORK_ERROR" };
+                return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
             }
 
             #endregion
@@ -599,7 +600,8 @@
                     //2.4 MD5杞崲+杞皬鍐�
                     var signstr = SignMD5Encrypt(str);
                     paramDictionary.Add("sign", signstr);
-                    return Newtonsoft.Json.JsonConvert.SerializeObject(paramDictionary);
+                    var signResult = Newtonsoft.Json.JsonConvert.SerializeObject(paramDictionary);
+                    return signResult;
                 }
                 else
                 {
@@ -636,6 +638,11 @@
         /// </summary>
         public string message;
 
+        /// <summary>
+        /// 杩欎釜鏄姹傞敊璇椂鐨勬墿灞曟暟鎹�,浠ュ悗鎵�鏈夌殑闄勫甫鎵╁睍鏁版嵁閮戒細鏀惧湪杩欓噷闈㈠姩鎬佺淮鎶�
+        /// </summary>
+        public object extra;
+
         ///// <summary>
         ///// isSuccess
         ///// </summary>

--
Gitblit v1.8.0