From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/DAL/Server/HttpServerRequestBase.cs | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequestBase.cs b/HDL_ON/DAL/Server/HttpServerRequestBase.cs
index 336685d..b1956ba 100644
--- a/HDL_ON/DAL/Server/HttpServerRequestBase.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequestBase.cs
@@ -6,28 +6,21 @@
{
public partial class HttpServerRequest
{
- public string RequestHttpsHost = "https://developer.hdlcontrol.com/api/";
+ string RequestHttpsHost = "https://developer.hdlcontrol.com/";
/// <summary>
/// 璇锋眰鏈嶅姟鍣ㄦ柟娉�
/// </summary>
- /// <returns>The https.</returns>
- /// <param name="methodType">璇锋眰鏂规硶.</param>
- /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
- /// <param name="needHeaders">鏄惁闇�瑕佸寘澶�.</param>
- ResponsePack RequestHttps(string methodType, string dataStringJson, string loginToken)
+ ResponsePack RequestHttps(string url, string dataStringJson, bool needAuthorization)
{
- ResponsePack revertObj = new ResponsePack() { StateCode = "HDL-ON-Self:NotData" };
+ ResponsePack revertObj = new ResponsePack() { StateCode = "Self:NotData" };
var webClient = new WebClient();
#region
- var urlHead = $"{RequestHttpsHost}";
- //webClient.Headers.Add("CONTENT-TYPE", "application/json");
- string url = urlHead + methodType;
- /* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
- if (string.IsNullOrEmpty(loginToken))
+ webClient.Headers.Add("CONTENT-TYPE", "application/json");
+ if (needAuthorization)
{
- webClient.Headers.Add("Authorization", loginToken);
+ webClient.Headers.Add("Authorization", MainPage.LoginUser.loginTokenString);
}
byte[] bytes = null;
try
@@ -36,8 +29,8 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
- revertObj.StateCode = "HDL-ON-Self:Net_Error";
+ MainPage.Log($"http upload data error : {ex.Message}");
+ revertObj.StateCode = "Self:Net_Error";
revertObj.ErrorInfo_En = "Network anomaly";
revertObj.ErrorInfo_Zh = "缃戠粶寮傚父";
}
@@ -54,7 +47,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ MainPage.Log($"http upload data error : {ex.Message}");
}
return revertObj;
#endregion
--
Gitblit v1.8.0