From 9b9f13277fa12035555decfa54a8f2ceff612ce9 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:46:49 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html | 20 ++++++++++----------
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java | 24 ++++++++++++------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index d7af1c1..7f9d6a7 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -168,22 +168,22 @@
return "/login.html";
}
- //验证短信验证码
- if(ToolUtil.isEmpty(sms_code)){
- model.addAttribute("tips", "无效的验证码");
- return "/login.html";
- }
- User user = userService.getByAccount(username);
- if(!"aaaa".equals(sms_code)){
- String value = redisUtil.getValue(user.getPhone());
- if(ToolUtil.isEmpty(value) || !sms_code.equals(value)){
+ //验证验证码是否正确
+ if (KaptchaUtil.getKaptchaOnOff()) {
+ //验证短信验证码
+ if(ToolUtil.isEmpty(sms_code)){
model.addAttribute("tips", "无效的验证码");
return "/login.html";
}
- }
+ User user = userService.getByAccount(username);
+ if(!"aaaa".equals(sms_code)){
+ String value = redisUtil.getValue(user.getPhone());
+ if(ToolUtil.isEmpty(value) || !sms_code.equals(value)){
+ model.addAttribute("tips", "无效的验证码");
+ return "/login.html";
+ }
+ }
- //验证验证码是否正确
- if (KaptchaUtil.getKaptchaOnOff()) {
String kaptcha = super.getPara("kaptcha").trim();
String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
diff --git a/ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html b/ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
index bc42431..5110695 100644
--- a/ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
+++ b/ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -74,16 +74,16 @@
<input class="itemInput" name="sms_code" id="sms_code" placeholder="请输入验证码" required="" value="" style="padding-left: 0px; text-align: center;">
<button id="btn" type="button" onclick="sendSMSCode(this)" style="width: 150px; font-size: 14px;">获取验证码</button>
</div>
- @if(kaptcha.getKaptchaOnOff() == true){
- <div class="form-group" style="float: left;">
- <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
- <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">
- </div>
- <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
- <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
- </div>
- </div>
- @}
+<!-- @if(kaptcha.getKaptchaOnOff() == true){-->
+<!-- <div class="form-group" style="float: left;">-->
+<!-- <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">-->
+<!-- <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">-->
+<!-- </div>-->
+<!-- <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">-->
+<!-- <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- @}-->
<div class="form-group" style="float: left;">
<div class="checkbox" style="text-align: left">
<!--<label>
--
Gitblit v1.7.1