From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
old mode 100644
new mode 100755
index df0aa24..7c83759
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -40,10 +40,7 @@
return (DateTime.Now - LoginDateTime).Days < 7;
}
}
- /// <summary>
- ///鏆傛椂榛樿
- /// </summary>
- public string UserName = string.Empty;
+
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
/// </summary>
@@ -63,8 +60,13 @@
{
config = new Config { };
}
- }
-
+ if (config.PasswordEncrypt != string.Empty)
+ {
+ //瑙ｅ瘑
+ config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
+ }
+ }
+
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -72,7 +74,12 @@
/// <summary>
/// 褰撳墠甯愬彿瀵嗙爜
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string Password = string.Empty;
+ /// <summary>
+ /// 鍔犲瘑瀵嗙爜
+ /// </summary>
+ public string PasswordEncrypt = string.Empty;
/// <summary>
/// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑瀵嗙爜
/// </summary>
@@ -80,11 +87,7 @@
/// <summary>
/// 鐧婚檰璐﹀彿鐨凣uid
/// </summary>
- public string Guid = string.Empty;
- /// <summary>
- /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
- /// </summary>
- public bool isAdministrator = false;
+ public string Guid = string.Empty;
/// <summary>
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃
/// </summary>
@@ -93,6 +96,11 @@
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫��
/// </summary>
public string AdminRequestToken = string.Empty;
+ /// <summary>
+ /// 杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string ConnEmqClientId = string.Empty;
[Newtonsoft.Json.JsonIgnore]
/// <summary>
@@ -123,14 +131,14 @@
}
/// <summary>
- /// 鐧诲綍杩囩殑甯愬彿淇℃伅
+ /// 鐧诲綍鏃禩oken
/// </summary>
- public List<string> AccountList = new List<string> { };
+ public string LoginToken = string.Empty;
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
-
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
@@ -178,6 +186,8 @@
/// </summary>
public void Save()
{
+ //鍔犲瘑,涓嶈兘淇濆瓨鏄庣爜
+ this.PasswordEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.Password);
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
Shared.IO.FileUtils.WriteFileByBytes(fileName, bytes);
ReFresh();
--
Gitblit v1.8.0