From 4bc7030c4cea5b3deed0c938ec388ae94e33c51c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 09:42:36 +0800
Subject: [PATCH] 修改会页
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 96 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 274ef24..b368561 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -5,6 +5,9 @@
using Gs.DevApp.Entity;
using Newtonsoft.Json.Linq;
using System.Data;
+using System.Configuration;
+using AutoUpdaterDotNET;
+using System.Linq;
namespace Gs.DevApp.DevFrm
{
@@ -13,34 +16,37 @@
public FrmLogin()
{
InitializeComponent();
- this.Text = lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ if (ConfigurationManager.AppSettings["IsAutoUpdater"].ToString() == "1")
+ _autoUpdate();
+ else
+ getTree();
+ this.Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"].ToString();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
- getTree();
- getRemember();
}
/// <summary>
/// 璇诲彇缁勭粐
/// </summary>
private void getTree()
{
- PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "and status=1");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", " and IS_STATUS=1");
string json = JsonConvert.SerializeObject(pgq);
- string strReturn = "";
try
{
- strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- ReturnModel<PageListModel> rtn = UtilityHelper.GetTableByJson(strReturn);
+ string strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ ReturnModel<PageListModel> rtn = UtilityHelper.ReturnToTablePage(strReturn);
DataTable dt = rtn.rtnData.list;
comOrg.DataSource = dt;
comOrg.DisplayMember = "name";
comOrg.ValueMember = "guid";
comOrg.SelectedIndex = 0;
+ _getRemember();
}
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
this.Close();
+ Application.Exit();
}
}
private void BtnCancel_Click(object sender, EventArgs e)
@@ -50,7 +56,6 @@
Application.Exit();
}
}
-
private void BtnLogin_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(txtUser.Text.Trim()))
@@ -80,7 +85,7 @@
try
{
string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
JObject _login = _rtn.rtnData;
if (_rtn.rtnCode > 0)
{
@@ -110,14 +115,90 @@
/// <summary>
/// 璇诲彇璁颁綇瀵嗙爜
/// </summary>
- private void getRemember()
+ private void _getRemember()
{
- if (Properties.Settings.Default.remember)
+ try
{
- txtUser.Text = Properties.Settings.Default.userName;
- txtPwd.Text = Properties.Settings.Default.userPwd;
- comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
- ckRemember.Checked = true;
+ if (Properties.Settings.Default.remember)
+ {
+ txtUser.Text = Properties.Settings.Default.userName;
+ txtPwd.Text = Properties.Settings.Default.userPwd;
+ comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
+ ckRemember.Checked = true;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ MessageBox.Show(ex.Message);
+ }
+
+ }
+ private void _autoUpdate()
+ {
+ string _version = ConfigurationManager.AppSettings["Version"];
+ AutoUpdater.InstalledVersion = new Version(_version);
+ AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"].ToString());
+ AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
+ }
+ private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
+ {
+
+ if (args == null || string.IsNullOrEmpty(args.DownloadURL))
+ {
+ MsgHelper.ShowError("璇诲彇鑷姩鏇存柊澶辫触锛屾棤娉曠櫥褰曪紝璇疯仈绯荤鐞嗗憳锛�");
+ this.Close();
+ Application.Exit();
+ return;
+ }
+
+ if (!args.IsUpdateAvailable)
+ {
+ getTree();
+ return;
+ }
+ string _strMsg = string.Format($@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
+ if (!MsgHelper.AskQuestion(_strMsg))
+ {
+ this.Close();
+ Application.Exit();
+ return;
+ }
+ try
+ {
+ if (AutoUpdater.DownloadUpdate(args))
+ {
+ Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+ if (config != null)
+ {
+ AppSettingsSection appSettings = (AppSettingsSection)config.GetSection("appSettings");
+ if (appSettings.Settings.AllKeys.Contains("Version"))
+ {
+ appSettings.Settings["Version"].Value = args.CurrentVersion;
+ }
+ else
+ {
+ appSettings.Settings.Add("Version", args.CurrentVersion);
+ }
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+ Application.Exit();
+ }
+ else
+ {
+ MsgHelper.ShowError("璇诲彇鑷姩鏇存柊澶辫触锛屾棤娉曠櫥褰曪紝璇疯仈绯荤鐞嗗憳锛�");
+ this.Close();
+ Application.Exit();
+ return;
+ }
+ }
+ catch (Exception exception)
+ {
+ MsgHelper.ShowError(exception.Message + "锛�" + exception.GetType().ToString());
+ this.Close();
+ Application.Exit();
+ return;
}
}
}
--
Gitblit v1.9.3