SVN r1168

SVN-Revision: r1168

插件库/Lskj.Main/FrmLogin.cs

@@ -68,6 +68,8 @@ namespace Lskj.Main
                                 (?=.*[^a-zA-Z0-9])              #必须包含符号
                                 .{8,18}                         #至少8个字符，最多18个字符
                             ", RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace);
+
+        private bool isPlaintextPwd;
         public FrmLogin()
         {
             InitializeComponent();
@@ -258,6 +260,7 @@ namespace Lskj.Main
                 BaseImpl.HasExistsColumn("P_EmployeeTab", "useLanguage", "nvarchar(50)");
                 arg = " ,useLanguage";
             }
+            
             //if (BaseImpl.HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
             //    arg += ",DefaultLedger";
             BaseImpl.HasExistsColumn("P_SystemTab", "LoginPopupFlag", "int");
@@ -351,9 +354,16 @@ namespace Lskj.Main
                 MessageUtil.Show(ResourceKeys.UpdateAddressIsNull);
                 return;
             }
+            string verDesp = string.Empty;
+            if (BaseImpl.HasExistsTable("p_ErpProUpdateInfo")) 
+            {
+                string sqlValue = "select top 1 verDesp from p_ErpProUpdateInfo  order by  updateDate desc";
+                verDesp = SqlHelper.ExecuteString("verDesp", sqlValue);
+                
+            }
 
             bool isUpdateSucess = false;
-            IAutoUpdater updater = new AutoUpdater(SystemInfo.Instance.UpdateAddress, true);
+            IAutoUpdater updater = new AutoUpdater(SystemInfo.Instance.UpdateAddress, true,false, verDesp);
             try
             {
                 updater.Update();
@@ -1087,6 +1097,10 @@ namespace Lskj.Main
                 {
                     this.forgetPwd.Visible = true;//允许修改密码
                 }
+                if (SystemInfo.Instance.ViewPwd)
+                {
+                    this.checkPwd.Visible = true;//查看密码明文
+                }
                 if (SystemInfo.Instance.AutomaticUpdates)
                 {
                     this.chkUpdate.Checked = true;
@@ -1838,4 +1852,19 @@ namespace Lskj.Main
         /// <summary>
         /// 忘记密码点击时
         /// </summary>
-        /// <param n
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnForgetPwdClick(object sender, EventArgs e)
+        {
+            using (BaseForm baseForm = new BaseForm())
+            {
+                FrmWebBrowser frmWebBrowser = new FrmWebBrowser();
+                frmWebBrowser.Dock = DockStyle.Fill;
+                baseForm.Controls.Add(frmWebBrowser);
+                baseForm.Text = "忘记密码";
+                baseForm.Size = new Size(1000, 600);
+                string forgetPwdUrl = "";
+                if (SystemInfo.Instance.OAUrl.EndsWith("/"))
+                {
+                    forgetPwdUrl = $"{SystemInfo.Instance.OAUrl}lserp_v8/index.html?verify=1";
+                }