diff --git a/src/main/java/io/v/nutz/web/commons/ext/validate/ValidateService.java b/src/main/java/io/v/nutz/web/commons/ext/validate/ValidateService.java index b468cf5..56c0879 100644 --- a/src/main/java/io/v/nutz/web/commons/ext/validate/ValidateService.java +++ b/src/main/java/io/v/nutz/web/commons/ext/validate/ValidateService.java @@ -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("发送验证码失败,请联系管理员或稍后重试"); } diff --git a/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java b/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java index b87763b..d2283e0 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java @@ -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"); diff --git a/src/main/resources/static/login.png b/src/main/resources/static/login.png index bae295e..c594b5b 100644 Binary files a/src/main/resources/static/login.png and b/src/main/resources/static/login.png differ diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index dc3b94e..11203c6 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -172,8 +172,7 @@ width="450" popper-class="appCenterPopover" placement="top-start" - v-model="menuPopover" - trigger="visible"> + trigger="click"> @@ -205,9 +204,9 @@ - + diff --git a/src/main/resources/views/mobile/login.html b/src/main/resources/views/mobile/login.html index 5ea2013..34789d2 100644 --- a/src/main/resources/views/mobile/login.html +++ b/src/main/resources/views/mobile/login.html @@ -67,7 +67,7 @@ layout("/mobile/platform.html"){ .bottom_v { position: absolute; - bottom: 0; + bottom: 30px; left: 0; width: 100%; } @@ -98,10 +98,12 @@ layout("/mobile/platform.html"){ - + - + - + - - + + {{ codeMsg }} - 登 录 + @click="handleLogin">登 录 + + + + +