From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL_ON/DAL/Server/HttpUtil.cs | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index c6cb085..b953eb2 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -12,18 +12,74 @@
{
public class HttpUtil
{
+ static HttpUtil _HttpUtil;
+ public static HttpUtil Ins
+ {
+ get
+ {
+ if (_HttpUtil == null)
+ {
+ _HttpUtil = new HttpUtil();
+ }
+ return _HttpUtil;
+ }
+ }
#region **********鍏ㄥ眬甯搁噺**********
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string APP_KEY = "QWERREWQ";
+ //public const string SECRET_KEY = "CPBUCTRLCPBUABCD";
+
+
+ string _GlobalRequestHttpsHost;
/// <summary>
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- const string APP_KEY = "QWERREWQ";
- const string SECRET_KEY = "CPBUCTRLCPBUABCD";
- //const string APP_KEY = "HDL-HOME-APP-TEST";
- //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ public string GlobalRequestHttpsHost
+ {
+ get
+ {
+ _GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ if (OnAppConfig.Instance.HostType == RequestHostType.ONLINE)
+ _GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.TEST)
+ _GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.DEV)
+ _GlobalRequestHttpsHost = "http://59.41.255.150:7777";
+ return _GlobalRequestHttpsHost;
+ }
+ }
+ string app_key;
+ public string APP_KEY
+ {
+ get
+ {
+ app_key = "QWERREWQ";
+ if (OnAppConfig.Instance.HostType == RequestHostType.ONLINE)
+ app_key = "QWERREWQ";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.TEST)
+ app_key = "HDL-HOME-APP-TEST";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.DEV)
+ app_key = "CPEVRLRT";
+ return app_key;
+ }
+ }
+ string _SECRET_KEY;
+ public string SECRET_KEY
+ {
+ get
+ {
+ _SECRET_KEY = "CPBUCTRLCPBUABCD";
+ if (OnAppConfig.Instance.HostType == RequestHostType.ONLINE)
+ _SECRET_KEY = "CPBUCTRLCPBUABCD";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.TEST)
+ _SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ else if (OnAppConfig.Instance.HostType == RequestHostType.DEV)
+ _SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+ return _SECRET_KEY;
+ }
+ }
/// <summary>
@@ -160,13 +216,11 @@
#region HttpWebRequest
try
{
-
if (string.IsNullOrEmpty(urlHead))
{
urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
-
RestClient client = new RestClient(requestFullUrl);
@@ -186,7 +240,6 @@
{
request.AddHeader("Authorization", replaceToken);
}
-
if (bodyParameterJson != null)
{
@@ -606,7 +659,7 @@
//2. 璁＄畻sign
if (paramDictionary != null)
{
- paramDictionary.Add("appKey", APP_KEY);
+ paramDictionary.Add("appKey", Ins.APP_KEY);
paramDictionary.Add("timestamp", GetTimestamp());
//2.1 瀛楀吀鍗囧簭
paramDictionary = paramDictionary.OrderBy(o => o.Key).ToDictionary(o => o.Key, p => p.Value);
@@ -637,7 +690,7 @@
}
//2.3 鎷兼帴SECRET_KEY
- str = str.Substring(0, str.Length - 1) + SECRET_KEY;
+ str = str.Substring(0, str.Length - 1) + Ins.SECRET_KEY;
//2.4 MD5杞崲+杞皬鍐�
var signstr = SignMD5Encrypt(str);
paramDictionary.Add("sign", signstr);
--
Gitblit v1.8.0