From 3aa008c8ce56cbd4cc981ba10a8b4c143208ad48 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期二, 27 八月 2024 22:49:57 +0800
Subject: [PATCH] 无

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 15876de..ae99c31 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,15 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
+using Gs.DevApp.Models;
+using Newtonsoft.Json.Linq;
 
 namespace Gs.DevApp.DevFrm
 {
@@ -18,44 +12,56 @@
         public FrmLogin()
         {
             InitializeComponent();
+            this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
             btnLogin.Click += BtnLogin_Click;
             btnCancel.Click += BtnCancel_Click;
         }
 
         private void BtnCancel_Click(object sender, EventArgs e)
         {
-            if (Msg.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
+            if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
             {
-                // frmMain1.IsClosing = true;
                 Application.Exit();
             }
         }
 
         private void BtnLogin_Click(object sender, EventArgs e)
         {
-            //int i = 199;
-            //ShowDialogForm sdf = new ShowDialogForm("鎻愮ず", "姝e湪鐧诲綍......", "璇疯�愬績绛夊�欙紝姝e湪楠岃瘉鎮ㄧ殑韬唤锛�", i);
-            //for (int j = 1; j < i; j++) 
-            //{ 
-            //    sdf.SetCaption("鎵ц杩涘害锛�" + j.ToString() + "/" + i.ToString() + "锛�"); 
-            //}
+            int i = 100;
+            Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝e湪楠岃瘉鎮ㄧ殑韬唤锛�");
             var _obj = new
             {
                 accountPwd = txtUser.Text.Trim(),
                 accountNo = txtPwd.Text.Trim(),
                 orgGuid = Guid.NewGuid()
             };
-            string json = JsonConvert.SerializeObject(_obj);
+            sdf.SetCaption("鎵ц杩涘害锛�" + (i - 80) + "/" + i.ToString() + "锛�");
             try
             {
-                Utility.HttpPost("", "User/UserLogin", json);
+
+                string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+                JObject _login = _rtn.rtnData;
+                if (_rtn.rtnCode > 0)
+                {
+                    LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
+                    LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
+                    LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                sdf.SetCaption("鎵ц杩涘害锛�" + (i - 10) + "/" + i.ToString() + "锛�");
             }
             catch (Exception ex)
             {
-                throw ex;
+                sdf.Close();
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                return;
             }
-            //  sdf.Close();
-
+            sdf.Close();
+            this.DialogResult = DialogResult.OK;
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3