From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a16880b..6050b4a 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1,10 +1,9 @@
-using System;
+锘縰sing 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
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0