From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理

---
 HDL_ON/DAL/Server/HttpUtil.cs |   47 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 512e33b..bf00e56 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -39,9 +39,10 @@
         #region **********缃戠粶璇锋眰灏佽**********
         /// <summary>
         /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
+        /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
         /// </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";
 
         /// <summary>
         ///  Get  璇锋眰鏈嶅姟鍣ㄦ柟娉�
@@ -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
@@ -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
@@ -551,7 +552,21 @@
             }
             return signstr.ToLower();
         }
-
+        /// <summary>
+        /// 鍒ゆ柇褰撳墠鍊兼槸鍚﹂渶瑕佸弬涓庣鍚嶏紝淇濇寔璺熶簯绔竴鑷�
+        /// 绌哄瓧绗︿覆涓嶅弬涓�
+        /// 鏁扮粍,闆嗗悎,瀵硅薄涓嶅弬涓�
+        /// </summary>
+        /// <param name="valueStr"></param>
+        /// <returns></returns>
+        static bool IfValueNeedSign(string valueStr)
+        {
+            if (string.IsNullOrEmpty(valueStr) || valueStr.StartsWith("{") || valueStr.StartsWith("["))
+            {
+                return false;
+            }
+            return true;
+        }
         /// <summary>
         /// 2020-11-02
         /// 鍩虹鏈嶅姟鐨勬帴鍙ｉ兘瑕佹牎楠宻ign
@@ -579,7 +594,10 @@
                         if (item.Value != null)
                         {
                             //Value.ToString()涓簄ull鎴栬��""涔熶笉鍙傚姞鏍￠獙
-                            if (!string.IsNullOrEmpty(item.Value.ToString()))
+                            //if (!string.IsNullOrEmpty(item.Value.ToString()) && (item.Value is string || item.Value.GetType().IsValueType))
+                            //{
+                            //妫�娴嬪綋鍓嶅弬鏁版槸鍚﹂渶瑕佸弬涓庢牎楠�
+                            if (IfValueNeedSign(item.Value.ToString()))
                             {
                                 //濡傛灉鏄痓ool绫诲瀷锛岃杞皬鍐�
                                 if (item.Value is bool)
@@ -637,6 +655,11 @@
         /// </summary>
         public string message;
 
+        /// <summary>
+        /// 杩欎釜鏄姹傞敊璇椂鐨勬墿灞曟暟鎹�,浠ュ悗鎵�鏈夌殑闄勫甫鎵╁睍鏁版嵁閮戒細鏀惧湪杩欓噷闈㈠姩鎬佺淮鎶�
+        /// </summary>
+        public object extra;
+
         ///// <summary>
         ///// isSuccess
         ///// </summary>

--
Gitblit v1.8.0