gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-03-07 17:28:57 +08:00
parent e4edb7bd18 28d1d2676b
commit 2e7d4c34a1
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -149,6 +149,9 @@ save_failed=save failed
delete_success=delete success delete_success=delete success
delete_failed=delete failed delete_failed=delete failed
turning_page=It is turning to the page 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===================== #==========message end=====================
#==========yewuliexingguanli begin===================== #==========yewuliexingguanli begin=====================

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -148,6 +148,9 @@ save_failed=\u4fdd\u5b58\u5931\u8d25
delete_success=\u5220\u9664\u6210\u529f delete_success=\u5220\u9664\u6210\u529f
delete_failed=\u5220\u9664\u5931\u8d25 delete_failed=\u5220\u9664\u5931\u8d25
turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762 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===================== #==========message end=====================
#==========yewuliexingguanli begin===================== #==========yewuliexingguanli begin=====================

6
src/main/webapp/WEB-INF/views/login.jsp
View File

@@ -128,8 +128,8 @@
captcha: {remote: "${pageContext.request.contextPath}/validateCode"} captcha: {remote: "${pageContext.request.contextPath}/validateCode"}
}, },
messages: { messages: {
username: {required: "请填写用户名..."},password: {required: "请填写密码..."}, username: {required: '<spring:message code="fill_loginName"/>...'},password: {required: '<spring:message code="fill_loginPassWord"/>...'},
captcha: {remote: "验证码不正确...", required: "请填写验证码..."} captcha: {remote: '<spring:message code="captcha_error"/>...', required: '<spring:message code="enter_captcha"/>...'}
}, },
errorLabelContainer: "#messageBox", errorLabelContainer: "#messageBox",
errorPlacement: function(error, element) { errorPlacement: function(error, element) {
@@ -139,7 +139,7 @@
// 如果在框架或在对话框中，则弹出提示并跳转到首页 // 如果在框架或在对话框中，则弹出提示并跳转到首页
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ 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 }"; top.location = "${pageContext.request.contextPath }";
} }