From cefcc903f51610846fa313a3a35bca34e129c1fe Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 08:57:01 +0800
Subject: [PATCH] 代码清理以及格式化
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 163 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 69 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index b368561..e70806d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,41 +1,46 @@
-锘縰sing Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Newtonsoft.Json.Linq;
-using System.Data;
+锘縰sing System;
using System.Configuration;
-using AutoUpdaterDotNET;
using System.Linq;
+using System.Windows.Forms;
+using AutoUpdaterDotNET;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm
{
- public partial class FrmLogin : DevExpress.XtraEditors.XtraForm
+ public partial class FrmLogin : XtraForm
{
public FrmLogin()
{
InitializeComponent();
- if (ConfigurationManager.AppSettings["IsAutoUpdater"].ToString() == "1")
+ if (ConfigurationManager.AppSettings["IsAutoUpdater"] == "1")
_autoUpdate();
else
getTree();
- this.Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"].ToString();
+ Text = lbVersion.Text =
+ ConfigurationManager.AppSettings["ProductName"];
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
}
+
/// <summary>
- /// 璇诲彇缁勭粐
+ /// 璇诲彇缁勭粐
/// </summary>
private void getTree()
{
- PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", " and IS_STATUS=1");
- string json = JsonConvert.SerializeObject(pgq);
+ var pgq = new PageQueryModel(1, 999999, "factory", "asc", "",
+ " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- ReturnModel<PageListModel> rtn = UtilityHelper.ReturnToTablePage(strReturn);
- DataTable dt = rtn.rtnData.list;
+ var strReturn = UtilityHelper.HttpPost("",
+ "Organization/GetListPage", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
comOrg.DataSource = dt;
comOrg.DisplayMember = "name";
comOrg.ValueMember = "guid";
@@ -44,38 +49,41 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- this.Close();
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ Close();
Application.Exit();
}
}
+
private void BtnCancel_Click(object sender, EventArgs e)
{
- if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
- {
- Application.Exit();
- }
+ if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?")) Application.Exit();
}
+
private void BtnLogin_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(txtUser.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
txtUser.Focus();
return;
}
+
if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
txtUser.Focus();
return;
}
- if (comOrg.SelectedValue == null || string.IsNullOrEmpty(comOrg.SelectedValue.ToString().Trim()))
+
+ if (comOrg.SelectedValue == null ||
+ string.IsNullOrEmpty(comOrg.SelectedValue.ToString().Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐鏈烘瀯涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("缁勭粐鏈烘瀯涓嶈兘涓虹┖锛�");
txtUser.Focus();
return;
}
+
var _obj = new
{
accountPwd = txtPwd.Text.Trim(),
@@ -84,70 +92,81 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("", "User/UserLogin",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
JObject _login = _rtn.rtnData;
if (_rtn.rtnCode > 0)
{
- Properties.Settings.Default.userName = (ckRemember.Checked ? txtUser.Text.Trim() : "");
- Properties.Settings.Default.userPwd = (ckRemember.Checked ? txtPwd.Text.Trim() : "");
- Properties.Settings.Default.orgGuid = (ckRemember.Checked ? comOrg.SelectedValue.ToString() : "");
- Properties.Settings.Default.remember = ckRemember.Checked;
- Properties.Settings.Default.Save();
- LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
- LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
- LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
- LoginInfoModel.CurrentUser.LoginFactory = _login["loginFactory"].ToString();
- this.DialogResult = DialogResult.OK;
+ Settings.Default.userName = ckRemember.Checked
+ ? txtUser.Text.Trim()
+ : "";
+ Settings.Default.userPwd =
+ ckRemember.Checked ? txtPwd.Text.Trim() : "";
+ Settings.Default.orgGuid = ckRemember.Checked
+ ? comOrg.SelectedValue.ToString()
+ : "";
+ Settings.Default.remember = ckRemember.Checked;
+ Settings.Default.Save();
+ LoginInfoModel.CurrentUser.LoginUserGuid =
+ _login["loginGuid"].ToString();
+ LoginInfoModel.CurrentUser.LoginOrgGuid =
+ _login["loginOrgGuid"].ToString();
+ LoginInfoModel.CurrentUser.LoginTime =
+ DateTime.Now.ToString("yyyy-MM-dd hh:mm");
+ LoginInfoModel.CurrentUser.LoginFactory =
+ _login["loginFactory"].ToString();
+ DialogResult = DialogResult.OK;
}
else
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- this.DialogResult = DialogResult.None;
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ DialogResult = DialogResult.None;
}
}
catch (Exception ex)
{
- this.DialogResult = DialogResult.Cancel;
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ DialogResult = DialogResult.Cancel;
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
/// <summary>
- /// 璇诲彇璁颁綇瀵嗙爜
+ /// 璇诲彇璁颁綇瀵嗙爜
/// </summary>
private void _getRemember()
{
try
{
- if (Properties.Settings.Default.remember)
+ if (Settings.Default.remember)
{
- txtUser.Text = Properties.Settings.Default.userName;
- txtPwd.Text = Properties.Settings.Default.userPwd;
- comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
+ txtUser.Text = Settings.Default.userName;
+ txtPwd.Text = Settings.Default.userPwd;
+ comOrg.SelectedValue = Settings.Default.orgGuid;
ckRemember.Checked = true;
}
}
catch (Exception ex)
{
-
MessageBox.Show(ex.Message);
}
-
}
+
private void _autoUpdate()
{
- string _version = ConfigurationManager.AppSettings["Version"];
+ var _version = ConfigurationManager.AppSettings["Version"];
AutoUpdater.InstalledVersion = new Version(_version);
- AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"].ToString());
+ AutoUpdater.Start(
+ ConfigurationManager.AppSettings["AutoUpdaterXml"]);
AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
}
+
private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
{
-
if (args == null || string.IsNullOrEmpty(args.DownloadURL))
{
MsgHelper.ShowError("璇诲彇鑷姩鏇存柊澶辫触锛屾棤娉曠櫥褰曪紝璇疯仈绯荤鐞嗗憳锛�");
- this.Close();
+ Close();
Application.Exit();
return;
}
@@ -157,48 +176,54 @@
getTree();
return;
}
- string _strMsg = string.Format($@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
+
+ var _strMsg =
+ string.Format(
+ $@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
if (!MsgHelper.AskQuestion(_strMsg))
{
- this.Close();
+ Close();
Application.Exit();
return;
}
+
try
{
if (AutoUpdater.DownloadUpdate(args))
{
- Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+ var config =
+ ConfigurationManager.OpenExeConfiguration(
+ ConfigurationUserLevel.None);
if (config != null)
{
- AppSettingsSection appSettings = (AppSettingsSection)config.GetSection("appSettings");
+ var appSettings =
+ (AppSettingsSection)config.GetSection(
+ "appSettings");
if (appSettings.Settings.AllKeys.Contains("Version"))
- {
- appSettings.Settings["Version"].Value = args.CurrentVersion;
- }
+ appSettings.Settings["Version"].Value =
+ args.CurrentVersion;
else
- {
- appSettings.Settings.Add("Version", args.CurrentVersion);
- }
+ appSettings.Settings.Add("Version",
+ args.CurrentVersion);
config.Save(ConfigurationSaveMode.Modified);
ConfigurationManager.RefreshSection("appSettings");
}
+
Application.Exit();
}
else
{
MsgHelper.ShowError("璇诲彇鑷姩鏇存柊澶辫触锛屾棤娉曠櫥褰曪紝璇疯仈绯荤鐞嗗憳锛�");
- this.Close();
+ Close();
Application.Exit();
- return;
}
}
catch (Exception exception)
{
- MsgHelper.ShowError(exception.Message + "锛�" + exception.GetType().ToString());
- this.Close();
+ MsgHelper.ShowError(exception.Message + "锛�" +
+ exception.GetType());
+ Close();
Application.Exit();
- return;
}
}
}
--
Gitblit v1.9.3