Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

JLChen

2020-11-23 eb51679c618d5027070fbd6f3c0519f0f17e7d7d

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -4,6 +4,7 @@
using System.Net;
using System.Security.Cryptography;
using System.Text;
using HDL_ON.Entity;
using RestSharp;
using Shared;

@@ -84,6 +85,27 @@

        /// <summary>
        /// POST请求方法 body参数
        /// 针对住宅相关接口封装
        /// 调用住宅当前所在区域域名
        /// 如果是分享住宅，使用主人的token进行相关操作
        /// </summary>
        /// <param name="apiPath"></param>
        /// <param name="bodyParameterJson"></param>
        /// <param name="mTimeout"></param>
        /// <returns></returns>
        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);
        }

        /// <summary>
        /// POST请求方法 body参数
        /// </summary>
        /// <param name="apiPath"></param>
        /// <param name="bodyParameterJson"></param>
@@ -130,9 +152,8 @@
            try
            {

                //if (string.IsNullOrEmpty(urlHead))
                //{
                //    urlHead = UserInfo.Current.RequestHttpsHost;
                //if (string.IsNullOrEmpty (urlHead)) {
                //    urlHead = APIInfoConfig.Current.RequestHttpsHost;
                //}
                //string requestFullUrl = urlHead + apiPath;

@@ -150,9 +171,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if(UserInfo.Current != null)
                    if (MainPage.LoginUser != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                    }
                }
                else
@@ -206,20 +227,20 @@
                    }
                    catch (Exception ex)
                    {
                        HDL_ON.Utlis.WriteLine(ex.Message);
                        HDL_ON.Common.Utlis.WriteLine(ex.Message);
                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
                    }
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    HDL_ON.Common.Utlis.WriteLine(response.Content);
                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
                }

            }
            catch (Exception ex)
            {
                HDL_ON.Utlis.WriteLine(ex.Message);
                HDL_ON.Common.Utlis.WriteLine(ex.Message);
                return new ResponsePackNew() { Code = "NETWORK_ERROR" };
            }

@@ -243,7 +264,7 @@
            try
            {
                //if (string.IsNullOrEmpty (urlHead)) {
                //    urlHead = UserInfo.Current.RequestHttpsHost;
                //    urlHead = APIInfoConfig.Current.RequestHttpsHost;
                //}
                //string requestFullUrl = urlHead + apiPath;

@@ -259,9 +280,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if ( UserInfo.Current != null)
                    if (MainPage.LoginUser != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                    }
                }
                else
@@ -287,7 +308,7 @@
            }
            catch (Exception ex)
            {
                HDL_ON.Utlis.WriteLine(ex.Message);
                HDL_ON.Common.Utlis.WriteLine(ex.Message);
                return null;
            }
            #endregion
@@ -313,7 +334,7 @@
            {

                //if (string.IsNullOrEmpty (urlHead)) {
                //    urlHead = UserInfo.Current.RequestHttpsHost;
                //    urlHead = APIInfoConfig.Current.RequestHttpsHost;
                //}
                //string requestFullUrl = urlHead + apiPath;

@@ -330,9 +351,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if ( UserInfo.Current != null)
                    if (MainPage.LoginUser != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                    }
                }
                else
@@ -378,20 +399,20 @@
                    }
                    catch (Exception ex)
                    {
                        HDL_ON.Utlis.WriteLine(ex.Message);
                        HDL_ON.Common.Utlis.WriteLine(ex.Message);
                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
                    }
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    HDL_ON.Common.Utlis.WriteLine(response.Content);
                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
                }

            }
            catch (Exception ex)
            {
                HDL_ON.Utlis.WriteLine(ex.Message);
                HDL_ON.Common.Utlis.WriteLine(ex.Message);
                return new ResponsePackNew() { Code = "NETWORK_ERROR" };
            }

@@ -457,25 +478,11 @@
                    string str = string.Empty;
                    foreach (KeyValuePair<string, object> item in paramDictionary)
                    {
                        //Value为null不参加校验
                        if (item.Value != null)
                        {
                            //Value.ToString()为null或者""也不参加校验
                            if (!string.IsNullOrEmpty(item.Value.ToString()))
                            {
                                //如果是bool类型，要转小写
                                if (item.Value is bool)
                                {
                                    str += item.Key + "=" + item.Value.ToString().ToLower() + "&";
                                }
                                else
                                {
                                    str += item.Key + "=" + item.Value.ToString() + "&";
                                }
                            }
                            str += item.Key + "=" + item.Value.ToString() + "&";
                        }
                    }

                    //2.3 拼接SECRET_KEY
                    str = str.Substring(0, str.Length - 1) + SECRET_KEY;
                    //2.4 MD5转换+转小写