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

1.登录页面错误提示，配置管理》邮件管控》收件人管控 国际化

Browse Source
This commit is contained in:
zhanghongqing
2018-03-06 16:56:19 +08:00
parent 7ff672d467
commit c2aa0ff725
6 changed files with 120 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/security/FormAuthenticationFilter.java
View File

@@ -74,14 +74,14 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
String className = e.getClass().getName(), message = ""; String className = e.getClass().getName(), message = "";
if (IncorrectCredentialsException.class.getName().equals(className) if (IncorrectCredentialsException.class.getName().equals(className)
|| UnknownAccountException.class.getName().equals(className)){ || UnknownAccountException.class.getName().equals(className)){
message = "用户或密码错误, 请重试."; message = "loginName_error";
} }
else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){ else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){
message = StringUtils.replace(e.getMessage(), "msg:", ""); message = StringUtils.replace(e.getMessage(), "msg:", "");
} }
else{ else{
message = "系统出现点问题，请稍后再试！"; message = "system_error";
e.printStackTrace(); // 输出到控制台 e.printStackTrace(); // 输出到控制台
} }
request.setAttribute(getFailureKeyAttribute(), className); request.setAttribute(getFailureKeyAttribute(), className);

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

@@ -142,6 +142,8 @@ date_list=Date List
confirm_message=Are you sure? confirm_message=Are you sure?
fill_loginName=Please fill in the loginName fill_loginName=Please fill in the loginName
fill_loginPassWord=Please fill in the passWord fill_loginPassWord=Please fill in the passWord
loginName_error=loginName and password error,please try again.
system_error=system error,please try again later!
save_success=save success save_success=save success
save_failed=save failed save_failed=save failed
delete_success=delete success delete_success=delete success
@@ -178,4 +180,35 @@ datebase_table=datebase table
fill_all=fill in all fill_all=fill in all
describe=describe describe=describe
back=back back=back
#==========yewuliexingguanli end===================== #==========yewuliexingguanli end=====================
#==========youjianguankong begin=====================
sort=sort
createTime_asc=order by createTime asc
createTime_desc=order by createTime desc
editTime_asc=order by editTime asc
editTime_desc=order by editTime desc
auditTime_asc=order by auditTime asc
auditTime_desc=order by auditTime desc
config_describe=configuration description
match_area=matching area
key_word=key word
block_type=block type
letter=letter
whether_area_block=whether area block
label=label
property=property
valid_identifier=valid identifier
is_audit=whether audit
creator=creator
config_time=configuration time
editor=editor
edit_time=edit time
auditor=auditor
audit_time=audit time
yes=yes
no=no
deleted=deleted
cancel_approved=cancel approved
#==========youjianguankong end=====================

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

@@ -141,6 +141,7 @@ confirm_message=\u786e\u5b9a\u5417\uff1f
fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5. loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5.
system_error=\u7cfb\u7edf\u51fa\u73b0\u70b9\u95ee\u9898\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\uff01
save_success=\u4fdd\u5b58\u6210\u529f save_success=\u4fdd\u5b58\u6210\u529f
save_failed=\u4fdd\u5b58\u5931\u8d25 save_failed=\u4fdd\u5b58\u5931\u8d25
delete_success=\u5220\u9664\u6210\u529f delete_success=\u5220\u9664\u6210\u529f
@@ -177,4 +178,35 @@ datebase_table=\u6570\u636e\u5e93\u8868
fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5 fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5
describe=\u63cf\u8ff0 describe=\u63cf\u8ff0
back=\u8fd4\u56de back=\u8fd4\u56de
#==========yewuliexingguanli end===================== #==========yewuliexingguanli end=====================
#==========youjianguankong begin=====================
sort=\u6392\u5e8f
createTime_asc=\u6309\u521b\u5efa\u65f6\u95f4\u987a\u5e8f
createTime_desc=\u6309\u521b\u5efa\u65f6\u95f4\u5012\u5e8f
editTime_asc=\u6309\u4fee\u6539\u65f6\u95f4\u987a\u5e8f
editTime_desc=\u6309\u4fee\u6539\u65f6\u95f4\u5012\u5e8f
auditTime_asc=\u6309\u5ba1\u6838\u65f6\u95f4\u987a\u5e8f
auditTime_desc=\u6309\u5ba1\u6838\u65f6\u95f4\u5012\u5e8f
config_describe=\u914d\u7f6e\u63cf\u8ff0
match_area=\u5339\u914d\u533a\u57df
key_word=\u5173\u952e\u5b57
block_type=\u7ba1\u63a7\u7c7b\u578b
letter=\u6765\u51fd
whither_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7
label=\u6807\u7b7e
property=\u6027\u8d28
valid_identifier=\u6709\u6548\u6807\u8bc6
is_audit=\u662f\u5426\u5ba1\u6838
creator=\u521b\u5efa\u4eba\u5458
config_time=\u914d\u7f6e\u65f6\u95f4
editor=\u4fee\u6539\u4eba\u5458
edit_time=\u4fee\u6539\u65f6\u95f4
auditor=\u5ba1\u6838\u4eba\u5458
audit_time=\u5ba1\u6838\u65f6\u95f4
yes=\u662f
no=\u5426
deleted=\u5df2\u5220\u9664
cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7
#==========youjianguankong end=====================

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

@@ -31,7 +31,7 @@ $(function(){
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i> <i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if> <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if> <c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div> </div>
<!-- <div class="tools"> <!-- <div class="tools">
@@ -81,8 +81,8 @@ $(function(){
<div class="col-md-6"> <div class="col-md-6">
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-8"> <div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green">保存</button> <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default">Cancel</button> <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div> </div>
</div> </div>
</div> </div>

94
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -25,7 +25,7 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button> onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -37,7 +37,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message> <i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div> </div>
<div class="tools"> <div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title="" <!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -54,16 +54,16 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" > <spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
<form:option value=""></form:option> <form:option value=""><spring:message code="select"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option> <form:option value="3"><spring:message code="cancel"></spring:message></form:option>
</form:select> </form:select>
<spring:message code="函号"/> : <spring:message code="request_number"/> :
<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索"> <form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""></form:option> <form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" > <c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option> <form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach> </c:forEach>
@@ -71,15 +71,15 @@
<button type="button" class="btn btn-default btn-sm" onclick="return page()"> <button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message> <i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button> </button>
<spring:message code="排序"/> : <spring:message code="sort"/> :
<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--"> <form:select path="page.orderBy" class="selectpicker select2">
<form:option value=""></form:option> <form:option value=""><spring:message code="select"/></form:option>
<form:option value="createTime asc">按创建时间顺序</form:option> <form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option>
<form:option value="createTime desc">按创建时间倒序</form:option> <form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option>
<form:option value="editTime asc">按修改时间顺序</form:option> <form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option>
<form:option value="editTime desc">按修改时间倒序</form:option> <form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option>
<form:option value="auditTime asc">按审核时间顺序</form:option> <form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option>
<form:option value="auditTime desc">按审核时间倒序</form:option> <form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option>
</form:select> </form:select>
</div> </div>
</form:form> </form:form>
@@ -88,27 +88,27 @@
<table class="table table-striped table-bordered table-condensed text-nowrap"> <table class="table table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th>配置ID</th> <th><spring:message code="seq"/></th>
<th>配置描述</th> <th><spring:message code="config_describe"/></th>
<th>匹配区域</th> <th><spring:message code="match_area"/></th>
<th>关键字</th> <th><spring:message code="key_word"/></th>
<th>管控类型</th> <th><spring:message code="block_type"/></th>
<!-- <th>业务id</th> --> <!-- <th>业务id</th> -->
<th>来函</th> <th><spring:message code="letter"/></th>
<!-- <th>编译id</th> --> <!-- <th>编译id</th> -->
<th>是否区域管控</th> <th><spring:message code="whether_area_block"/></th>
<th>分类</th> <th><spring:message code="type"/></th>
<th>性质</th> <th><spring:message code="type"/></th>
<th>标签</th> <th><spring:message code="property"/></th>
<!-- <th>区域生效id</th> --> <!-- <th>区域生效id</th> -->
<th>有效标识</th> <th><spring:message code="valid_indentifier"/></th>
<th>是否审核</th> <th><spring:message code="is_audit"/></th>
<th>创建人员</th> <th><spring:message code="creator"/></th>
<th>配置时间</th> <th><spring:message code="config_time"/></th>
<th>修改人员</th> <th><spring:message code="editor"/></th>
<th>修改时间</th> <th><spring:message code="edit_time"/></th>
<th>审核人员</th> <th><spring:message code="auditor"/></th>
<th>审核时间</th> <th><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th> <th><spring:message code="operation"></spring:message></th>
</tr> </tr>
</thead> </thead>
@@ -120,19 +120,19 @@
<td>${cfg.district }</td> <td>${cfg.district }</td>
<td>${cfg.keywords }</td> <td>${cfg.keywords }</td>
<td> <td>
<c:if test="${1 eq cfg.action }">阻断</c:if> <c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq cfg.action }">监测</c:if> <c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq cfg.action }">封堵白名单</c:if> <c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq cfg.action }">监测白名单</c:if> <c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if> <c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq cfg.action }">灰名单</c:if> <c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
</td> </td>
<%-- <td>${cfg.serviceId }</td> --%> <%-- <td>${cfg.serviceId }</td> --%>
<td>${cfg.requestName }</td> <td>${cfg.requestName }</td>
<%-- <td>${cfg.compileId }</td> --%> <%-- <td>${cfg.compileId }</td> --%>
<td> <td>
<c:if test="${cfg.isAreaEffective==0}">否</c:if> <c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}">是</c:if> <c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId"> <c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -160,16 +160,16 @@
</td> </td>
<%-- <td>${cfg.areaEffectiveIds }</td> --%> <%-- <td>${cfg.areaEffectiveIds }</td> --%>
<td> <td>
<c:if test="${cfg.isValid==0}">否</c:if> <c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}">是</c:if> <c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isValid==-1}">已删除</c:if> <c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td> </td>
<td> <td>
<c:choose> <c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when> <c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when> <c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when> <c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when> <c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose> </c:choose>
</td> </td>
<td>${cfg.creatorName }</td> <td>${cfg.creatorName }</td>

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

@@ -80,7 +80,7 @@
<p> <p>
<div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}"> <div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}">
<span class="label label-danger">ERROR:&nbsp;&nbsp;</span> <span class="label label-danger">ERROR:&nbsp;&nbsp;</span>
<label id="loginError" class="error">${message}</label> <label id="loginError" class="error"><spring:message code="${message}"></spring:message></label>
</div> </div>
</p> </p>