1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -1,10 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
using HDL_ON.DAL.Mqtt;
using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -119,13 +118,10 @@
            if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());

                 UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
                 UserInfo.Current.LastTime = DateTime.Now;
                 UserInfo.Current.SaveUserInfo();


                UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
                UserInfo.Current.refreshToken = revertData.refreshToken;
                UserInfo.Current.lastTime = DateTime.Now;
                UserInfo.Current.SaveUserInfo();
                return true;
            }
            return false;
@@ -1762,38 +1758,6 @@

        #endregion

        #region mqtt
        /// <summary>
        /// 获取MQTT远程连接信息接口
        /// </summary>
        public MqttInfo GetMqttRemoteInfo(string attachClientId)
        {
            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
                {
                    attachClientId = attachClientId,
                    homeType = HomeTypeEnum.BUSPRO.ToString()
                });
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
                }
                else
                {
                    Utlis.WriteLine("GetMqttRemoteInfo error");
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #endregion


    }
}
}