From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/Entity/UserInfo.cs | 133 ++++++++++---------------------------------
1 files changed, 32 insertions(+), 101 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 9465064..ebf358d 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -3,75 +3,12 @@
using System.Text;
using System.IO;
using System.Drawing;
-using HDL_ON.DAL;
-using HDL_ON.DAL.Server;
namespace HDL_ON
{
[System.Serializable]
public class UserInfo
{
- public static readonly string ConfigFile = "UserInfo_File";
- /// <summary>
- /// 閫氱敤鏂规硶
- /// </summary>
- private static UserInfo m_Current = null;
- /// <summary>
- /// 閫氱敤鏂规硶
- /// </summary>
- public static UserInfo Current
- {
- get
- {
- if (m_Current == null)
- {
- try
- {
- UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile(ConfigFile)));
- if (temp == null)
- {
- m_Current = new UserInfo() { };
- Utlis.WriteLine("UserInfo null");
- }
- else
- {
- m_Current = temp;
- Utlis.WriteLine("UserInfo Current");
- }
- }
- catch
- {
- m_Current = new UserInfo() { };
- Utlis.WriteLine("UserInfo null");
- }
- }
- return m_Current;
- }
- }
-
- #region 鏂板淇濆瓨鍙傛暟
- /// <summary>
- /// 璐﹀彿娉ㄥ唽鏈嶅姟鍣ㄤ俊鎭�
- /// </summary>
- public string RequestHttpsHost = "https://china.hdlcontrol.com";
- /// <summary>
- ///
- /// </summary>
- public GlobalRegionListRes GlobalRegion;
-
- /// <summary>
- /// 鏄惁鍚屾剰鍗忚
- /// </summary>
- public bool isAgreePrivacyPolicy;
-
- /// <summary>
- /// 蹇界暐鏇存柊鐨勭増鏈彿
- /// </summary>
- public string IgnoreUpdateVersion = string.Empty;
- #endregion
-
-
-
/// <summary>
/// 鐢ㄦ埛鍚嶇О
/// </summary>
@@ -79,26 +16,11 @@
/// <summary>
/// 鐢ㄦ埛
/// </summary>
- public string AccountString = "";
- ///// <summary>
- ///// 鐢ㄦ埛瀵嗙爜
- ///// </summary>
- //public string password = "";
- //string aesPassword = "";
- ///// <summary>
- ///// 鐢ㄦ埛瀵嗙爜
- ///// </summary>
- //public string password
- //{
- // get
- // {
- // return Shared.Securitys.EncryptionService.AesDecryptTopic(aesPassword, "85521566HDLONPRO");
- // }
- // set
- // {
- // aesPassword = Shared.Securitys.EncryptionService.AesEncryptTopic(value, "85521566HDLONPRO");
- // }
- //}
+ public string accountString = "";
+ /// <summary>
+ /// 鐢ㄦ埛瀵嗙爜
+ /// </summary>
+ public string password = "";
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙风爜
/// </summary>
@@ -110,7 +32,7 @@
/// <summary>
/// 鐢ㄦ埛ID
/// </summary>
- public string ID;
+ public int ID;
/// <summary>
/// 鐢ㄦ埛閫夋嫨鏄剧ず鐨勮瑷�
/// </summary>
@@ -118,7 +40,8 @@
/// <summary>
/// 鐢ㄦ埛鍖哄煙
/// </summary>
- public string areaCode = "86";
+ public int areaCode = 86;
+
/// <summary>
/// 鐢ㄦ埛澶村儚鍥剧墖
/// </summary>
@@ -127,10 +50,12 @@
/// 鐢ㄦ埛澶村儚byte鏁版嵁
/// </summary>
public byte[] headImagePageBytes = null;
+
/// <summary>
/// 涓婁竴娆＄櫥褰曟椂闂�
/// </summary>
- public DateTime LastTime = DateTime.MinValue;
+ public DateTime lastTime = DateTime.MinValue;
+
/// <summary>
/// 鏄惁鏄櫥褰曠姸鎬�
/// </summary>
@@ -138,23 +63,27 @@
{
get
{
- return (DateTime.Now - LastTime).TotalDays < 7;
+ return (DateTime.Now - lastTime).TotalDays < 7;
}
}
- /// <summary>
- ///
- /// </summary>
- public string LoginTokenString;
- /// <summary>
- ///
- /// </summary>
- public string RefreshToken;
- /// <summary>
- /// UserType B绔处鍙� C绔处鍙�
- /// </summary>
- public string userType = "USER_C";
-
+ public int accountType = 0;
+
+ public int masterID = 0;
+
+ public string loginTokenString;
+ //{
+ // get
+ // {
+ // var result = 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 = Encoding.UTF8.GetBytes(account_md5Pssword);
+ // return Convert.ToBase64String(tokenBytes).Replace("=", "%3D");
+ // }
+ //}
/// <summary>
/// 鐢ㄦ埛浣忓畢鍒楄〃
/// </summary>
@@ -162,9 +91,11 @@
public void SaveUserInfo()
{
- FileUtils.WriteFileByBytes(ConfigFile, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ FileUtils.WriteFileByBytes("UserInfo_File", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
}
+
+
private byte[] convertByte(Image img)
{
--
Gitblit v1.8.0