Commit d57bbd77 authored by 段廷瑞's avatar 段廷瑞

1、剔除无效代码

parent 2d39c8eb
...@@ -15,18 +15,6 @@ namespace Tools.MyCommon ...@@ -15,18 +15,6 @@ namespace Tools.MyCommon
/// </summary> /// </summary>
public class APP public class APP
{ {
/// <summary>
/// 登录信息
/// </summary>
public static string LOGIN_INFO => "LoginInfo";
/// <summary>
/// 登录验证
/// </summary>
public static string LOGIN_VERIFY => "LoginVerify";
/// <summary>
/// 更新时间
/// </summary>
public static string UPDATE_TIME => "UpdateTime";
/// <summary> /// <summary>
/// 临时用户名 /// 临时用户名
/// </summary> /// </summary>
......
...@@ -191,7 +191,7 @@ namespace Tools.MyUtils ...@@ -191,7 +191,7 @@ namespace Tools.MyUtils
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <returns></returns> /// <returns></returns>
public static T JsonConfig<T>() where T : new() public static T GetJsonConfig<T>() where T : new()
{ {
var fileName = $@"{Utils.ConfigPath}\{typeof(T).Name}.json"; var fileName = $@"{Utils.ConfigPath}\{typeof(T).Name}.json";
if (!File.Exists(fileName)) if (!File.Exists(fileName))
...@@ -211,7 +211,7 @@ namespace Tools.MyUtils ...@@ -211,7 +211,7 @@ namespace Tools.MyUtils
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="config"></param> /// <param name="config"></param>
public static void JsonConfig<T>(T config) public static void SaveJsonConfig<T>(T config)
{ {
var fileName = $@"{Utils.ConfigPath}\{typeof(T).Name}.json"; var fileName = $@"{Utils.ConfigPath}\{typeof(T).Name}.json";
File.WriteAllText(fileName, JsonConvert.SerializeObject(config), Encoding.UTF8); File.WriteAllText(fileName, JsonConvert.SerializeObject(config), Encoding.UTF8);
......
...@@ -64,10 +64,10 @@ namespace Tools.UI.sys ...@@ -64,10 +64,10 @@ namespace Tools.UI.sys
LoginInfo.IsPrincipal = Convert.ToBoolean(dt.DefaultView[0]["IsPrincipal"].ToString()); LoginInfo.IsPrincipal = Convert.ToBoolean(dt.DefaultView[0]["IsPrincipal"].ToString());
LoginInfo.IsStaff = Convert.ToBoolean(dt.DefaultView[0]["IsStaff"].ToString()); LoginInfo.IsStaff = Convert.ToBoolean(dt.DefaultView[0]["IsStaff"].ToString());
//保存登录信息 //保存登录信息
var m = Utils.JsonConfig<LoginMemory>(); var m = Utils.GetJsonConfig<LoginMemory>();
m.LoginInfo = Utils.Encryptor(dt.DefaultView[0]["ID"].ToString()); m.LoginInfo = Utils.Encryptor(dt.DefaultView[0]["ID"].ToString());
m.LoginVerify = password; m.LoginVerify = password;
Utils.JsonConfig(m); Utils.SaveJsonConfig(m);
//关闭窗口 //关闭窗口
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
this.Close(); this.Close();
......
...@@ -142,7 +142,9 @@ namespace Tools.UI.sys ...@@ -142,7 +142,9 @@ namespace Tools.UI.sys
{ {
this.Save(); this.Save();
//刷新更新日期,即默认本机为最新版本 //刷新更新日期,即默认本机为最新版本
Utils.AppSettings(APP.UPDATE_TIME, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")); var m = Utils.GetJsonConfig<LoginMemory>();
m.UpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
Utils.SaveJsonConfig(m);
} }
} }
} }
...@@ -260,8 +260,8 @@ namespace Tools ...@@ -260,8 +260,8 @@ namespace Tools
/// </summary> /// </summary>
private void CheckUpdate(bool IsSilentWhenNotFound = false) private void CheckUpdate(bool IsSilentWhenNotFound = false)
{ {
var m = Utils.JsonConfig<LoginMemory>(); var m = Utils.GetJsonConfig<LoginMemory>();
var updateTime = m.UpdateTime; //Utils.AppSettings(APP.UPDATE_TIME); var updateTime = m.UpdateTime;
var dt =this._db.GetDataTable($"SELECT TOP 1 UDate, URemark FROM dbo.FTT_AutoUpdate WHERE UDate > '{updateTime}' ORDER BY UDate DESC", "FTT_AutoUpdate"); var dt =this._db.GetDataTable($"SELECT TOP 1 UDate, URemark FROM dbo.FTT_AutoUpdate WHERE UDate > '{updateTime}' ORDER BY UDate DESC", "FTT_AutoUpdate");
if (dt.DefaultView.Count > 0) if (dt.DefaultView.Count > 0)
{ {
...@@ -283,8 +283,7 @@ namespace Tools ...@@ -283,8 +283,7 @@ namespace Tools
{ {
var date = Convert.ToDateTime(drv["UDate"]); var date = Convert.ToDateTime(drv["UDate"]);
m.UpdateTime = date.ToString("yyyy-MM-dd HH:mm:ss.fff"); m.UpdateTime = date.ToString("yyyy-MM-dd HH:mm:ss.fff");
Utils.JsonConfig(m); Utils.SaveJsonConfig(m);
//Utils.AppSettings(APP.UPDATE_TIME, date.ToString("yyyy-MM-dd HH:mm:ss.fff"));
} }
else else
{ {
...@@ -481,9 +480,9 @@ namespace Tools ...@@ -481,9 +480,9 @@ namespace Tools
/// </summary> /// </summary>
private void InitLoginInfo() private void InitLoginInfo()
{ {
var m = Utils.JsonConfig<LoginMemory>(); var m = Utils.GetJsonConfig<LoginMemory>();
//获取登录信息 //获取登录信息
var loginInfo = m.LoginInfo; //Utils.AppSettings(APP.LOGIN_INFO); var loginInfo = m.LoginInfo;
if (!string.IsNullOrEmpty(loginInfo)) if (!string.IsNullOrEmpty(loginInfo))
{ {
var sql = $@" var sql = $@"
...@@ -499,7 +498,7 @@ namespace Tools ...@@ -499,7 +498,7 @@ namespace Tools
var userName = dt.DefaultView[0]["UserName"].ToString(); var userName = dt.DefaultView[0]["UserName"].ToString();
var password = dt.DefaultView[0]["Password"].ToString(); var password = dt.DefaultView[0]["Password"].ToString();
//验证密码 //验证密码
var loginVerify = m.LoginVerify; //Utils.AppSettings(APP.LOGIN_VERIFY); var loginVerify = m.LoginVerify;
if (loginVerify != password) if (loginVerify != password)
{ {
if (Utils.TipYN("密码已过期,请重新登录!")) if (Utils.TipYN("密码已过期,请重新登录!"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment