From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/DAL/Server/HttpUtil.cs | 263 ++++++++++++++++++----------------------------------
1 files changed, 93 insertions(+), 170 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index c36697b..e7fa703 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -96,12 +96,12 @@
public static ResponsePackNew RequestHttpsPostFroHome(string apiPath, string bodyParameterJson, int mTimeout = 10)
{
string urlHead = DB_ResidenceData.residenceData.residecenInfo.regionUrl;
- var replaceToken = "";
- if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- replaceToken = DB_ResidenceData.residenceData.MasterToken;
- }
- return RequestHttps(Method.POST, apiPath, bodyParameterJson, null, null, urlHead, replaceToken, mTimeout);
+ //var replaceToken = "";
+ //if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ //{
+ // replaceToken = DB_ResidenceData.residenceData.MasterToken;
+ //}
+ return RequestHttps(Method.POST, apiPath, bodyParameterJson, null, null, urlHead, "", mTimeout);
}
/// <summary>
@@ -152,15 +152,16 @@
try
{
- //if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
- //}
- //string requestFullUrl = urlHead + apiPath;
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = UserInfo.Current.RequestHttpsHost;
+ }
+ string requestFullUrl = urlHead + apiPath;
- //**************娴嬭瘯**************
- string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- //**************娴嬭瘯**************
+ ////**************娴嬭瘯**************
+ //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
@@ -171,9 +172,9 @@
if (string.IsNullOrEmpty(replaceToken))
{
- if (MainPage.LoginUser != null)
+ if(UserInfo.Current != null)
{/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
- request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
+ request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);
}
}
else
@@ -207,6 +208,7 @@
{
try
{
+
ResponsePackNew revertObj = new ResponsePackNew() { };
revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
//*****涓�浜涘垽绌哄鐞�*****************
@@ -227,20 +229,20 @@
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
}
}
else
{
- HDL_ON.Common.Utlis.WriteLine(response.Content);
+ HDL_ON.Utlis.WriteLine(response.Content);
return new ResponsePackNew() { Code = "NETWORK_ERROR" };
}
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return new ResponsePackNew() { Code = "NETWORK_ERROR" };
}
@@ -263,14 +265,15 @@
#region RestRequest
try
{
- //if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
- //}
- //string requestFullUrl = urlHead + apiPath;
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = UserInfo.Current.RequestHttpsHost;
+ }
+ string requestFullUrl = urlHead + apiPath;
- //**************娴嬭瘯**************
- string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- //**************娴嬭瘯**************
+ ////**************娴嬭瘯**************
+ //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
//client.Timeout = mTimeout * 1000;
@@ -280,9 +283,9 @@
if (string.IsNullOrEmpty(replaceToken))
{
- if (MainPage.LoginUser != null)
+ if ( UserInfo.Current != null)
{/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
- request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
+ request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);
}
}
else
@@ -308,7 +311,7 @@
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return null;
}
#endregion
@@ -333,14 +336,15 @@
try
{
- //if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
- //}
- //string requestFullUrl = urlHead + apiPath;
+ if (string.IsNullOrEmpty(urlHead))
+ {
+ urlHead = UserInfo.Current.RequestHttpsHost;
+ }
+ string requestFullUrl = urlHead + apiPath;
- //**************娴嬭瘯**************
- string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- //**************娴嬭瘯**************
+ ////**************娴嬭瘯**************
+ //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
//client.Timeout = mTimeout * 1000;
@@ -351,9 +355,9 @@
if (string.IsNullOrEmpty(replaceToken))
{
- if (MainPage.LoginUser != null)
+ if ( UserInfo.Current != null)
{/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */
- request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
+ request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);
}
}
else
@@ -399,26 +403,58 @@
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
}
}
else
{
- HDL_ON.Common.Utlis.WriteLine(response.Content);
+ HDL_ON.Utlis.WriteLine(response.Content);
return new ResponsePackNew() { Code = "NETWORK_ERROR" };
}
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return new ResponsePackNew() { Code = "NETWORK_ERROR" };
}
#endregion
}
+
+ /// <summary>
+ /// 涓嬭浇鏂囦欢 璇锋眰鏈嶅姟鍣ㄦ柟娉�
+ /// </summary>
+ /// <param name="apiPath"></param>
+ /// <param name="bodyParameterJson"></param>
+ /// <param name="queryDictionary"></param>
+ /// <param name="urlHead"></param>
+ /// <param name="replaceToken"></param>
+ /// <param name="mTimeout"></param>
+ /// <returns></returns>
+ public static byte[] HttpsDownload(string requestFullUrl, int mTimeout = 30)
+ {
+ #region RestRequest
+ try
+ {
+ RestClient client = new RestClient(requestFullUrl);
+ RestRequest request = new RestRequest(Method.GET);
+ request.Timeout = mTimeout * 1000;
+
+ IRestResponse response = client.Execute(request);
+ return response.RawBytes;
+ }
+ catch (Exception ex)
+ {
+ HDL_ON.Utlis.WriteLine(ex.Message);
+ return null;
+ }
+ #endregion
+
+ }
+
/// <summary>
///
@@ -436,7 +472,8 @@
static string GetTimestamp()
{
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
- return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
+ return ((long)(DateTime.Now - startTime).TotalMilliseconds).ToString(); // 鐩稿樊绉掓暟
+ //return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
}
/// <summary>
@@ -478,11 +515,25 @@
string str = string.Empty;
foreach (KeyValuePair<string, object> item in paramDictionary)
{
+ //Value涓簄ull涓嶅弬鍔犳牎楠�
if (item.Value != null)
{
- str += item.Key + "=" + item.Value.ToString() + "&";
+ //Value.ToString()涓簄ull鎴栬��""涔熶笉鍙傚姞鏍￠獙
+ if (!string.IsNullOrEmpty(item.Value.ToString()))
+ {
+ //濡傛灉鏄痓ool绫诲瀷锛岃杞皬鍐�
+ if (item.Value is bool)
+ {
+ str += item.Key + "=" + item.Value.ToString().ToLower() + "&";
+ }
+ else
+ {
+ str += item.Key + "=" + item.Value.ToString() + "&";
+ }
+ }
}
}
+
//2.3 鎷兼帴SECRET_KEY
str = str.Substring(0, str.Length - 1) + SECRET_KEY;
//2.4 MD5杞崲+杞皬鍐�
@@ -539,132 +590,4 @@
-}
-
-namespace Shared.Securitys
-{
- /// <summary>
- ///
- /// </summary>
- public partial class EncryptionService
- {
- #region 鍔犲瘑
- /// <summary>
- /// 鍔犲瘑涓婚涓築ase64
- /// </summary>
- /// <param name="pToEncrypt"></param>
- /// <param name="key"></param>
- /// <returns></returns>
- public static string AesEncryptTopic(string pToEncrypt, string key)
- {
- if (string.IsNullOrEmpty(pToEncrypt)) return null;
- if (string.IsNullOrEmpty(key)) return pToEncrypt;
- //闇�瑕佸姞瀵嗗唴瀹圭殑鏄庢枃娴�
- Byte[] toEncryptArray = Encoding.UTF8.GetBytes(pToEncrypt);
-
- //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
- RijndaelManaged rm = new RijndaelManaged
- {
- Key = Encoding.UTF8.GetBytes(key),
- IV = Encoding.UTF8.GetBytes(key),
- Mode = CipherMode.CBC,
- Padding = PaddingMode.PKCS7
- };
-
- //鍒涘缓AES鍔犲瘑鍣ㄥ璞�
- ICryptoTransform cTransform = rm.CreateEncryptor();
-
- //浣跨敤AES灏嗘槑鏂囨祦杞垚瀵嗘枃瀛楄妭鏁扮粍
- Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
-
- //灏咥ES鐢熸垚鐨勫瘑鏂囧瓧鑺傛暟缁勮浆鎴怋ase64瀛楃涓�
- return Convert.ToBase64String(resultArray, 0, resultArray.Length);
- }
-
-
- /// <summary>
- /// 鍔犲瘑璐熻浇涓轰簩杩涘埗娴�
- /// </summary>
- /// <param name="toEncryptArray"></param>
- /// <param name="key"></param>
- /// <returns></returns>
- public static byte[] AesEncryptPayload(byte[] toEncryptArray, string key)
- {
- if (string.IsNullOrEmpty(key)) return toEncryptArray;
- //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
- var rm = new RijndaelManaged
- {
- Key = Encoding.UTF8.GetBytes(key),
- IV = Encoding.UTF8.GetBytes(key),
- Mode = CipherMode.CBC,
- Padding = PaddingMode.PKCS7
- };
-
- //鍒涘缓AES鍔犲瘑鍣ㄥ璞�
- var cTransform = rm.CreateEncryptor();
- //浣跨敤AES灏嗘槑鏂囨祦杞垚瀵嗘枃瀛楄妭鏁扮粍
- return cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
- }
- #endregion
-
-
- #region 瑙ｅ瘑
- /// <summary>
- /// 瑙ｅ瘑涓婚鏁版嵁
- /// </summary>
- /// <param name="pToDecrypt"></param>
- /// <param name="key"></param>
- /// <returns></returns>
- public static string AesDecryptTopic(string pToDecrypt, string key)
- {
- //AES瀵嗘枃Base64杞垚瀛楃涓�
- Byte[] toEncryptArray = Convert.FromBase64String(pToDecrypt);
-
- //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
- RijndaelManaged rm = new RijndaelManaged
- {
- Key = Encoding.UTF8.GetBytes(key),
- IV = Encoding.UTF8.GetBytes(key),
- Mode = CipherMode.CBC,
- Padding = PaddingMode.PKCS7
- };
-
- //鍒涘缓AES瑙ｅ瘑鍣ㄥ璞�
- ICryptoTransform cTransform = rm.CreateDecryptor();
-
- //浣跨敤AES灏嗗瘑鏂囨祦杞垚鏄庢枃鐨勫瓧鑺傛暟缁�
- Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
-
- //杞垚瀛楃涓�
- return Encoding.UTF8.GetString(resultArray);
- }
-
- /// <summary>
- /// 閲囩敤Aes瑙ｅ瘑璐熻浇鏁版嵁
- /// </summary>
- /// <param name="toEncryptArray"></param>
- /// <param name="key"></param>
- /// <returns></returns>
- public static byte[] AesDecryptPayload(byte[] toEncryptArray, string key)
- {
- //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
- var rm = new RijndaelManaged
- {
- Key = Encoding.UTF8.GetBytes(key),
- IV = Encoding.UTF8.GetBytes(key),
- Mode = CipherMode.CBC,
- Padding = PaddingMode.PKCS7
- };
-
- //鍒涘缓AES瑙ｅ瘑鍣ㄥ璞�
- var cTransform = rm.CreateDecryptor();
-
- //浣跨敤AES灏嗗瘑鏂囨祦杞垚鏄庢枃鐨勫瓧鑺傛暟缁�
- return cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
- }
- #endregion
-
-
-
- }
}
--
Gitblit v1.8.0