Merge branch 'NewFilePath' into CJL

JLChen

2020-12-20 f77a3add1e7ab266e473da9128bbe5758ba3a890

 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;

@@ -212,7 +212,7 @@
                        //*****一些判空处理*****************
                        if (revertObj.Code == null)
                        {
                            revertObj.Code = "DATA_EXCEPTION";
                            revertObj.Code = StateCode.DATA_EXCEPTION;
                        }

                        if (revertObj.Data == null)
@@ -226,20 +226,20 @@
                    catch (Exception ex)
                    {
                        HDL_ON.Utlis.WriteLine(ex.Message);
                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
                        return new ResponsePackNew() { Code = StateCode.DATA_EXCEPTION };
                    }
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
                    return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                }

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

            #endregion
@@ -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;

@@ -453,7 +453,7 @@
                        revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                        if (revertObj.Code == null)
                        {
                            revertObj.Code = "DATA_EXCEPTION";
                            revertObj.Code = StateCode.DATA_EXCEPTION;
                        }
                        ////统一转成大写
                        //revertObj.StateCode = revertObj.StateCode.ToUpper ();
@@ -462,20 +462,20 @@
                    catch (Exception ex)
                    {
                        HDL_ON.Utlis.WriteLine(ex.Message);
                        return new ResponsePackNew() { Code = "DATA_EXCEPTION" };
                        return new ResponsePackNew() { Code = StateCode.DATA_EXCEPTION };
                    }
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    return new ResponsePackNew() { Code = "NETWORK_ERROR" };
                    return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                }

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

            #endregion
@@ -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
                {