From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 127 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index e70806d..43a3a63 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,6 +1,9 @@
锘縰sing System;
using System.Configuration;
using System.Linq;
+using System.Management;
+using System.Net.Sockets;
+using System.Net;
using System.Windows.Forms;
using AutoUpdaterDotNET;
using DevExpress.XtraEditors;
@@ -19,40 +22,12 @@
InitializeComponent();
if (ConfigurationManager.AppSettings["IsAutoUpdater"] == "1")
_autoUpdate();
- else
- getTree();
- Text = lbVersion.Text =
- ConfigurationManager.AppSettings["ProductName"];
+ _getRemember();
+ Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"];
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
- }
-
- /// <summary>
- /// 璇诲彇缁勭粐
- /// </summary>
- private void getTree()
- {
- var pgq = new PageQueryModel(1, 999999, "factory", "asc", "",
- " and IS_STATUS=1");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- 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";
- comOrg.SelectedIndex = 0;
- _getRemember();
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- Close();
- Application.Exit();
- }
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
}
private void BtnCancel_Click(object sender, EventArgs e)
@@ -75,20 +50,12 @@
txtUser.Focus();
return;
}
-
- if (comOrg.SelectedValue == null ||
- string.IsNullOrEmpty(comOrg.SelectedValue.ToString().Trim()))
- {
- MsgHelper.Warning("缁勭粐鏈烘瀯涓嶈兘涓虹┖锛�");
- txtUser.Focus();
- return;
- }
-
+ string strLog = GetMacAddress();
var _obj = new
{
accountPwd = txtPwd.Text.Trim(),
accountNo = txtUser.Text.Trim(),
- orgGuid = comOrg.SelectedValue.ToString().Trim()
+ accountLog = strLog
};
try
{
@@ -98,24 +65,12 @@
JObject _login = _rtn.rtnData;
if (_rtn.rtnCode > 0)
{
- 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.userName = ckRemember.Checked ? txtUser.Text.Trim() : "";
+ Settings.Default.userPwd = ckRemember.Checked ? txtPwd.Text.Trim() : "";
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();
+ LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
+ LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
DialogResult = DialogResult.OK;
}
else
@@ -132,7 +87,7 @@
}
/// <summary>
- /// 璇诲彇璁颁綇瀵嗙爜
+ /// 璇诲彇璁颁綇瀵嗙爜
/// </summary>
private void _getRemember()
{
@@ -142,7 +97,6 @@
{
txtUser.Text = Settings.Default.userName;
txtPwd.Text = Settings.Default.userPwd;
- comOrg.SelectedValue = Settings.Default.orgGuid;
ckRemember.Checked = true;
}
}
@@ -156,8 +110,7 @@
{
var _version = ConfigurationManager.AppSettings["Version"];
AutoUpdater.InstalledVersion = new Version(_version);
- AutoUpdater.Start(
- ConfigurationManager.AppSettings["AutoUpdaterXml"]);
+ AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
}
@@ -173,7 +126,6 @@
if (!args.IsUpdateAvailable)
{
- getTree();
return;
}
@@ -220,11 +172,56 @@
}
catch (Exception exception)
{
- MsgHelper.ShowError(exception.Message + "锛�" +
- exception.GetType());
+ MsgHelper.ShowError(exception.Message + "锛�" + exception.GetType());
Close();
Application.Exit();
}
}
+
+
+ private string GetMacAddress()
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ try
+ {
+ sb.Append("涓绘満鍚�: ");
+ string hostName = Dns.GetHostName();
+ sb.Append(hostName);
+ sb.Append("锛汭Pv4: ");
+ IPAddress[] addresses = Dns.GetHostAddresses(hostName);
+ int i = 0;
+ foreach (IPAddress address in addresses)
+ {
+ if (address.AddressFamily == AddressFamily.InterNetwork) // 杩囨护鍑篒Pv4鍦板潃
+ {
+ if (i > 0)
+ sb.Append("锛�");
+ sb.Append(address.ToString());
+ }
+ }
+ i = 0;
+ sb.Append("锛汳AC: ");
+ ManagementClass mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
+ ManagementObjectCollection moc = mc.GetInstances();
+ string macAddress = string.Empty;
+ foreach (ManagementObject mo in moc)
+ {
+ if ((bool)mo["IPEnabled"])
+ {
+ if (i > 0)
+ sb.Append("锛�");
+ macAddress = mo["MacAddress"].ToString();
+ sb.Append(macAddress);
+ break;
+ }
+ }
+ return sb.ToString();
+ }
+ catch (Exception ex)
+ {
+ sb.Append(ex.Message);
+ }
+ return sb.ToString();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3