From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 50 +++++++-------------------------------------------
1 files changed, 7 insertions(+), 43 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a16880b..4dd4352 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;
@@ -113,19 +112,16 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = UserInfo.Current.refreshToken,
+ refreshToken = UserInfo.Current.RefreshToken,
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
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.refreshToken = revertData.refreshToken;
+ 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