20201124;mqtt代码整理备份

wxr

2020-11-24 a5ba89efa83d0a4afd0d25dbeba5989e4944b5b8

 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;

@@ -11,6 +12,7 @@
{
    public class HttpUtil
    {

        #region HttpUtil 全局常量
        ///// <summary>
        ///// API_HTTPS
@@ -83,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>
@@ -129,8 +152,9 @@
            try
            {

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

@@ -148,9 +172,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if (MainPage.LoginUser != null)
                    if(UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -241,7 +265,7 @@
            try
            {
                //if (string.IsNullOrEmpty (urlHead)) {
                //    urlHead = APIInfoConfig.Current.RequestHttpsHost;
                //    urlHead = UserInfo.Current.RequestHttpsHost;
                //}
                //string requestFullUrl = urlHead + apiPath;

@@ -257,9 +281,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if (MainPage.LoginUser != null)
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -311,7 +335,7 @@
            {

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

@@ -328,9 +352,9 @@

                if (string.IsNullOrEmpty(replaceToken))
                {
                    if (MainPage.LoginUser != null)
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization", MainPage.LoginUser.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else