2023年11月06日11:23:46

mac

2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -6,6 +6,7 @@
using System.Text;
using HDL_ON.Entity;
using RestSharp;
using Shared;

namespace HDL_ON.DAL.Server
{
@@ -17,13 +18,14 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //const string APP_KEY = "HDL-HOME-APP-TEST";
        //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
        const string APP_KEY = "CPEVRLRT";
        const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";

        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//开发环境
        //const string APP_KEY = "CPEVRLRT";//开发环境APP_KEY
        //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";//开发环境SECRET_KEY
        /// <summary>
        /// RegionMark
        /// </summary>
@@ -44,7 +46,6 @@
        #endregion

        #region **********网络请求封装**********

        /// <summary>
        ///  Get  请求服务器方法
        /// </summary>
@@ -154,7 +155,7 @@

            if(MainPage.NoLoginMode)
            {
                return new ResponsePackNew() { Code = "0" };
                return new ResponsePackNew() { Code = "0" ,Data = "" };
            }
            #region HttpWebRequest
            try
@@ -172,6 +173,7 @@
                RestRequest request = new RestRequest(method);
                request.Timeout = mTimeout * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//增加语言标识 wxr 2023-03-22 17:03:34

                if (string.IsNullOrEmpty(replaceToken))
                {
@@ -184,6 +186,7 @@
                {
                    request.AddHeader("Authorization", replaceToken); 
                }

           
                if (bodyParameterJson != null)
                {
@@ -205,8 +208,13 @@
                        request.AddUrlSegment(data.Key, data.Value.ToString());
                    }
                }

                IRestResponse response = client.Execute(request);
                HDL_ON.Utlis.WriteLine("发送", requestFullUrl, response.Request.Body?.Value.ToString());
                if(apiPath == NewAPI.API_POST_Login)
                {
                    var ddd = Newtonsoft.Json.JsonConvert.SerializeObject(response);
                    Console.WriteLine(ddd);
                }
                if (response.StatusCode == HttpStatusCode.OK)
                {
                    try
@@ -224,7 +232,7 @@
                            revertObj.Data = "";
                        }
                        //*****一些判空处理*****************

                        HDL_ON.Utlis.WriteLine("接收", requestFullUrl, response.Content);
                        return revertObj;
                    }
                    catch (Exception ex)
@@ -235,7 +243,19 @@
                }
                else
                {
                    HDL_ON.Utlis.WriteLine($"接口异常:{requestFullUrl} \r\n"+response.ErrorMessage);
                    HDL_ON.Utlis.WriteLine($"接口异常:{requestFullUrl} \r\n"+response.Content);
                    if(response.Content!= null)
                    {
                        try
                        {
                            var pack = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                            if (pack != null)
                            {
                                return pack;
                            }
                        }
                        catch { }
                    }
                    return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                }

@@ -287,7 +307,7 @@
        /// 刷新  Token
        /// </summary>
        /// <returns></returns>
        static bool RefreshToken()
        static bool RefreshToken(bool canRefresh = true)
        {
            try
            {
@@ -304,12 +324,12 @@
                    UserInfo.Current.RefreshToken = revertData.refreshToken;
                    UserInfo.Current.LastTime = DateTime.Now;
                    UserInfo.Current.SaveUserInfo();
                    return true;
#if __IOS__
                    var sdm = new SiriKit.SceneDateManager();
                    sdm.AccessToken = UserInfo.Current.LoginTokenString;
                    sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
                    return true;
                }
                else if (revertObj.Code == StateCode.PasswrodError)
                {
@@ -523,7 +543,7 @@

        }

        #endregion
#endregion

        #region **********签名校验**********