From 28d1d2676b241a8634932a6890e0033af3f2c4ca Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 17:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 3 +++
 src/main/resources/messages/message_zh_CN.properties | 3 +++
 src/main/webapp/WEB-INF/views/login.jsp              | 6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b47072900..391786e73 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -149,6 +149,9 @@ save_failed=save failed
 delete_success=delete success
 delete_failed=delete failed
 turning_page=It is turning to the page
+login_timeout=No login or login timeout,please login again,Thank you!
+captcha_error=captcha error
+enter_captcha=Please enter the captcha
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index ea4251d96..6ecf429d5 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -148,6 +148,9 @@ save_failed=\u4fdd\u5b58\u5931\u8d25
 delete_success=\u5220\u9664\u6210\u529f
 delete_failed=\u5220\u9664\u5931\u8d25
 turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
+login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22!
+captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
+enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index b9f572130..b569fea3e 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -128,8 +128,8 @@
                         captcha: {remote: "${pageContext.request.contextPath}/validateCode"}
     				},
     				messages: {
-    					username: {required: "请填写用户名..."},password: {required: "请填写密码..."},
-    					captcha: {remote: "验证码不正确...", required: "请填写验证码..."}
+    					username: {required: '<spring:message code="fill_loginName"/>...'},password: {required: '<spring:message code="fill_loginPassWord"/>...'},
+    					captcha: {remote: '<spring:message code="captcha_error"/>...', required: '<spring:message code="enter_captcha"/>...'}
     				},
     				errorLabelContainer: "#messageBox",
     				errorPlacement: function(error, element) {
@@ -139,7 +139,7 @@
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alert('未登录或登录超时。请重新登录，谢谢！');
+        			alert("<spring:message code='login_timeout'/>");
         			top.location = "${pageContext.request.contextPath }";
         		}