修改密码的复杂度

yanjinhui

2025-08-28 6a50daac547ebaf0c2503803626e12fbc63c0bb6

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -29,8 +29,11 @@
        private readonly IRepository<Dt_Maintenance> _MainServer;
        private readonly IRepository<Sys_Role> _RoleServer;
        private readonly IRepository<Dt_AuthorizationRecord> _AuthorizatRecServer;
        public Sys_UserService(IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        private readonly IRepository<Sys_UserFace> _userFace;
        
        public Sys_UserService(IRepository<Sys_UserFace> userFace,IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        {
            _userFace= userFace;
            _faceServer = faceServer;
            _LoginhsyServer = LoginhsyServer;
            _unitOfWorkManage = unitOfWorkManage;
@@ -303,7 +306,7 @@

        public override WebResponseContent AddData(SaveModel saveModel)
        {
            string pwd = "123456";
            string pwd = "Gns1234+";
            string uesrName = saveModel.MainData[nameof(Sys_User.UserName).FirstLetterToLower()].ToString();
            saveModel.MainData[nameof(Sys_User.UserPwd).FirstLetterToLower()] = pwd.EncryptDES(AppSecret.User);

@@ -357,6 +360,20 @@
                if (string.IsNullOrEmpty(newPwd)) return WebResponseContent.Instance.Error("新密码不能为空");
                if (newPwd.Length < 6) return WebResponseContent.Instance.Error("密码不能少于6位");

                // âœ… å¯†ç å¤æ‚度校验：必须包含大小写字母、数字和特殊符号
                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[a-z]"))
                    return content.Error("新密码必须包含小写字母");

                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[A-Z]"))
                    return content.Error("新密码必须包含大写字母");

                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"\d"))
                    return content.Error("新密码必须包含数字");

                // ç‰¹æ®Šç¬¦å·ï¼ˆæ ‡ç‚¹ï¼‰ï¼Œæ¯”如 . ! @ # $ % ^ & * ( ) _ - + = ...
                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[!@#$%^&*(),.?""':{}|<>_\-+=\\/\[\]~`]"))
                    return content.Error("新密码必须包含至少一个特殊符号");

                int userId = App.User.UserId;
                string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);

@@ -403,22 +420,45 @@

            try
            {
                if (string.IsNullOrEmpty(oldPwd)) return content.Error("旧密码不能为空");
                if (string.IsNullOrEmpty(newPwd)) return content.Error("新密码不能为空");
                if (newPwd.Length < 6) return content.Error("密码不能少于6位");
                if (string.IsNullOrEmpty(oldPwd))
                    return content.Error("旧密码不能为空");

                if (string.IsNullOrEmpty(newPwd))
                    return content.Error("新密码不能为空");

                if (newPwd.Length < 6)
                    return content.Error("密码不能少于6位");

                // âœ… å¯†ç å¤æ‚度校验：必须包含大小写字母、数字和特殊符号
                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[a-z]"))
                    return content.Error("新密码必须包含小写字母");

                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[A-Z]"))
                    return content.Error("新密码必须包含大写字母");

                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"\d"))
                    return content.Error("新密码必须包含数字");

                // ç‰¹æ®Šç¬¦å·ï¼ˆæ ‡ç‚¹ï¼‰ï¼Œæ¯”如 . ! @ # $ % ^ & * ( ) _ - + = ...
                if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[^a-zA-Z0-9]"))
                    return content.Error("新密码必须包含至少一个特殊符号");


                // èŽ·å–用户当前密码
                string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == id, s => s.UserPwd) ?? "";

                if (string.IsNullOrEmpty(userCurrentPwd)) return content.Error("用户不存在或密码未设置");
                if (string.IsNullOrEmpty(userCurrentPwd))
                    return content.Error("用户不存在或密码未设置");

                //// è¿›è¡Œå¯†ç åŠ å¯†å¯¹æ¯”
                //// å¦‚果需要验证旧密码，放开这里
                //string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
                //if (_oldPwd != userCurrentPwd) return content.Error("旧密码不正确");
                //if (_oldPwd != userCurrentPwd) 
                //    return content.Error("旧密码不正确");

                // ç”Ÿæˆæ–°å¯†ç åŠ å¯†å€¼
                string _newPwd = newPwd.EncryptDES(AppSecret.User);
                if (userCurrentPwd == _newPwd) return content.Error("新密码不能与旧密码相同");
                if (userCurrentPwd == _newPwd)
                    return content.Error("新密码不能与旧密码相同");

                // æ›´æ–°å¯†ç 
                bool isUpdated = BaseDal.UpdateData(new Sys_User
@@ -434,7 +474,7 @@

                if (!isUpdated)
                {
                    return content.Error("密码修改失败，请稍后重试");
                    return content.Error("密码修改失败，密码必须包括字母以及特殊字符");
                }

                return content.OK("密码修改成功", id);
@@ -445,6 +485,7 @@
                return content.Error($"服务器错误: {ex.Message}");
            }
        }



        public WebResponseContent Upuserbase(UserDTO userDTO)
@@ -561,7 +602,7 @@
                    RoleName = addUserDTO.rolename,
                    Enable = addUserDTO.enable,
                    Unit = addUserDTO.userunit,
                    UserPwd = "j79rYYvCz4vdhcboB1Ausg==",
                    UserPwd = "NgKc7vI5u5jzh115fowV~g==",
                    Userteam = addUserDTO.userteam,
                    Dept_Id = addUserDTO.dept_Id,
                    //CardNumber=addUserDTO.carnuber,
@@ -730,12 +771,27 @@
                //{
                // ç™¾åº¦åˆ é™¤æˆåŠŸåŽï¼Œåˆ é™¤æ•°æ®åº“中的用户
                var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
                if (user==null)
                {
                    return WebResponseContent.Instance.Error("没有找到该用户");
                }
                var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
                if (user != null && main != null)
                var face= _userFace.QueryData(x=>x.UserName== account).FirstOrDefault();
                if (main.MaintenanceStatus == 1)
                {
                    return WebResponseContent.Instance.Error("该用户还在检修中，无法删除");
                }
                if (face == null)
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                }
                else
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                    _userFace.DeleteData(face);
                }             
                return WebResponseContent.Instance.OK("用户删除成功");
                //}
                //else
@@ -926,22 +982,27 @@
            try
            {
                int totalCount = 0;
                var Role = _RoleServer.Db.Queryable<Sys_Role>();
                var query = Role.InnerJoin<Sys_User>((a, b) => a.RoleId == b.Role_Id);
                //var Role = _RoleServer.Db.Queryable<Sys_Role>();
                //var query = Role.InnerJoin<Sys_User>((a, b) => a.RoleId == b.Role_Id)
                //                .InnerJoin<Sys_UserFace>((a, b, c) => b.UserName == c.UserName);

                var User = BaseDal.Db.Queryable<Sys_User>();   //查出用户表
                var query = User.LeftJoin<Sys_UserFace>((a, b) => a.UserName == b.UserName);


                //搜索关键字
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                    b.UserName.Contains(pagination.searchKeyword) ||
                    b.UserTrueName.Contains(pagination.searchKeyword) ||
                    b.PhoneNo.Contains(pagination.searchKeyword) ||
                    a.UserName.Contains(pagination.searchKeyword) ||
                    a.UserTrueName.Contains(pagination.searchKeyword) ||
                    a.PhoneNo.Contains(pagination.searchKeyword) ||
                    a.RoleName.Contains(pagination.searchKeyword));
                }
                //时间查询
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.CreateDate >= pagination.startDate.Value && b.CreateDate <= pagination.endDate.Value);
                    query = query.Where((a, b) => a.CreateDate >= pagination.startDate.Value && a.CreateDate <= pagination.endDate.Value);
                }
                //排序
                if (!string.IsNullOrEmpty(pagination.sortField))
@@ -951,38 +1012,38 @@
                    {


                        "CreateDate" => isAcs ? query.OrderBy((a, b) => b.CreateDate) : query.OrderByDescending((a, b) => b.CreateDate),
                        "CreateDate" => isAcs ? query.OrderBy((a, b) => a.CreateDate) : query.OrderByDescending((a, b) => a.CreateDate),

                        _ => query.OrderByDescending((a, b) => b.Creater) // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                        _ => query.OrderByDescending((a, b) => a.Creater) // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                    };

                }
                else
                {
                    query = query.OrderByDescending((a, b) => b.Creater);
                    query = query.OrderByDescending((a, b) => a.Creater);
                }
                var reslut = query.Select((a, b) => new
                {
                    b.User_Id,
                    b.UserName,
                    b.UserTrueName,
                    b.Unit,
                    b.Userteam,
                    b.Role_Id,
                    b.IsLeader,
                    //b.RoleName,
                    b.CardNumber,
                    b.PhoneNo,
                    b.UserPwd,
                    b.DeptName,
                    b.Dept_Id,
                    b.Email,
                    b.Enable,
                    b.Gender,
                    b.HeadImageUrl,
                    b.Address,
                    b.CreateDate,
                    b.Creater,
                    a.User_Id,
                    a.UserName,
                    a.UserTrueName,
                    a.Unit,
                    a.Userteam,
                    a.Role_Id,
                    a.IsLeader,
                    a.CardNumber,
                    a.PhoneNo,
                    a.UserPwd,
                    a.DeptName,
                    a.Dept_Id,
                    a.Email,
                    a.Enable,
                    a.Gender,
                    //b.HeadImageUrl,
                    b.UserFaceImageName,
                    a.Address,
                    a.CreateDate,
                    a.Creater,
                    a.RoleName,

                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
@@ -1009,5 +1070,45 @@
        }



        /// <summary>
        /// æ‰¹é‡åˆ é™¤
        /// </summary>
        /// <param name="keys">用户id</param>
        /// <returns></returns>
        public WebResponseContent DelUserList(int[] keys)
        {
            WebResponseContent webResponse = new WebResponseContent();
            foreach (int key in keys)
            {
                var user = BaseDal.QueryData(x => x.User_Id == key).FirstOrDefault();
                if (user == null)
                {
                    return webResponse.Error("没有找到该用户");
                }
                var main = _MainServer.QueryData(x => x.UserAccount == user.UserName).FirstOrDefault();
                var face = _userFace.QueryData(x => x.UserName == user.UserName).FirstOrDefault();
                if (main.MaintenanceStatus == 1)
                {
                    return WebResponseContent.Instance.Error("该用户还在检修中，无法删除");
                }
                if (face == null)
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                }
                else
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                    _userFace.DeleteData(face);
                }
               
            }

            return webResponse.OK();
        }


    }
}