2020-12-08 1.修改回动态切换域名，用户相关接口使用用户域名，住宅相关接口用住宅的域名。

JLChen

2020-12-08 9dce5facf5c6aa29928880a0fa2fbfc7366a6dad

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -96,12 +96,12 @@
        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);
            //var replaceToken = "";
            //if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            //{
            //    replaceToken = DB_ResidenceData.residenceData.MasterToken;
            //}
            return RequestHttps(Method.POST, apiPath, bodyParameterJson, null, null, urlHead, "", mTimeout);
        }

        /// <summary>
@@ -152,16 +152,16 @@
            try
            {

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


                //**************测试**************
                string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                //**************测试**************
                ////**************测试**************
                //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                ////**************测试**************

                RestClient client = new RestClient(requestFullUrl);

@@ -174,7 +174,7 @@
                {
                    if(UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -208,6 +208,7 @@
                {
                    try
                    {

                        ResponsePackNew revertObj = new ResponsePackNew() { };
                        revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                        //*****一些判空处理*****************
@@ -264,14 +265,15 @@
            #region RestRequest
            try
            {
                //if (string.IsNullOrEmpty (urlHead)) {
                //    urlHead = UserInfo.Current.RequestHttpsHost;
                //}
                //string requestFullUrl = urlHead + apiPath;
                if (string.IsNullOrEmpty(urlHead))
                {
                    urlHead = UserInfo.Current.RequestHttpsHost;
                }
                string requestFullUrl = urlHead + apiPath;

                //**************测试**************
                string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                //**************测试**************
                ////**************测试**************
                //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                ////**************测试**************

                RestClient client = new RestClient(requestFullUrl);
                //client.Timeout = mTimeout * 1000;
@@ -283,7 +285,7 @@
                {
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -334,14 +336,15 @@
            try
            {

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

                //**************测试**************
                string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                //**************测试**************
                ////**************测试**************
                //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                ////**************测试**************

                RestClient client = new RestClient(requestFullUrl);
                //client.Timeout = mTimeout * 1000;
@@ -354,7 +357,7 @@
                {
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -422,6 +425,38 @@
        }

        /// <summary>
        /// 下载文件  请求服务器方法
        /// </summary>
        /// <param name="apiPath"></param>
        /// <param name="bodyParameterJson"></param>
        /// <param name="queryDictionary"></param>
        /// <param name="urlHead"></param>
        /// <param name="replaceToken"></param>
        /// <param name="mTimeout"></param>
        /// <returns></returns>
        public static byte[] HttpsDownload(string requestFullUrl, int mTimeout = 30)
        {
            #region RestRequest
            try
            {
                RestClient client = new RestClient(requestFullUrl);
                RestRequest request = new RestRequest(Method.GET);
                request.Timeout = mTimeout * 1000;

                IRestResponse response = client.Execute(request);
                return response.RawBytes;
            }
            catch (Exception ex)
            {
                HDL_ON.Utlis.WriteLine(ex.Message);
                return null;
            }
            #endregion

        }


        /// <summary>
        /// 
        /// </summary>
        const string APP_KEY = "HDL-HOME-APP-TEST";
@@ -437,7 +472,8 @@
        static string GetTimestamp()
        {
            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
            return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 相差秒数
            return ((long)(DateTime.Now - startTime).TotalMilliseconds).ToString(); // 相差秒数
            //return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 相差秒数
        }

        /// <summary>