From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/DAL/Server/HttpUtil.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
old mode 100644
new mode 100755
index 3b85363..512e33b
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -95,7 +95,7 @@
/// <returns></returns>
public static ResponsePackNew RequestHttpsPostFroHome(string apiPath, string bodyParameterJson, int mTimeout = 10)
{
- string urlHead = DB_ResidenceData.residenceData.residecenInfo.regionUrl;
+ string urlHead = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
//var replaceToken = "";
//if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
//{
@@ -154,7 +154,7 @@
if (string.IsNullOrEmpty(urlHead))
{
- urlHead = UserInfo.Current.RequestHttpsHost;
+ urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
@@ -326,7 +326,7 @@
{
if (string.IsNullOrEmpty(urlHead))
{
- urlHead = UserInfo.Current.RequestHttpsHost;
+ urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
@@ -396,7 +396,7 @@
if (string.IsNullOrEmpty(urlHead))
{
- urlHead = UserInfo.Current.RequestHttpsHost;
+ urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
@@ -599,7 +599,8 @@
//2.4 MD5杞崲+杞皬鍐�
var signstr = SignMD5Encrypt(str);
paramDictionary.Add("sign", signstr);
- return Newtonsoft.Json.JsonConvert.SerializeObject(paramDictionary);
+ var signResult = Newtonsoft.Json.JsonConvert.SerializeObject(paramDictionary);
+ return signResult;
}
else
{
--
Gitblit v1.8.0