Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 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>
@@ -174,7 +174,7 @@
                {
                    if(UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -283,7 +283,7 @@
                {
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else
@@ -354,7 +354,7 @@
                {
                    if ( UserInfo.Current != null)
                    {/* 如果不需要验证Token可以不用传入 */
                        request.AddHeader("Authorization",  UserInfo.Current.loginTokenString);
                        request.AddHeader("Authorization",  UserInfo.Current.LoginTokenString);
                    }
                }
                else