c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2024-07-25 18:22:29 +08:00
parent ed80df416c
commit 3270efcdc6
6 changed files with 153 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/web/commons/ext/validate/ValidateService.java
+3 -3
View File
@@ -51,8 +51,8 @@ public class ValidateService {
throw new SmsException("请1分钟之后再试");
}
if (redisService.exists(RedisConstant.REDIS_SMSCODE_KEY + mobile)){
return NutMap.NEW().addv("key", RedisConstant.REDIS_SMSCODE_KEY + mobile);
if (redisService.exists(RedisConstant.REDIS_SMSCODE_KEY + mobile)) {
return NutMap.NEW().addv("key", RedisConstant.REDIS_SMSCODE_KEY + mobile).addv("msg", "验证码仍在有效期内");
}
Orm_Msg ormMsgJsr = new Orm_Msg();
@@ -65,7 +65,7 @@ public class ValidateService {
log.debug("sms code:::" + text);
redisService.setex(RedisConstant.REDIS_SMSCODE_KEY + mobile, 300, text);
redisService.setex(RedisConstant.REDIS_SMSCODE_KEY + mobile + ":LOCK", 60, text);
return NutMap.NEW().addv("key", RedisConstant.REDIS_SMSCODE_KEY + mobile);
return NutMap.NEW().addv("key", RedisConstant.REDIS_SMSCODE_KEY + mobile).addv("msg", "发送成功");
}
throw new SmsException("发送验证码失败，请联系管理员或稍后重试");
}
src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java
+6 -2
View File
@@ -57,10 +57,14 @@ public class mobileLoginController {
@At("/doLogin")
@Ok("json")
@Filters(@By(type = PlatformAuthenticationFilter.class))
public Object doLogin(@Attr("platformLoginToken") AuthenticationToken token, HttpServletRequest request, HttpSession session) {
public Object doLogin(@Attr("platformLoginToken") AuthenticationToken token, String loginType, HttpServletRequest request, HttpSession session) {
int errCount = NumberUtils.toInt(Strings.sNull(SecurityUtils.getSubject().getSession(true).getAttribute("platformErrCount")));
try {
loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.WEB_H5);
if ("SMS_CODE".equals(loginType)){
loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.SMS_CODE);
} else {
loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.WEB_H5);
}
return Result.success("login.success");
} catch (CaptchaIncorrectException e) {
return Result.error(1, "login.error.captcha");