diff --git a/pom.xml b/pom.xml
index 62605294b1175e3b9d88046b7813f9c7b3631ccc..f29ad3d00ad7b48f8351b49c9c5a7a3490c61426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
+    <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>3.8.2</version>
@@ -11,7 +11,7 @@
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
-    
+
     <properties>
         <ruoyi.version>3.8.2</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,14 +26,16 @@
         <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
         <fastjson.version>1.2.80</fastjson.version>
         <oshi.version>6.1.6</oshi.version>
+        <jna.version>5.10.0</jna.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <passay.version>1.6.1</passay.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -82,6 +84,18 @@
                 <version>${oshi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
             <!-- Swagger3依赖 -->
             <dependency>
                 <groupId>io.springfox</groupId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PasswordConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PasswordConfigController.java
new file mode 100644
index 0000000000000000000000000000000000000000..9f6be963b8af293eef374216eb57cf4067639b2a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PasswordConfigController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.web.controller.system;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysPasswordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/password")
+public class PasswordConfigController extends BaseController
+{
+    @Autowired
+    private ISysPasswordService sysPasswordService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:password:list')")
+    @GetMapping("/list")
+    public AjaxResult list()
+    {
+        PasswordConfig passwordConfig = sysPasswordService.selectConfig();
+        return AjaxResult.success(passwordConfig);
+    }
+
+
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody PasswordConfig config)
+    {
+        return toAjax(sysPasswordService.saveConfig(config));
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        sysPasswordService.resetConfigCache();
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index be515fd610458f9cf16fe17834b08bba53418107..bf5560b988a5d4ad92e9e646203b2d1cb9225821 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.io.IOException;
+
+import com.ruoyi.system.service.ISysPasswordService;
+import com.ruoyi.system.service.impl.SysPasswordServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,6 +39,8 @@ public class SysProfileController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private  ISysPasswordService passwordService;
     @Autowired
     private TokenService tokenService;
 
@@ -106,6 +111,8 @@ public class SysProfileController extends BaseController
         {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
+
+        passwordService.validatePasswordRule(newPassword);
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 60d9de07fbcda2f316f0ee222ec2ac6a74725fcf..8e2b7e57fedb3b5b941c1f310256bb4f8d1ddf9e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,8 +1,11 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.service.ISysPasswordService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,7 +36,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -49,6 +52,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    @Autowired
+    private ISysPasswordService passwordService;
+
     /**
      * 获取用户列表
      */
@@ -94,7 +100,7 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
+    @GetMapping(value = {"/", "/{userId}"})
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         userService.checkUserDataScope(userId);
@@ -102,8 +108,7 @@ public class SysUserController extends BaseController
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
-        {
+        if (StringUtils.isNotNull(userId)) {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
@@ -118,20 +123,14 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysUser user)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
+    public AjaxResult add(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
@@ -145,18 +144,14 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
@@ -169,10 +164,8 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        if (ArrayUtils.contains(userIds, getUserId()))
-        {
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(userIds));
@@ -184,10 +177,10 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
-    {
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
+        passwordService.validatePasswordRule(user.getPassword());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
@@ -199,8 +192,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
-    {
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setUpdateBy(getUsername());
@@ -212,8 +204,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
-    {
+    public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
@@ -228,8 +219,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
         return success();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 4aa1d2b2dee2bb56941c98aa1b032b160c0b1c95..5c3f8b7035e92ccfe68acdc6f7a8c0366e1b3cb5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -94,6 +94,31 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /**
+     * 尝试登录次数
+     */
+    private Long attemptCount;
+    /**
+     * 账户锁定时间
+     */
+    private Date lockTime;
+
+    public Long getAttemptCount() {
+        return attemptCount;
+    }
+
+    public void setAttemptCount(Long attemptCount) {
+        this.attemptCount = attemptCount;
+    }
+
+    public Date getLockTime() {
+        return lockTime;
+    }
+
+    public void setLockTime(Date lockTime) {
+        this.lockTime = lockTime;
+    }
+
     public SysUser()
     {
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 6f8b9aa5c50dc89eff10d3576d0b8e97b32f2f35..cf33085b3d4e21c529441d32b7f11aa9bb1c51e6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -1,6 +1,11 @@
 package com.ruoyi.framework.web.service;
 
 import javax.annotation.Resource;
+
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.service.ISysPasswordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -25,6 +30,8 @@ import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
+import java.util.Date;
+
 /**
  * 登录校验方法
  * 
@@ -33,6 +40,7 @@ import com.ruoyi.system.service.ISysUserService;
 @Component
 public class SysLoginService
 {
+    private static final Logger log = LoggerFactory.getLogger(SysLoginService.class);
     @Autowired
     private TokenService tokenService;
 
@@ -48,6 +56,8 @@ public class SysLoginService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private ISysPasswordService passwordService;
     /**
      * 登录验证
      * 
@@ -60,6 +70,7 @@ public class SysLoginService
     public String login(String username, String password, String code, String uuid)
     {
         boolean captchaOnOff = configService.selectCaptchaOnOff();
+        SysUser user = null;
         // 验证码开关
         if (captchaOnOff)
         {
@@ -77,6 +88,25 @@ public class SysLoginService
         {
             if (e instanceof BadCredentialsException)
             {
+                user = userService.selectUserByUserName(username);
+                if (user != null) {
+                    // 用户失败次数
+                    Long fails = user.getAttemptCount();
+                    // 系统配置失败次数
+                    PasswordConfig config = passwordService.selectConfig();
+                    int fails_count = config.getMaxFailedLoginAttempts();
+                    // 超出失败次数，停用账户
+                    if (fails >= fails_count) {
+                        userService.setAccountLocked(user);
+                        throw new ServiceException("账号尝试次数超过"+fails_count+"次，将被锁定"+config.getUserLockPeriod()+"分钟");
+
+                    } else {
+                        // 失败次数++
+                        fails++;
+                        user.setAttemptCount(fails);
+                        userService.updateUserAttemptCount(user);
+                    }
+                }
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
                 throw new UserPasswordNotMatchException();
             }
@@ -86,6 +116,9 @@ public class SysLoginService
                 throw new ServiceException(e.getMessage());
             }
         }
+        user = userService.selectUserByUserName(username);
+        user.setAttemptCount(0L);
+        userService.updateUserAttemptCount(user);
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 575bd8d808ea93da19319814e4ab0da51e493700..b6179fcb0b63edd73659684ca98f07e770b0438f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -1,5 +1,8 @@
 package com.ruoyi.framework.web.service;
 
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.service.ISysPasswordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +17,9 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysUserService;
 
+import java.util.Date;
+import java.util.Optional;
+
 /**
  * 用户验证处理
  *
@@ -27,6 +33,9 @@ public class UserDetailsServiceImpl implements UserDetailsService
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ISysPasswordService passwordService;
+
     @Autowired
     private SysPermissionService permissionService;
 
@@ -34,20 +43,34 @@ public class UserDetailsServiceImpl implements UserDetailsService
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
         SysUser user = userService.selectUserByUserName(username);
+        PasswordConfig passwordConfig = passwordService.selectConfig();
+
+        String message=null;
         if (StringUtils.isNull(user))
         {
-            log.info("登录用户：{} 不存在.", username);
-            throw new ServiceException("登录用户：" + username + " 不存在");
+            message = StringUtils.format("登录用户：{} 不存在",username);
         }
         else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
-            log.info("登录用户：{} 已被删除.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+            message =                    StringUtils.format("登录用户：{} 已被删除.", username);
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
-            log.info("登录用户：{} 已被停用.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            message =             StringUtils.format        ("登录用户：{} 已被停用.", username);
+        }
+        else if(System.currentTimeMillis() -user.getLockTime().getTime() <1000*60*passwordConfig.getUserLockPeriod()     )
+        {
+            String lockTimeStr = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",user.getLockTime() );
+            message = StringUtils.format("登录用户：{}已经于{}被锁定，请于{}分钟后重试",username,lockTimeStr,passwordConfig.getUserLockPeriod());
+        }
+        else if(DateUtils.addDays(Optional.ofNullable(user.getUpdateTime()).orElse(DateUtils.addYears(new Date(),-1)),passwordConfig.getPasswordExpirationPeriodDays()).compareTo(new Date()) <= 0 )
+        {
+            message =StringUtils.format("登录用户：{} 密码已经超过{}天未修改，请联系管理员重置密码.", username,passwordConfig.getPasswordExpirationPeriodDays());
+        }
+        if(message!=null)
+        {
+            log.info(message);
+            throw new ServiceException(message);
         }
 
         return createLoginUser(user);
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index cdd5bb637f1b8e8d6f2e7b66194986c9430dffa3..b950c01d384c27ce7f087e839b84de24ade41fa2 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -22,6 +22,19 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--用于检查密码是否符合自定义规则集的库
+           为了用户自定义密码验证规则而生
+           -->
+        <dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>${passay.version}</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PasswordConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PasswordConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c784e036cf12bb35cfa802e78cba0d0aee3f209
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PasswordConfig.java
@@ -0,0 +1,196 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * 密码强度配置
+ * @author boger
+ * @since 2022-05-14
+ */
+public class PasswordConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 234L;
+    private Integer id;
+    /**
+     * 最多尝试次数，默认5次
+     */
+    private Integer maxFailedLoginAttempts = 5;
+    /**
+     * 锁定后通知邮箱
+     */
+    private String userLockoutNotificationEmail;
+
+
+
+    /**
+     * 锁定后解锁时间间隔，默认10分钟
+     */
+    private Integer userLockPeriod= 10;
+
+    /**
+     * 密码过期时间,默认90天
+     */
+    private Integer passwordExpirationPeriodDays = 90;
+
+    /**
+     * 密码最小长度,默认8个字符
+     */
+    private Integer minimumLength = 8;
+
+    /**
+     * 密码最大长度，默认20个字符
+     */
+    private Integer maximumLength = 20;
+
+
+    /**
+     * 最少大写字符数
+     */
+    private Integer minimumUppercaseLetters = 1;
+    /**
+     * 最少小写字符数
+     */
+    private Integer minimumLowercaseLetters = 1;
+    /**
+     * 最少数字字符数
+     */
+    private Integer minimumDigits = 1;
+    /**
+     * 最少特殊字符数
+     */
+    private Integer minimumSpecialCharacters = 1;
+
+
+    /**
+     * 检验提示
+     */
+    private String passwordPolicyDesc;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getMaxFailedLoginAttempts() {
+        return maxFailedLoginAttempts;
+    }
+
+    public void setMaxFailedLoginAttempts(Integer maxFailedLoginAttempts) {
+        this.maxFailedLoginAttempts = maxFailedLoginAttempts;
+    }
+
+    public String getUserLockoutNotificationEmail() {
+        return userLockoutNotificationEmail;
+    }
+
+    public void setUserLockoutNotificationEmail(String userLockoutNotificationEmail) {
+        this.userLockoutNotificationEmail = userLockoutNotificationEmail;
+    }
+
+    public Integer getUserLockPeriod() {
+        return userLockPeriod;
+    }
+
+    public void setUserLockPeriod(Integer userLockPeriod) {
+        this.userLockPeriod = userLockPeriod;
+    }
+
+    public Integer getMinimumLength() {
+        return minimumLength;
+    }
+
+    public void setMinimumLength(Integer minimumLength) {
+        this.minimumLength = minimumLength;
+    }
+
+    public Integer getMaximumLength() {
+        return maximumLength;
+    }
+
+    public void setMaximumLength(Integer maximumLength) {
+        this.maximumLength = maximumLength;
+    }
+
+    public Integer getMinimumUppercaseLetters() {
+        return minimumUppercaseLetters;
+    }
+
+    public void setMinimumUppercaseLetters(Integer minimumUppercaseLetters) {
+        this.minimumUppercaseLetters = minimumUppercaseLetters;
+    }
+
+    public Integer getMinimumLowercaseLetters() {
+        return minimumLowercaseLetters;
+    }
+
+    public void setMinimumLowercaseLetters(Integer minimumLowercaseLetters) {
+        this.minimumLowercaseLetters = minimumLowercaseLetters;
+    }
+
+    public Integer getMinimumDigits() {
+        return minimumDigits;
+    }
+
+    public void setMinimumDigits(Integer minimumDigits) {
+        this.minimumDigits = minimumDigits;
+    }
+
+    public Integer getMinimumSpecialCharacters() {
+        return minimumSpecialCharacters;
+    }
+
+    public void setMinimumSpecialCharacters(Integer minimumSpecialCharacters) {
+        this.minimumSpecialCharacters = minimumSpecialCharacters;
+    }
+
+    public Integer getPasswordExpirationPeriodDays() {
+        return passwordExpirationPeriodDays;
+    }
+
+    public void setPasswordExpirationPeriodDays(Integer passwordExpirationPeriodDays) {
+        this.passwordExpirationPeriodDays = passwordExpirationPeriodDays;
+    }
+
+    public String getPasswordPolicyDesc() {
+        String lengthRule;
+        String characterRule = "";
+        if(isPositiveInteger(this.getMinimumUppercaseLetters())){
+            characterRule += StringUtils.format("{}个大写字母，",this.getMinimumUppercaseLetters());
+        }
+        if(isPositiveInteger(this.getMinimumLowercaseLetters())){
+            characterRule += StringUtils.format("{}个小写字母，",this.getMinimumLowercaseLetters());
+        }
+        if(isPositiveInteger(this.getMinimumDigits())){
+            characterRule += StringUtils.format("{}个数字，",this.getMinimumDigits());
+        }
+        if(isPositiveInteger(this.getMinimumSpecialCharacters())){
+            characterRule += StringUtils.format("{}个特殊字符",this.getMinimumSpecialCharacters());
+        }
+        if(this.getMinimumLength().equals(this.getMaximumLength())){
+            lengthRule = StringUtils.format("密码长度必须是{}位数",this.getMinimumLength());
+        }else {
+            lengthRule = StringUtils.format("密码长度最少{}位，最多{}位",this.getMinimumLength(),this.getMaximumLength());
+        }
+        if(StringUtils.isNotEmpty(characterRule)){
+            this.setPasswordPolicyDesc(lengthRule+"，至少包含："+characterRule);
+        }else {
+            this.setPasswordPolicyDesc(lengthRule);
+        }
+        return this.passwordPolicyDesc;
+    }
+
+    public void setPasswordPolicyDesc(String passwordPolicyDesc) {
+        this.passwordPolicyDesc = passwordPolicyDesc;
+    }
+
+    private boolean isPositiveInteger(Integer val) {
+        return val != null && val > 0;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PasswordConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PasswordConfigMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..29e6273820488ad36bf59dc10bc6eac304481634
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PasswordConfigMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.PasswordConfig;
+
+/**
+ * 密码策略Mapper接口
+ * 
+ * @author boger
+ * @date 2022-05-15
+ */
+public interface PasswordConfigMapper 
+{
+    /**
+     * 查询密码策略
+     * 
+     * @param id 密码策略主键
+     * @return 密码策略
+     */
+    public PasswordConfig selectPasswordConfigById(Long id);
+
+    /**
+     * 查询密码策略列表
+     * 
+     * @param passwordConfig 密码策略
+     * @return 密码策略集合
+     */
+    public List<PasswordConfig> selectPasswordConfigList(PasswordConfig passwordConfig);
+
+    /**
+     * 新增密码策略
+     * 
+     * @param passwordConfig 密码策略
+     * @return 结果
+     */
+    public int insertPasswordConfig(PasswordConfig passwordConfig);
+
+    /**
+     * 修改密码策略
+     * 
+     * @param passwordConfig 密码策略
+     * @return 结果
+     */
+    public int updatePasswordConfig(PasswordConfig passwordConfig);
+
+    /**
+     * 删除密码策略
+     * 
+     * @param id 密码策略主键
+     * @return 结果
+     */
+    public int deletePasswordConfigById(Long id);
+
+    /**
+     * 批量删除密码策略
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePasswordConfigByIds(Long[] ids);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 28713f6e6d60872b18f7962d22fc0b0549c38f75..7edcde6261ea13c61080bafb95fe8af3b1573a8e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -124,4 +124,8 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    int setAccountLocked(SysUser user);
+
+    int updateUserAttemptCount(SysUser user);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPasswordService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPasswordService.java
new file mode 100644
index 0000000000000000000000000000000000000000..79234a6c2580e3103ba9c1a39730e106c2192076
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPasswordService.java
@@ -0,0 +1,70 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 系统用户 服务类
+ * </p>
+ *
+ * @author boger
+ * @since 2022-05-18
+ */
+public interface ISysPasswordService  {
+
+    /**
+     * 设置passwordConfig
+     * @param passwordConfig
+     */
+    void setPasswordConfig(PasswordConfig passwordConfig);
+
+    /**
+     * 验证密码强度，如果不符合强度要求，则报出ServiceException
+     * @param password
+     */
+    public void validatePasswordRule(String password) throws ServiceException;
+
+    /**
+     * 验证密码规则，如果不符合规则将报出ServiceException
+     * @param password
+     * @param passwordConfig 密码强度配置
+     */
+    public void validatePasswordRule(String password, PasswordConfig passwordConfig ) throws ServiceException;
+
+    /**
+     * 查询密码强度配置信息
+     * @return 参数配置信息
+     */
+    public PasswordConfig selectConfig();
+
+    /**
+     * 保存密码强度配置
+     *
+     * @param config 密码强度配置信息
+     * @return 结果
+     */
+    public int saveConfig(PasswordConfig config);
+
+
+    /**
+     * 加载参数缓存数据
+     */
+    public void CachePasswordConfig();
+
+    /**
+     * 清空参数缓存数据
+     */
+    public void clearConfigCache();
+
+    /**
+     * 重置参数缓存数据
+     */
+    public void resetConfigCache();
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 29193ceabcec0a18b997c7e3156652b823e6a398..2cc3c5620702b967a92acb19161789078920aadd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -203,4 +203,18 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 修改尝试登录次数
+     * @param user 用户信息
+     * @return 结果
+     */
+    int updateUserAttemptCount(SysUser user);
+
+    /**
+     * 锁定账号
+     * @param user 用户信息
+     * @return 结果
+     */
+    int setAccountLocked(SysUser user);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPasswordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPasswordServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..779642714ad42114908857da24cd9743677d49c1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPasswordServiceImpl.java
@@ -0,0 +1,167 @@
+package com.ruoyi.system.service.impl;
+
+
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.mapper.PasswordConfigMapper;
+import com.ruoyi.system.service.ISysPasswordService;
+import org.passay.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 密码强度设置 服务类
+ * </p>
+ *
+ * @author boger
+ * @since 2022-05-15
+ */
+
+@Service
+public class SysPasswordServiceImpl implements ISysPasswordService {
+
+    private PasswordConfig passwordConfig;
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private PasswordConfigMapper passwordConfigMapper;
+    /**
+     * 自动装配时，初始化密码强度设置参数到缓存
+     */
+    @PostConstruct
+    public void init()
+    {
+        resetConfigCache();
+    }
+
+    /**
+     * 设置passwordConfig
+     * @param passwordConfig
+     */
+    @Override
+    public void setPasswordConfig(PasswordConfig passwordConfig)
+    {
+        this.passwordConfig = passwordConfig;
+    }
+    public void validatePasswordRule(String password){
+        validatePasswordRule(password, passwordConfig);
+    }
+
+    /**
+     * 根据指定的密码强度策略验证密码是否满足策略要求，不满足策略要求抛出异常
+     * @param password 待验证密码
+     * @param passwordConfig 密码强度配置
+     */
+    public void validatePasswordRule(String password, PasswordConfig passwordConfig){
+
+        List<Rule> passwordRules = new ArrayList<>();
+        //密码组成规则校验
+        passwordRules.add(new LengthRule(passwordConfig.getMinimumLength(), passwordConfig.getMaximumLength()));//密码长度范围
+        if (isPositiveInteger(passwordConfig.getMinimumUppercaseLetters())) {
+            passwordRules.add(new CharacterRule(EnglishCharacterData.UpperCase, passwordConfig.getMinimumUppercaseLetters()));//包含的大写字母个数
+        }
+        if (isPositiveInteger(passwordConfig.getMinimumLowercaseLetters())) {
+            passwordRules.add(new CharacterRule(EnglishCharacterData.LowerCase, passwordConfig.getMinimumLowercaseLetters()));//包含的小写字母个数
+        }
+        if (isPositiveInteger(passwordConfig.getMinimumDigits())) {
+            passwordRules.add(new CharacterRule(EnglishCharacterData.Digit, passwordConfig.getMinimumDigits()));//包含的数字个数
+        }
+        if (isPositiveInteger(passwordConfig.getMinimumSpecialCharacters())) {
+            passwordRules.add(new CharacterRule(EnglishCharacterData.Special, passwordConfig.getMinimumSpecialCharacters()));//包含的特殊字符个数
+        }
+        PasswordValidator validator = new PasswordValidator(passwordRules);
+        PasswordData passwordData = new PasswordData(password);
+        RuleResult result = validator.validate(passwordData);//校验密码组成规则
+        if (!result.isValid()) {
+            String message = passwordConfig.getPasswordPolicyDesc();
+            throw new ServiceException(message);
+        }
+    }
+
+    /**
+     * 获取密码强度配置
+     * @return 密码策略配置对象
+     */
+    @Override
+    public PasswordConfig selectConfig() {
+        PasswordConfig config;
+        config = redisCache.getCacheObject("sys:password");
+        if (config!=null)
+        {
+            return config;
+        }
+        PasswordConfig passwordConfig = passwordConfigMapper.selectPasswordConfigById(1L);
+        if (passwordConfig!=null)
+        {
+            this.passwordConfig = passwordConfig;
+            redisCache.setCacheObject("sys:password", passwordConfig);
+        }
+        return passwordConfig;
+    }
+
+    /**
+     * 保存密码强度配置策略
+     * @param passwordConfig 密码强度配置信息
+     * @return 保存结果
+     */
+    @Override
+    public int saveConfig(PasswordConfig passwordConfig) {
+        passwordConfig.setUpdateTime(DateUtils.getNowDate());
+        int result= passwordConfigMapper.updatePasswordConfig(passwordConfig);
+        if(result>0){
+            this.passwordConfig = passwordConfig;
+            redisCache.setCacheObject("sys:password", passwordConfig);
+        }
+        return result;
+    }
+
+    /**
+     * 将保存的密码强度策略保存到缓存中
+     */
+    @Override
+    public void CachePasswordConfig()
+    {
+        PasswordConfig passwordConfig = passwordConfigMapper.selectPasswordConfigById(1L);
+        if (passwordConfig!=null)
+        {
+            this.passwordConfig = passwordConfig;
+            redisCache.setCacheObject("sys:password", passwordConfig);
+        }
+
+    }
+
+    /**
+     * 清理密码强度策略缓存
+     */
+    @Override
+    public void clearConfigCache() {
+        redisCache.deleteObject("sys:password");
+    }
+
+    /**
+     * 重置密码策略缓存内容
+     */
+    @Override
+    public void resetConfigCache() {
+        clearConfigCache();
+        CachePasswordConfig();
+    }
+
+
+    /**
+     * 判断是否为正整数
+     * @param val 待判定整数
+     * @return 正整数返回true,否则返回false
+     */
+    private boolean isPositiveInteger(Integer val) {
+        return val != null && val > 0;
+    }
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 56f3dac725d3c992442cd0c5586ad21ee603008e..dbb09a58d2fd012d78834a8987dd79e637b83916 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -559,4 +559,26 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    /**
+     * 修改尝试登录次数
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserAttemptCount(SysUser user)
+    {
+        return userMapper.updateUserAttemptCount(user);
+    }
+
+    /**
+     * 锁定账户
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int setAccountLocked(SysUser user)
+    {
+        return userMapper.setAccountLocked(user);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/PasswordConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/PasswordConfigMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1d751ee965b6df0fa4777e01cd336fb943986d5
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/PasswordConfigMapper.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.PasswordConfigMapper">
+    
+    <resultMap type="com.ruoyi.system.domain.PasswordConfig" id="PasswordConfigResult">
+        <result property="id"    column="id"    />
+        <result property="maxFailedLoginAttempts"    column="max_failed"    />
+        <result property="userLockPeriod"    column="userlock_period"    />
+        <result property="passwordExpirationPeriodDays"    column="expiration_period"    />
+        <result property="userLockoutNotificationEmail"    column="notification_email"    />
+        <result property="minimumLength"    column="min_length"    />
+        <result property="maximumLength"    column="max_length"    />
+        <result property="minimumUppercaseLetters"    column="min_upper"    />
+        <result property="minimumLowercaseLetters"    column="min_lower"    />
+        <result property="minimumDigits"    column="min_digits"    />
+        <result property="minimumSpecialCharacters"    column="min_special"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectPasswordConfigVo">
+        select id, max_failed, userlock_period, expiration_period, notification_email, min_length, max_length, min_upper, min_lower, min_digits, min_special, create_by, create_time, update_by, update_time from sys_password
+    </sql>
+
+    <select id="selectPasswordConfigList" parameterType="PasswordConfig" resultMap="PasswordConfigResult">
+        <include refid="selectPasswordConfigVo"/>
+        <where>  
+            <if test="maxFailedLoginAttempts != null "> and max_failed = #{maxFailedLoginAttempts}</if>
+            <if test="userLockPeriod != null "> and userlock_period = #{userLockPeriod}</if>
+            <if test="passwordExpirationPeriodDays != null "> and expiration_period = #{passwordExpirationPeriodDays}</if>
+            <if test="userLockoutNotificationEmail != null  and userLockoutNotificationEmail != ''"> and notification_email = #{userLockoutNotificationEmail}</if>
+            <if test="minimumLength != null "> and min_length = #{minimumLength}</if>
+            <if test="maximumLength != null "> and max_length = #{maximumLength}</if>
+            <if test="minimumUppercaseLetters != null "> and min_upper = #{minimumUppercaseLetters}</if>
+            <if test="minimumLowercaseLetters != null "> and min_lower = #{minimumLowercaseLetters}</if>
+            <if test="minimumDigits != null "> and min_digits = #{minimumDigits}</if>
+            <if test="minimumSpecialCharacters != null "> and min_special = #{minimumSpecialCharacters}</if>
+        </where>
+    </select>
+    
+    <select id="selectPasswordConfigById" parameterType="Long" resultMap="PasswordConfigResult">
+        <include refid="selectPasswordConfigVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertPasswordConfig" parameterType="PasswordConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_password
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maxFailedLoginAttempts != null">max_failed,</if>
+            <if test="userLockPeriod != null">userlock_period,</if>
+            <if test="passwordExpirationPeriodDays != null">expiration_period,</if>
+            <if test="userLockoutNotificationEmail != null">notification_email,</if>
+            <if test="minimumLength != null">min_length,</if>
+            <if test="maximumLength != null">max_length,</if>
+            <if test="minimumUppercaseLetters != null">min_upper,</if>
+            <if test="minimumLowercaseLetters != null">min_lower,</if>
+            <if test="minimumDigits != null">min_digits,</if>
+            <if test="minimumSpecialCharacters != null">min_special,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maxFailedLoginAttempts != null">#{maxFailedLoginAttempts},</if>
+            <if test="userLockPeriod != null">#{userLockPeriod},</if>
+            <if test="passwordExpirationPeriodDays != null">#{passwordExpirationPeriodDays},</if>
+            <if test="userLockoutNotificationEmail != null">#{userLockoutNotificationEmail},</if>
+            <if test="minimumLength != null">#{minimumLength},</if>
+            <if test="maximumLength != null">#{maximumLength},</if>
+            <if test="minimumUppercaseLetters != null">#{minimumUppercaseLetters},</if>
+            <if test="minimumLowercaseLetters != null">#{minimumLowercaseLetters},</if>
+            <if test="minimumDigits != null">#{minimumDigits},</if>
+            <if test="minimumSpecialCharacters != null">#{minimumSpecialCharacters},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePasswordConfig" parameterType="PasswordConfig">
+        update sys_password
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="maxFailedLoginAttempts != null">max_failed = #{maxFailedLoginAttempts},</if>
+            <if test="userLockPeriod != null">userlock_period = #{userLockPeriod},</if>
+            <if test="passwordExpirationPeriodDays != null">expiration_period = #{passwordExpirationPeriodDays},</if>
+            <if test="userLockoutNotificationEmail != null">notification_email = #{userLockoutNotificationEmail},</if>
+            <if test="minimumLength != null">min_length = #{minimumLength},</if>
+            <if test="maximumLength != null">max_length = #{maximumLength},</if>
+            <if test="minimumUppercaseLetters != null">min_upper = #{minimumUppercaseLetters},</if>
+            <if test="minimumLowercaseLetters != null">min_lower = #{minimumLowercaseLetters},</if>
+            <if test="minimumDigits != null">min_digits = #{minimumDigits},</if>
+            <if test="minimumSpecialCharacters != null">min_special = #{minimumSpecialCharacters},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePasswordConfigById" parameterType="Long">
+        delete from sys_password where id = #{id}
+    </delete>
+
+    <delete id="deletePasswordConfigByIds" parameterType="String">
+        delete from sys_password where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 16a64c2a333771aebc48248c421dd44b6772916a..7275df9ce43cbf6a6eb0fc3cfec369c5e7af5f79 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,10 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+        <result property="attemptCount" column="attempt_count"/>
+        <result property="lockTime"     column="lock_time"    />
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -36,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -45,9 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"     column="data_scope"    />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,
+               u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+               u.attempt_count, u.lock_time,u.update_time,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -55,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -84,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -101,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -119,29 +123,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName}
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -173,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
@@ -194,28 +198,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
+	<update id="updateUserAttemptCount" parameterType="SysUser">
+		update sys_user set attempt_count = #{attemptCount} where user_name = #{userName}
+	</update>
+
+	<update id="setAccountLocked" parameterType="SysUser">
+		update sys_user
+		<set>
+			attempt_count= 0,
+			lock_time = sysdate()
+		</set>
+	 	where user_name = #{userName}
+	</update>
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 </mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/test/java/ValidatePasswordTest.java b/ruoyi-system/src/test/java/ValidatePasswordTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..88014897a40108d9c4d6bca599d0d51c45ed2b9b
--- /dev/null
+++ b/ruoyi-system/src/test/java/ValidatePasswordTest.java
@@ -0,0 +1,63 @@
+import com.ruoyi.system.domain.PasswordConfig;
+import com.ruoyi.system.service.ISysPasswordService;
+import com.ruoyi.system.service.impl.SysPasswordServiceImpl;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ValidatePasswordTest {
+
+    ISysPasswordService service = null;
+    PasswordConfig passwordConfig = null;
+    @Before
+    public void initSysPasswordService()
+    {
+        service = new SysPasswordServiceImpl();
+        passwordConfig = new PasswordConfig();
+        passwordConfig.setMaxFailedLoginAttempts(5);
+        passwordConfig.setPasswordExpirationPeriodDays(90);
+        passwordConfig.setUserLockPeriod(10);
+        passwordConfig.setMaxFailedLoginAttempts(5);
+        passwordConfig.setMaximumLength(20);
+        passwordConfig.setMinimumLength(5);
+        passwordConfig.setMinimumDigits(1);
+        passwordConfig.setMinimumSpecialCharacters(1);
+        passwordConfig.setMinimumLowercaseLetters(1);
+        passwordConfig.setMinimumUppercaseLetters(1);
+        service.setPasswordConfig(passwordConfig);
+    }
+
+    /**
+     * 满足策略要求用例
+     */
+    @Test
+    public void testValidedByConfig(){
+        ISysPasswordService serviceNew = new SysPasswordServiceImpl();
+        serviceNew.validatePasswordRule("Hello@123",passwordConfig);
+    }
+
+    /**
+     * 不满足策略要求用例
+     */
+    @Test
+    public void testInvalidByConfig(){
+        ISysPasswordService serviceNew = new SysPasswordServiceImpl();
+        serviceNew.validatePasswordRule("Hello123",passwordConfig);
+    }
+
+    /**
+     * 满足策略要求用例
+     */
+    @Test
+    public void testValided(){
+        service.validatePasswordRule("Hello@123");
+    }
+
+    /**
+     * 不满足策略要求用例
+     */
+    @Test
+    public void testInValid(){
+        service.validatePasswordRule("Hello123");
+
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/password.js b/ruoyi-ui/src/api/system/password.js
new file mode 100644
index 0000000000000000000000000000000000000000..0821d505b6f6585e449b94ae53dba291590097f6
--- /dev/null
+++ b/ruoyi-ui/src/api/system/password.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询密码策略列表
+export function listPassword(query) {
+  return request({
+    url: '/system/password/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询密码策略详细
+export function getPassword(id) {
+  return request({
+    url: '/system/password/' + id,
+    method: 'get'
+  })
+}
+
+// 新增密码策略
+export function addPassword(data) {
+  return request({
+    url: '/system/password',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改密码策略
+export function updatePassword(data) {
+  return request({
+    url: '/system/password',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除密码策略
+export function delPassword(id) {
+  return request({
+    url: '/system/password/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index f580b983ee106222680cf0303f86f64ec958f789..92c340b6157766e73a342eefd795f80aed066bc6 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -1,4 +1,5 @@
 <template>
+
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="参数名称" prop="configName">
@@ -146,6 +147,53 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <el-card class="box-card loading-area">
+      <div slot="header" class="clearfix">
+        <span>安全设置</span>
+      </div>
+      <div>
+        <el-form ref="elForm"   size="medium" label-width="210px">
+          <el-collapse >
+            <el-collapse-item title="常规设置" name="1">
+              <el-form-item label="密码输错多少次后锁定用户" prop="maxFailedLoginAttempts">
+                <el-input-number  :min="0" placeholder="请输入错误次数"
+                                 controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="用户锁定后通知的邮箱" prop="userLockoutNotificationEmail">
+                <el-input  placeholder="请输入用户锁定后通知的邮箱" clearable></el-input>
+              </el-form-item>
+            </el-collapse-item>
+            <el-collapse-item title="密码规则设置" name="2">
+              <el-form-item label="密码最小长度">
+                <el-input-number   placeholder="密码长度" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的大写字母个数">
+                <el-input-number  :min="0" placeholder="密码需要包含的大写字母个数"
+                                 controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的小写字母个数">
+                <el-input-number  :min="0" controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的数字个数">
+                <el-input-number :min="0" controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的特殊字符个数">
+                <el-input-number :min="0" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="密码多少天后过期">
+                <el-input-number :min="0" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+            </el-collapse-item>
+          </el-collapse>
+          <el-form-item size="medium" style="margin-top: 10px">
+            <el-button type="primary" >保存</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/ruoyi-ui/src/views/system/password/index.vue b/ruoyi-ui/src/views/system/password/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..40c28233df20a88e56befdd998ee93e0c293baa8
--- /dev/null
+++ b/ruoyi-ui/src/views/system/password/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card loading-area">
+      <div slot="header" class="clearfix">
+        <span>安全设置</span>
+      </div>
+      <div>
+        <el-form ref="form" :model="form" size="medium" label-width="210px">
+
+          <el-collapse v-model="ActiveNames">
+            <el-collapse-item title="常规设置" name="1">
+              <el-form-item label="密码输错多少次后锁定用户" prop="maxFailedLoginAttempts">
+                <el-input-number v-model="form.maxFailedLoginAttempts" :min="0" placeholder="请输入错误次数"
+                                 controls-position=right>
+                </el-input-number>
+
+              </el-form-item>
+              <el-form-item label="密码锁定时长(分钟)">
+                <el-input-number v-model="form.userLockPeriod" :min="0" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="密码多少天后过期">
+                <el-input-number v-model="form.passwordExpirationPeriodDays" :min="0" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="用户锁定后通知的邮箱" prop="userLockoutNotificationEmail">
+                <el-input v-model="form.userLockoutNotificationEmail" placeholder="请输入用户锁定后通知的邮箱" clearable></el-input>
+              </el-form-item>
+            </el-collapse-item>
+            <el-collapse-item title="密码规则设置" name="2">
+              <el-form-item label="密码最小长度">
+                <el-input-number v-model="form.minimumLength" placeholder="密码最小长度" controls-position=right
+                                 data-value="password.minimumLength">
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="密码最大长度">
+                <el-input-number v-model="form.maximumLength" placeholder="密码最大长度" controls-position=right
+                                 data-value="password.minimumLength">
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的大写字母个数">
+                <el-input-number v-model="form.minimumUppercaseLetters" :min="0" placeholder="密码需要包含的大写字母个数"
+                                 controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的小写字母个数">
+                <el-input-number v-model="form.minimumLowercaseLetters" :min="0"
+                                 controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的数字个数">
+                <el-input-number v-model="form.minimumDigits" :min="0" controls-position=right></el-input-number>
+              </el-form-item>
+              <el-form-item label="密码需要包含的特殊字符个数">
+                <el-input-number v-model="form.minimumSpecialCharacters" :min="0" controls-position=right>
+                </el-input-number>
+              </el-form-item>
+
+            </el-collapse-item>
+          </el-collapse>
+          <el-form-item size="medium" style="margin-top: 10px">
+            <el-button type="primary" @click="submitForm">保存</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {listPassword, updatePassword} from "@/api/system/password";
+
+export default {
+  name: "Password",
+  data() {
+    return {
+      activeName: ["1", "2"],
+      // 遮罩层
+      loading: true,
+      // 密码策略表单参数
+      form: {
+        id: 1,
+        createBy: "admin",
+        createTime: "2022-05-15 12:00:02",
+        maxFailedLoginAttempts: 5,
+        maximumLength: 20,
+        minimumDigits: 2,
+        minimumLength: 8,
+        minimumLowercaseLetters: 1,
+        minimumSpecialCharacters: 1,
+        minimumUppercaseLetters: 1,
+        passwordExpirationPeriodDays: 90,
+        userLockPeriod: 10,
+        passwordPolicyDesc: "",
+        updateBy: "",
+        updateTime: null,
+        userLockoutNotificationEmail: null
+      },
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询密码策略列表 */
+    getList() {
+      this.loading = true;
+      listPassword(this.queryParams).then(response => {
+        this.form = response.data;
+        console.log(this.form)
+        this.loading = false;
+      });
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        updatePassword(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/security/index.vue.bak b/ruoyi-ui/src/views/system/security/index.vue.bak
new file mode 100644
index 0000000000000000000000000000000000000000..f40de2452a831ca764c15d551d5fbb8fb1f0340b
--- /dev/null
+++ b/ruoyi-ui/src/views/system/security/index.vue.bak
@@ -0,0 +1,126 @@
+<template>
+  <el-card class="box-card loading-area">
+    <div slot="header" class="clearfix">
+      <span>安全设置</span>
+    </div>
+    <div>
+      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="210px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="常规设置" name="1">
+            <el-form-item label="密码输错多少次后锁定用户" prop="maxFailedLoginAttempts">
+              <el-input-number v-model="formData.maxFailedLoginAttempts" :min="0" placeholder="请输入错误次数"
+                               controls-position=right></el-input-number>
+            </el-form-item>
+            <el-form-item label="用户锁定后通知的邮箱" prop="userLockoutNotificationEmail">
+              <el-input v-model="formData.userLockoutNotificationEmail" placeholder="请输入用户锁定后通知的邮箱" clearable></el-input>
+            </el-form-item>
+          </el-collapse-item>
+          <el-collapse-item title="密码规则设置" name="2">
+            <el-form-item label="密码最小长度">
+              <el-input-number v-model="formData.passwordPolicy.minimumLength" :min="minimumLength" :max="formData.passwordPolicy.maximumLength" placeholder="密码长度" controls-position=right>
+              </el-input-number>
+            </el-form-item>
+            <el-form-item label="密码需要包含的大写字母个数">
+              <el-input-number v-model="formData.passwordPolicy.minimumUppercaseLetters" :min="0" placeholder="密码需要包含的大写字母个数"
+                               controls-position=right></el-input-number>
+            </el-form-item>
+            <el-form-item label="密码需要包含的小写字母个数">
+              <el-input-number v-model="formData.passwordPolicy.minimumLowercaseLetters" :min="0" controls-position=right></el-input-number>
+            </el-form-item>
+            <el-form-item label="密码需要包含的数字个数">
+              <el-input-number v-model="formData.passwordPolicy.minimumDigits" :min="0" controls-position=right></el-input-number>
+            </el-form-item>
+            <el-form-item label="密码需要包含的特殊字符个数">
+              <el-input-number v-model="formData.passwordPolicy.minimumSpecialCharacters" :min="0" controls-position=right>
+              </el-input-number>
+            </el-form-item>
+            <el-form-item label="密码多少天后过期">
+              <el-input-number v-model="formData.passwordPolicy.passwordExpirationPeriodDays" :min="0" controls-position=right>
+              </el-input-number>
+            </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
+        <el-form-item size="medium" style="margin-top: 10px">
+          <el-button type="primary" @click="submitForm" v-hasPermi="['post:sys:config:security:set']">保存</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-card>
+
+</template>
+<script>
+  import { securitySet,securityInfo } from "@/api/sys/config";
+  export default {
+    name: "SecuritySetting",
+    data() {
+      return {
+        activeNames: ['1'],
+        formData: {
+          maxFailedLoginAttempts: 0,
+          userLockoutNotificationEmail: undefined,
+          passwordPolicy:{
+            minimumLength: 6,
+            maximumLength: 30,
+            minimumUppercaseLetters: 0,
+            minimumLowercaseLetters: 0,
+            minimumDigits: 0,
+            minimumSpecialCharacters: 0,
+            passwordExpirationPeriodDays: 0
+          }
+        },
+        rules: {
+          userLockoutNotificationEmail: [
+            {
+              type: "email",
+              message: "'请输入正确的邮箱地址",
+              trigger: ["blur", "change"]
+            }
+          ]
+        }
+      }
+    },
+    created() {
+      securityInfo().then(response => {
+        this.formData = response.data;
+      });
+    },
+    computed: {
+      minimumLength(){
+        let min = this.formData.passwordPolicy.minimumUppercaseLetters + this.formData.passwordPolicy.minimumLowercaseLetters + this.formData.passwordPolicy.minimumDigits + this.formData.passwordPolicy.minimumSpecialCharacters;
+        if(min<6){
+          min = 6;
+        }
+        return min;
+      }
+    },
+    watch: {
+      minimumLength:function (val) {
+        let min = this.formData.passwordPolicy.minimumUppercaseLetters + this.formData.passwordPolicy.minimumLowercaseLetters + this.formData.passwordPolicy.minimumDigits + this.formData.passwordPolicy.minimumSpecialCharacters;
+        if(min<6){
+          min = 6;
+        }
+        this.formData.passwordPolicy.minimumLength = min;
+      }
+    },
+    methods: {
+      submitForm() {
+        this.$refs['elForm'].validate(valid => {
+          if (!valid) return
+          securitySet(this.formData).then(response => {
+            if (response.code === 0) {
+              this.msgSuccess("设置成功");
+            } else {
+              this.msgError(response.msg);
+            }
+          });
+        })
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .box-card {
+    margin: 10px 20%;
+  }
+
+</style>
diff --git a/sql/password.sql b/sql/password.sql
new file mode 100644
index 0000000000000000000000000000000000000000..933a6d34d18e7ffb0494b249b99d1cb62ff31b4a
--- /dev/null
+++ b/sql/password.sql
@@ -0,0 +1,65 @@
+-- ----------------------------
+-- F1、密码强度设置表
+-- ----------------------------
+drop table if exists sys_password;
+create table sys_password
+(
+    id                 bigint(20) not null auto_increment comment 'id号',
+
+    max_failed         int(4)      default 5 comment '密码最大尝试次数',
+    userlock_period    int(4)      default 10 comment '用户锁定后解锁时间，默认10分钟',
+    expiration_period  int(4)      default 90 comment '密码过期时长，默认90天',
+    notification_email varchar(50) default '' comment '用户锁定后通知邮箱',
+
+    min_length         int(4)      default 5 comment '密码最小长度',
+    max_length         int(4)      default 20 comment '密码最大长度',
+    min_upper          int(4)      default 1 comment '大写字符最少数量',
+    min_lower          int(4)      default 1 comment '小写字符最少数量',
+    min_digits         int(4)      default 1 comment '数字字符最少数量',
+    min_special        int(4)      default 1 comment '特殊字符最少数量',
+
+    create_by          varchar(64) default '' comment '创建者',
+    create_time        datetime comment '创建时间',
+    update_by          varchar(64) default '' comment '更新者',
+    update_time        datetime comment '更新时间',
+    primary key (id)
+) engine = innodb
+  auto_increment = 200 comment = '密码策略表';
+
+-- ----------------------------
+-- 初始化-密码策略表数据
+-- ----------------------------
+insert into sys_password(id, max_failed, userlock_period, expiration_period, notification_email, min_length,
+                          max_length, min_upper, min_lower, min_digits, min_special, create_by, create_time, update_by,
+                          update_time)
+values (1, 5, 10, 90, 'rq@qq.com', 8, 20, 1, 1, 1, 1, 'admin', sysdate(), '', null);
+
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status,
+                      perms, icon, create_by, create_time, update_by, update_time, remark)
+values ('密码策略', '1', '7', 'password', 'system/password/index', 1, 0, 'C', '0', '0', 'system:password:list', '#',
+        'admin', sysdate(), '', null, '密码策略菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status,
+                      perms, icon, create_by, create_time, update_by, update_time, remark)
+values ('密码策略查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:password:query', '#', 'admin', sysdate(), '',
+        null, '');
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status,
+                      perms, icon, create_by, create_time, update_by, update_time, remark)
+values ('密码策略修改', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:password:edit', '#', 'admin', sysdate(), '',
+        null, '');
+
+commit;
+
+-- 修改用户表，添加尝试次数和锁定时间字段
+ALTER TABLE sys_user
+    ADD COLUMN attempt_count int(4)   NULL COMMENT '尝试登录次数' AFTER `remark`,
+    ADD COLUMN lock_time     datetime NULL COMMENT '锁定时间' AFTER `attempt_count`;
+
+-- 添加安全管理员和审计管理员两个角色
+insert into sys_role values('3', '安全管理员',    'security', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '安全管理员');
+insert into sys_role values('4', '审计管理员',    'auditor', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '审计管理员');
\ No newline at end of file