Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 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,8 +18,13 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        //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";
        /// <summary>
        /// RegionMark
        /// </summary>
@@ -31,9 +37,9 @@
        /// 特殊接口请求超时时间
        /// </summary>
        public const int TIME_OUT_LONG = 20;
        /////// <summary>
        /////// Bearer 暂时设为空，从登陆成功的返回的headerPrefix参数动态获取
        /////// </summary>
        ///// <summary>
        ///// Bearer 暂时设为空，从登陆成功的返回的headerPrefix参数动态获取
        ///// </summary>
        //public const string TOKEN_BEARER = "Bearer ";

        #endregion
@@ -167,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))
                {
@@ -179,6 +186,7 @@
                {
                    request.AddHeader("Authorization", replaceToken); 
                }

           
                if (bodyParameterJson != null)
                {
@@ -230,7 +238,19 @@
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    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 };
                }

@@ -295,6 +315,7 @@
                {
                    var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
                    UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
                    UserInfo.Current.AccessToken = revertData.accessToken;
                    UserInfo.Current.RefreshToken = revertData.refreshToken;
                    UserInfo.Current.LastTime = DateTime.Now;
                    UserInfo.Current.SaveUserInfo();
@@ -304,6 +325,10 @@
                    sdm.AccessToken = UserInfo.Current.LoginTokenString;
                    sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
                }
                else if (revertObj.Code == StateCode.PasswrodError)
                {
                    UserInfo.Current.LastTime = DateTime.MinValue;
                }
                return false;
            }
@@ -516,14 +541,6 @@
        #endregion

        #region **********签名校验**********
        /// <summary>
        /// 
        /// </summary>
        const string APP_KEY = "HDL-HOME-APP-TEST";
        /// <summary>
        /// 
        /// </summary>
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";

        /// <summary>
        /// 获取当前时间戳值