Merge branch 'dev' into 'master'

修改密码锁定失效时间

See merge request !2

cloud-system/src/main/java/com/yizhi/system/application/controller/api/AuthController.java

@@ -114,7 +114,7 @@ public class AuthController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(AuthController.class);
     private static final Logger logger = LoggerFactory.getLogger(AuthController.class);
     private static final String LOGIN_PASSWORD_ERROR_RECORD = "login:password:err:times:";
     private static final String LOGIN_PASSWORD_ERROR_RECORD = "login:password:err:times:";
-    private static final Long ERROR_LOCK_TIME = 900L;
+    private static final Long ERROR_LOCK_TIME = 300L;
     private static final Integer ERROR_MAX_LOCK_TIMES = 5;
     private static final Integer ERROR_MAX_LOCK_TIMES = 5;
 
 
     private static final Integer PC = 1;
     private static final Integer PC = 1;