From f60ce72c3c29c7d31a046795c88ec39a69e73d45 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 06 一月 2021 17:33:54 +0800
Subject: [PATCH] 2021-01-06 1.替换新云端前期准备相关接口，和修改相关参数。
---
Crabtree/SmartHome/HDL/Operation/UserInfo.cs | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/UserInfo.cs b/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
index b4728c8..0e13d63 100644
--- a/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
+++ b/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
@@ -14,37 +14,60 @@
/// </summary>
public static string GlobalRegisterFile = "Register_File";
- /// <summary>
- /// Guid
- /// </summary>
- public string Guid = "";
+
- /// <summary>
- /// MD5PWD
- /// </summary>
- public string MD5PWD = "";
+ ///// <summary>
+ ///// Guid
+ ///// </summary>
+ //public string Guid = "";
+
+ ///// <summary>
+ ///// MD5PWD
+ ///// </summary>
+ //public string MD5PWD = "";
/// <summary>
/// 鐢ㄦ埛
/// </summary>
public string AccountString="";
-
- public string Name = "";
-
+ ///// <summary>
+ ///// 鐢ㄦ埛瀵嗙爜
+ ///// </summary>
+ //public string Password = "";
+ string aesPassword = "";
/// <summary>
- /// 鐢ㄦ埛瀵嗙爜
+ /// 鐢ㄦ埛瀵嗙爜
/// </summary>
- public string Password="";
+ public string Password {
+ get {
+ return Shared.Securitys.EncryptionService.AesDecryptTopic (aesPassword, "HDL85521566HDLON");
+ }
+ set {
+ aesPassword = Shared.Securitys.EncryptionService.AesEncryptTopic (value, "HDL85521566HDLON");
+ }
+ }
/// <summary>
/// 鐢ㄦ埛ID
/// </summary>
public string ID;
+ /// <summary>
+ ///
+ /// </summary>
+ public string Name = "";
/// <summary>
- /// 鍘熷瘑鐮�
+ /// UserType B绔处鍙� C绔处鍙�
/// </summary>
- public string OriginalPassword;
+ public string UserType = "C";
+ /// <summary>
+ ///
+ /// </summary>
+ public string LoginTokenString;
+ /// <summary>
+ ///
+ /// </summary>
+ public string RefreshToken;
/// <summary>
/// 涓婁竴娆＄櫥闄嗘椂闂�
@@ -60,37 +83,37 @@
}
}
- public bool TipShowed = false;
+ //public bool TipShowed = false;
- public int AccountType = 0;
+ //public int AccountType = 0;
- //public int MasterID = 0;
- public string MainUserId = "";
+ ////public int MasterID = 0;
+ //public string MainUserId = "";
- public string LoginToken = "";
- //public string LoginTokenString {
+ //public string LoginToken = "";
+ ////public string LoginTokenString {
+ //// get {
+ //// return LoginToken;
+ //// }
+ ////}
+
+ //public string LoginTokenString{
// get {
- // return LoginToken;
+ // var result = System.Text.Encoding.UTF8.GetBytes (Password);
+ // var md5 = new System.Security.Cryptography.MD5CryptoServiceProvider ();
+ // var output = md5.ComputeHash (result);
+ // var md5Password = BitConverter.ToString (output).Replace ("-", "");
+ // var account_md5Pssword = AccountString + ":" + md5Password;
+ // var tokenBytes = System.Text.Encoding.UTF8.GetBytes (account_md5Pssword);
+ // return Convert.ToBase64String (tokenBytes).Replace ("=", "%3D");
// }
//}
- public string LoginTokenString{
- get {
- var result = System.Text.Encoding.UTF8.GetBytes (Password);
- var md5 = new System.Security.Cryptography.MD5CryptoServiceProvider ();
- var output = md5.ComputeHash (result);
- var md5Password = BitConverter.ToString (output).Replace ("-", "");
- var account_md5Pssword = AccountString + ":" + md5Password;
- var tokenBytes = System.Text.Encoding.UTF8.GetBytes (account_md5Pssword);
- return Convert.ToBase64String (tokenBytes).Replace ("=", "%3D");
- }
- }
-
- /// <summary>
- /// <!--SIP 甯愬彿-->
- /// </summary>
- public string AllVisionRegisterDevUserNameGuid;
+ ///// <summary>
+ ///// <!--SIP 甯愬彿-->
+ ///// </summary>
+ //public string AllVisionRegisterDevUserNameGuid;
public void SaveUserInfo ()
{
--
Gitblit v1.8.0