From 82b302782eb0b070264562f0ff93d85228d2368c Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Fri, 20 Jul 2018 18:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tamguo/modules/sys/web/LoginController.java   |  2 +-
 .../tamguo/modules/sys/web/ValidCodeController.java   | 11 ++++++++---
 tamguo-oms/src/main/resources/templates/sysLogin.html |  6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
index 93728c2..622d718 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
@@ -30,7 +30,7 @@ public class LoginController {
 	}
 	
 	@ResponseBody
-	@RequestMapping(value = "login", method = RequestMethod.POST)
+	@RequestMapping(value = "sysLogin", method = RequestMethod.POST)
 	public Result toLogin(HttpServletRequest request, String username, String password, String captcha)
 			throws IOException {
 		try {
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java
index f6aa5b4..ba42c31 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
+import com.tamguo.modules.sys.utils.ExceptionSupport;
 import com.tamguo.modules.sys.utils.ShiroUtils;
 
 @Controller
@@ -40,9 +41,13 @@ public class ValidCodeController {
 	@RequestMapping("checkCode")
 	@ResponseBody
 	public Boolean checkCode(String validCode) throws ServletException, IOException {
-		String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
-		if (!validCode.equalsIgnoreCase(kaptcha)) {
-			return true;
+		try {
+			String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
+			if (!validCode.equalsIgnoreCase(kaptcha)) {
+				return true;
+			}
+		} catch (Exception e) {
+			ExceptionSupport.resolverResult("验证编码错误", this.getClass(), e);
 		}
 		return false;
 	}
diff --git a/tamguo-oms/src/main/resources/templates/sysLogin.html b/tamguo-oms/src/main/resources/templates/sysLogin.html
index 993b0d3..af045b2 100644
--- a/tamguo-oms/src/main/resources/templates/sysLogin.html
+++ b/tamguo-oms/src/main/resources/templates/sysLogin.html
@@ -32,7 +32,7 @@
 				<a th:href="${setting.domain}"><b>TamGuo OMS</b> <small th:text="${setting.version}">1.0.0</small></a>
 			</div>
 			<div class="login-box-body">
-				<form id="loginForm" action="sys/login" method="post">
+				<form id="loginForm" th:action="${setting.domain + 'sysLogin'}" method="post">
 					<div class="form-group has-feedback">
 						<span class="glyphicon glyphicon-user form-control-feedback"
 							title="登录账号"></span> <input type="text" id="username"
@@ -48,7 +48,7 @@
 							class="form-control required" data-msg-required="请填写登录密码."
 							placeholder="登录密码" autocomplete="off" />
 					</div>
-					<div class="form-group has-feedback" id="isValidCodeLogin">
+					<!-- <div class="form-group has-feedback" id="isValidCodeLogin">
 						<div class="input-group">
 							<span class="input-group-addon">验证码：</span> <input type="text"
 								id="validCode" name="validCode" class="form-control"
@@ -79,7 +79,7 @@
 								validCodeImgRefresh();
 							}, 1000);
 						</script>
-					</div>
+					</div> -->
 					<div class="form-group">
 						<div class="mt5 icheck">
 							<label title="公共场所慎用,下次不需要再填写帐号"><input type="checkbox"