1、注释及命名优化

Tools/wMain.cs

@@ -50,8 +50,8 @@ namespace Tools
             //初始化数据库链接
             var link = Utils.GetDbLinkString204("FTT_Work");
             this._db = new DBHelper(link);
-            //检查权限
-            this.CheckPower();
+            //初始化登录信息
+            this.InitLoginInfo();
             //渲染菜单
             this.RenderMenu();
         }
@@ -431,7 +431,7 @@ namespace Tools
         }
 
         #endregion
-        #region 扩展：登录功能
+        #region 扩展：登录及权限
 
         //登录人员点击
         private void LbSysLoginUser_Click(object sender, EventArgs e)
@@ -448,6 +448,79 @@ namespace Tools
             }
         }
 
+        /// <summary>
+        /// 初始化登录信息
+        /// </summary>
+        private void InitLoginInfo()
+        {
+            //获取登录信息
+            var loginInfo = Utils.AppSettings(APP.LOGIN_INFO);
+            if (!string.IsNullOrEmpty(loginInfo))
+            {
+                var sql = $@"
+                SELECT Name as UserName, 
+                    LoginPassword as Password, 
+                    ISNULL(IsPrincipal, 0) AS IsPrincipal,
+                    CAST(CASE WHEN UserType = 5311 THEN 1 ELSE 0 END AS BIT) AS IsStaff
+                FROM dbo.AC_User
+                WHERE ISNULL(IsStop, 0) = 0 and ID = {Utils.Decryptor(loginInfo)}";
+                var dt = this._db.GetDataTable(sql, "user", false);
+                if (dt.DefaultView.Count > 0)
+                {
+                    var userName = dt.DefaultView[0]["UserName"].ToString();
+                    var password = dt.DefaultView[0]["Password"].ToString();
+                    //验证密码
+                    var loginVerify = Utils.AppSettings(APP.LOGIN_VERIFY);
+                    if (loginVerify != password)
+                    {
+                        if (Utils.TipYN("密码已过期，请重新登录！"))
+                        {
+                            if (this.ShowLoginWindow(userName))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        //初始化登录人员信息
+                        LoginInfo.UserName = userName;
+                        LoginInfo.Password = password;
+                        LoginInfo.IsPrincipal = Convert.ToBoolean(dt.DefaultView[0]["IsPrincipal"].ToString());
+                        LoginInfo.IsStaff = Convert.ToBoolean(dt.DefaultView[0]["IsStaff"].ToString());
+                    }
+                }
+            }
+            //设置登录用户名
+            this.SetLoginUserName();
+        }
+        /// <summary>
+        /// 显示登录窗口
+        /// </summary>
+        /// <param name="tempName">临时用户名</param>
+        /// <returns>bool</returns>
+        private bool ShowLoginWindow(string tempName = "")
+        {
+            wLogin login = new wLogin(tempName);
+            var isOK = login.ShowDialog() == DialogResult.OK;
+            if (isOK)
+            {
+                this.SetLoginUserName();
+            }
+            return isOK;
+        }
+        /// <summary>
+        /// 设置登录人员名称
+        /// </summary>
+        /// <param name="userName"></param>
+        private void SetLoginUserName()
+        {
+            //设置登录用户名
+            this.lbSysLoginUser.Text = LoginInfo.UserName;
+            //非部门管理员，禁用上传更新
+            this.tsmiSysUpload.Enabled = LoginInfo.IsPrincipal;
+        }
+
         #endregion
 
         #region 本地：菜单渲染
@@ -544,79 +617,6 @@ namespace Tools
             }
         }
 
-        /// <summary>
-        /// 检查权限
-        /// </summary>
-        private void CheckPower()
-        {
-            //获取登录信息
-            var loginInfo = Utils.AppSettings(APP.LOGIN_INFO);
-            if (!string.IsNullOrEmpty(loginInfo))
-            {
-                var sql = $@"
-                SELECT Name as UserName, 
-                    LoginPassword as Password, 
-                    ISNULL(IsPrincipal, 0) AS IsPrincipal,
-                    CAST(CASE WHEN UserType = 5311 THEN 1 ELSE 0 END AS BIT) AS IsStaff
-                FROM dbo.AC_User
-                WHERE ISNULL(IsStop, 0) = 0 and ID = {Utils.Decryptor(loginInfo)}";
-                var dt = this._db.GetDataTable(sql, "user", false);
-                if (dt.DefaultView.Count > 0)
-                {
-                    var userName = dt.DefaultView[0]["UserName"].ToString();
-                    var password = dt.DefaultView[0]["Password"].ToString();
-                    //验证密码
-                    var loginVerify = Utils.AppSettings(APP.LOGIN_VERIFY);
-                    if (loginVerify != password)
-                    {
-                        if (Utils.TipYN("密码已过期，请重新登录！"))
-                        {
-                            if (this.ShowLoginWindow(userName))
-                            {
-                                return;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        //初始化登录人员信息
-                        LoginInfo.UserName = userName;
-                        LoginInfo.Password = password;
-                        LoginInfo.IsPrincipal = Convert.ToBoolean(dt.DefaultView[0]["IsPrincipal"].ToString());
-                        LoginInfo.IsStaff = Convert.ToBoolean(dt.DefaultView[0]["IsStaff"].ToString());
-                    }
-                }
-            }
-            //设置登录用户名
-            this.SetLoginUserName();
-        }
-        /// <summary>
-        /// 显示登录窗口
-        /// </summary>
-        /// <param name="tempName">临时用户名</param>
-        /// <returns>bool</returns>
-        private bool ShowLoginWindow(string tempName = "")
-        {
-            wLogin login = new wLogin(tempName);
-            var isOK = login.ShowDialog() == DialogResult.OK;
-            if (isOK)
-            {
-                this.SetLoginUserName();
-            }
-            return isOK;
-        }
-        /// <summary>
-        /// 设置登录人员名称
-        /// </summary>
-        /// <param name="userName"></param>
-        private void SetLoginUserName()
-        {
-            //设置登录用户名
-            this.lbSysLoginUser.Text = LoginInfo.UserName;
-            //非部门管理员，禁用上传更新
-            this.tsmiSysUpload.Enabled = LoginInfo.IsPrincipal;
-        }
-
         #endregion
     }
 }