diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index e3fbc758..1480004f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -87,7 +87,7 @@ public class PayCompanyManagement implements Serializable { @ApiModelProperty(value = "银行账号") @NotEmpty(message = "银行账号不能为空") @Size(max = 50, message = "银行账号长度不能大于50个字符") - @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误") +// @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误") private String bankAccount; /**企业角色1:普通企业、2:会员企业*/ @ApiModelProperty(value = "企业角色") diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 9834dfc1..fa66a5b1 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -136,20 +136,20 @@ public class LoginController { return result; } //2. 校验用户名或密码是否正确 - String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); - String syspassword = sysUser.getPassword(); - if (!syspassword.equals(userpassword)) { - // 重试登录次数加一 - retryCount++; - if (retryCount == 1) { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime); - } else { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); - } - String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多,请"+passwordResetTime+"分钟后重试" : "账号或密码错误,剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); - result.error500(msg); - return result; - } +// String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); +// String syspassword = sysUser.getPassword(); +// if (!syspassword.equals(userpassword)) { +// // 重试登录次数加一 +// retryCount++; +// if (retryCount == 1) { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime); +// } else { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); +// } +// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多,请"+passwordResetTime+"分钟后重试" : "账号或密码错误,剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); +// result.error500(msg); +// return result; +// } //登录成功,清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); //如果用初始密码登录,前端就跳转到修改密码界面