From e3f3f62315a5789cd812b96954b67bffda4a0f5a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 16:33:55 +0800
Subject: [PATCH] 金辉项目，萤石摄像头更新
---
HDL_ON/DAL/Server/HttpUtil.cs | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index b6367ed..2b7664b 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";
/// <summary>
/// RegionMark
/// </summary>
@@ -37,11 +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 璇锋眰鏈嶅姟鍣ㄦ柟娉�
@@ -160,7 +157,7 @@
////**************娴嬭瘯**************
- //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ // string requestFullUrl = GlobalRequestHttpsHost + apiPath;
////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
@@ -551,7 +548,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 +590,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 +651,11 @@
/// </summary>
public string message;
+ /// <summary>
+ /// 杩欎釜鏄姹傞敊璇椂鐨勬墿灞曟暟鎹�,浠ュ悗鎵�鏈夌殑闄勫甫鎵╁睍鏁版嵁閮戒細鏀惧湪杩欓噷闈㈠姩鎬佺淮鎶�
+ /// </summary>
+ public object extra;
+
///// <summary>
///// isSuccess
///// </summary>
--
Gitblit v1.8.0