java/TianMa.git

			@@ -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)) {

			@@ -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>

	ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史