From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/Server/HttpUtil.cs | 179 +++++++++++------------------------------------------------
1 files changed, 33 insertions(+), 146 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index c36697b..6784b4c 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -152,8 +152,9 @@
try
{
- //if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ //if (string.IsNullOrEmpty(urlHead))
+ //{
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -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
@@ -227,20 +228,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" };
}
@@ -264,7 +265,7 @@
try
{
//if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -280,9 +281,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 +309,7 @@
}
catch (Exception ex)
{
- HDL_ON.Common.Utlis.WriteLine(ex.Message);
+ HDL_ON.Utlis.WriteLine(ex.Message);
return null;
}
#endregion
@@ -334,7 +335,7 @@
{
//if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -351,9 +352,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,20 +400,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" };
}
@@ -478,11 +479,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 +554,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