From 993ecf49ae04ccea89f6bc4a32cfc0c45def1215 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期三, 27 十月 2021 14:23:30 +0800
Subject: [PATCH] 2021-10-27-01
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 973d822..d068161 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -56,6 +56,11 @@
//瑙e瘑
config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
}
+ if (config.Md5pwdEncrypt != string.Empty)
+ {
+ //瑙e瘑
+ config.MD5PWD = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.Md5pwdEncrypt);
+ }
}
/// <summary>
@@ -79,7 +84,12 @@
/// <summary>
/// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑瀵嗙爜
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string MD5PWD = string.Empty;
+ /// <summary>
+ /// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑鍔犲瘑瀵嗙爜
+ /// </summary>
+ public string Md5pwdEncrypt = string.Empty;
/// <summary>
/// 鐧婚檰璐﹀彿鐨凣uid
/// </summary>
@@ -87,10 +97,12 @@
/// <summary>
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string AdminRequestBaseUrl = string.Empty;
/// <summary>
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫��
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string AdminRequestToken = string.Empty;
/// <summary>
/// 杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
@@ -111,6 +123,11 @@
{
get
{
+ if (Shared.Phone.UserCenter.HdlExperienceAccountLogic.Current.IsExperience == true)
+ {
+ //浣撻獙璐﹀彿鐨凾oken
+ return this.TokenExperience;
+ }
string md5Password;
if (string.IsNullOrEmpty(Password))
{
@@ -129,6 +146,29 @@
return Convert.ToBase64String(tokenBytes).Replace("=", "%3D");
}
+ }
+
+ /// <summary>
+ /// 浣撻獙璐﹀彿鐨凾oken
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ private string m_TokenExperience = null;
+ [Newtonsoft.Json.JsonIgnore]
+ public string TokenExperience
+ {
+ get
+ {
+ if (m_TokenExperience != null) { return m_TokenExperience; }
+
+ var result = System.Text.Encoding.UTF8.GetBytes("123456");
+ var md5 = new System.Security.Cryptography.MD5CryptoServiceProvider();
+ var output = md5.ComputeHash(result);
+ var md5Password = BitConverter.ToString(output).Replace("-", "");
+ var account_md5Pssword = "ceyir277@163.com:" + md5Password;
+ var tokenBytes = System.Text.Encoding.UTF8.GetBytes(account_md5Pssword);
+ m_TokenExperience = Convert.ToBase64String(tokenBytes).Replace("=", "%3D");
+ return m_TokenExperience;
+ }
}
/// <summary>
@@ -193,9 +233,10 @@
{
//鍔犲瘑,涓嶈兘淇濆瓨鏄庣爜
this.PasswordEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.Password);
+ this.Md5pwdEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.MD5PWD);
+
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
Shared.IO.FileUtils.WriteFileByBytes(fileName, bytes);
- ReFresh();
}
}
}
--
Gitblit v1.8.0