From 437c7a6d88d11e500fc19a3dd198aec28412f06b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 17:48:23 +0800
Subject: [PATCH] 2020-11-20 1.修改UserInfo调用方法。2.增加保存用户注册域名信息。
---
HDL_ON/DAL/Server/HttpUtil.cs | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 1e7e0e2..2d78ddd 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -129,8 +129,9 @@
try
{
- //if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ //if (string.IsNullOrEmpty(urlHead))
+ //{
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -148,9 +149,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
@@ -241,7 +242,7 @@
try
{
//if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -257,9 +258,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
@@ -311,7 +312,7 @@
{
//if (string.IsNullOrEmpty (urlHead)) {
- // urlHead = APIInfoConfig.Current.RequestHttpsHost;
+ // urlHead = UserInfo.Current.RequestHttpsHost;
//}
//string requestFullUrl = urlHead + apiPath;
@@ -328,9 +329,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
@@ -455,11 +456,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杞崲+杞皬鍐�
--
Gitblit v1.8.0