From 1cd953a7a2e1af2923e14b11de116490c8fa4e22 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 13 Oct 2021 15:40:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=BA=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/company/controller/CompanyLoginController.java | 9 ++++++--- .../jero/modules/system/controller/LoginController.java | 8 +++++--- .../modules/system/service/impl/SysUserServiceImpl.java | 2 +- .../src/main/resources/application-dev.yml | 5 ++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 65ce63d2..34229c0c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -60,6 +60,9 @@ public class CompanyLoginController { */ public static final int RETRY_LOGIN_MAX_COUNT = 5; + @Value("${passwordResetTime}") + private int passwordResetTime; + @ApiOperation("登录接口") @PostMapping(value = "/login") public Result login(@RequestBody SysLoginModel sysLoginModel) { @@ -116,7 +119,7 @@ public class CompanyLoginController { retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + phone); } if (retryCount >= RETRY_LOGIN_MAX_COUNT) { - result.error500("密码错误次数过多，请稍后重试"); + result.error500("密码错误次数过多，密码错误次数过多，请"+passwordResetTime+"分钟后重试"); return result; } //2. 校验用户名或密码是否正确 @@ -126,11 +129,11 @@ public class CompanyLoginController { // 重试登录次数加一 retryCount++; if (retryCount == 1) { - redisUtil.set(RETRY_LOGIN_PREFIX + phone, retryCount, 60 * 30); + redisUtil.set(RETRY_LOGIN_PREFIX + phone, retryCount, 60 * passwordResetTime); } else { redisUtil.set(RETRY_LOGIN_PREFIX + phone, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + phone)); } - String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试" : "用户名或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); + String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "用户名或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); result.error500(msg); return result; } 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 a2c7da8c..32651871 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 @@ -76,6 +76,8 @@ public class LoginController { @Value("${defaultPassword}") private String defaultPassword; + @Value("${passwordResetTime}") + private int passwordResetTime; @ApiOperation("登录接口") @RequestMapping(value = "/login", method = RequestMethod.POST) @@ -129,7 +131,7 @@ public class LoginController { retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); } if (retryCount >= RETRY_LOGIN_MAX_COUNT) { - result.error500("密码错误次数过多，请稍后重试"); + result.error500("密码错误次数过多，请"+passwordResetTime+"分钟后重试"); return result; } //2. 校验用户名或密码是否正确 @@ -139,11 +141,11 @@ public class LoginController { // 重试登录次数加一 retryCount++; if (retryCount == 1) { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * 30); + 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 ? "密码错误次数过多，请稍后重试" : "用户名或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); + String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); result.error500(msg); return result; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index d8ec55f6..bc665675 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -367,7 +367,7 @@ public class SysUserServiceImpl extends ServiceImpl impl Result result = new Result(); //情况1：根据用户信息查询，该用户不存在 if (sysUser == null) { - result.error500("登录失败，用户名或密码错误！"); + result.error500("登录失败，账号或密码错误！"); baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); return result; } diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 3655f50c..3b878d8a 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -301,7 +301,10 @@ justauth: type: default prefix: 'demo::' timeout: 1h +#默认密码 defaultPassword: HZWLsoft.com123 +#密码错误次数重置时间 +passwordResetTime: 15 #华为云发送短信 huaWeiSms: #APP接入地址+接口访问URI @@ -320,4 +323,4 @@ standards: #消息模板替换，系统url，小程序名称 message: systemUrl: https://www.baidu.com/ - wxName: '小程序名称' \ No newline at end of file + wxName: '小程序名称'