From 6d49f64a33b16409bd6a4987b4cc036870cb352c Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 6 Mar 2018 18:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E3=80=8B?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=8BIP?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=8B=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |   2 +-
 .../messages/message_zh_CN.properties         |  23 +++-
 .../WEB-INF/include/form/complexInfo.jsp      |   2 +-
 .../WEB-INF/views/cfg/complexCfgList.jsp      |   4 +-
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    |   6 +-
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 112 +++++++++---------
 6 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 4d6ce538f..3d36e2dd9 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -197,7 +197,7 @@ block_type=block type
 letter=letter
 whether_area_block=whether area block
 label=label
-property=property
+attribute=attribute
 valid_identifier=valid identifier
 is_audit=whether audit
 creator=creator
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index d0023c77d..8c7f9df9e 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -193,9 +193,9 @@ 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
+whether_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7
 label=\u6807\u7b7e
-property=\u6027\u8d28
+attribute=\u6027\u8d28
 valid_identifier=\u6709\u6548\u6807\u8bc6
 is_audit=\u662f\u5426\u5ba1\u6838
 creator=\u521b\u5efa\u4eba\u5458
@@ -209,4 +209,21 @@ no=\u5426
 deleted=\u5df2\u5220\u9664
 cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7
 
-#==========youjianguankong end=====================
\ No newline at end of file
+#==========youjianguankong end=====================
+
+#==========guankongbaimingdan begin=====================
+client_ip=\u6e90IP
+server_ip=\u76ee\u7684IP
+client_port=\u6e90\u7aef\u53e3
+client_port_mask=\u6e90\u7aef\u53e3\u63a9\u7801
+client_address_mask=\u6e90\u5730\u5740\u63a9\u7801
+server_port=\u76ee\u7684\u7aef\u53e3
+server_port_mask=\u76ee\u7684\u7aef\u53e3\u63a9\u7801
+server_address_mask=\u76ee\u7684\u5730\u5740\u63a9\u7801
+block_addr=\u7ba1\u63a7\u5730\u5740
+block_domain=\u7ba1\u63a7\u57df\u540d
+block_url=\u5c01\u5835\u8def\u5f84
+configuration=\u914d\u7f6e
+direction=\u65b9\u5411
+protocol=\u534f\u8bae
+#==========guankongbaimingdan end=====================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index e2dc40770..7ea6a1462 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -70,7 +70,7 @@
             <label class="control-label col-md-3">表达式类型</label>
             <div class="col-md-8">
             	<label class="radio-inline">
-            		<input type="radio" name="exprType " value="1"
+            		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
             		>与表达式
             	</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 654526b5f..1d3c3d663 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -98,10 +98,10 @@
 									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="type"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="label"/></th>
 									<th><spring:message code="property"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th><spring:message code="valid_indentifier"/></th>
+									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
 									<th><spring:message code="config_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 88da2f167..9fb9d54cb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -78,7 +78,7 @@ $(function(){
                   <div class="portlet-title">
                      <div class="caption">
                          <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>
 					</div>
                       <!-- <div class="tools">
@@ -129,8 +129,8 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green">保存</button>
-                                              <button id="cancel" type="button" class="btn default">Cancel</button>
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
                                           </div>
                                       </div>
                                   </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index b42a70dcd..66e967c00 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -25,7 +25,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
@@ -37,7 +37,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<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 class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -54,16 +54,16 @@
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
-									<form:option value=""></form:option>
+								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
+									<form:option value=""><spring:message code="select"/></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="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_approved"></spring:message></form:option>
 								</form:select>
-								<spring:message code="函号"/> :
-								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
-									<form:option value=""></form:option>
+								<spring:message code="request_number"/> :
+								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
+									<form:option value=""><spring:message code="select"/></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -71,15 +71,15 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="排序"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
-									<form:option value=""></form:option>
-									<form:option value="createTime asc">按创建时间顺序</form:option>
-									<form:option value="createTime desc">按创建时间倒序</form:option>
-									<form:option value="editTime asc">按修改时间顺序</form:option>
-									<form:option value="editTime desc">按修改时间倒序</form:option>
-									<form:option value="auditTime asc">按审核时间顺序</form:option>
-									<form:option value="auditTime desc">按审核时间倒序</form:option>
+								<spring:message code="sort"/> : 
+								<form:select path="page.orderBy" class="selectpicker select2">
+									<form:option value=""><spring:message code="select"/></form:option>
+									<form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option>
+									<form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option>
+									<form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option>
+									<form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option>
+									<form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option>
+									<form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option>
 								</form:select>
 							</div>
 						</form:form>
@@ -88,37 +88,37 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>序列</th>
-									<th>配置描述</th>
-									<th>ip类型</th>
-									<th>源IP地址</th>
-									<th>源地址掩码</th>
-									<th>源端口</th>
-									<th>源端口掩码</th>
-									<th>目的IP地址</th>
-									<th>目的地址掩码</th>
-									<th>目的端口</th>
-									<th>目的端口掩码</th>
-									<th>方向</th>
-									<th>协议</th>
+									<th><spring:message code="seq"/></th>
+									<th><spring:message code="config_describe"/></th>
+									<th>ip<spring:message code="type"/></th>
+									<th><spring:message code="client_ip"/></th>
+									<th><spring:message code="client_address_mask"/></th>
+									<th><spring:message code="client_port"/></th>
+									<th><spring:message code="client_port_mask"/></th>
+									<th><spring:message code="server_ip"/></th>
+									<th><spring:message code="server_address_mask"/></th>
+									<th><spring:message code="server_port"/></th>
+									<th><spring:message code="server_port_mask"/></th>
+									<th><spring:message code="direction"/></th>
+									<th><spring:message code="protocol"/></th>
 									<!-- <th>协议ID</th> -->
-									<th>管控类型</th>
+									<th><spring:message code="block_type"/></th>
 									<!-- <th>业务id</th> -->
-									<th>来函</th>
+									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
-									<th>是否区域管控</th>
-									<th>分类</th>
-									<th>性质</th>
-									<th>标签</th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="type"/></th>
+									<th><spring:message code="label"/></th>
+									<th><spring:message code="attribute"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th>有效标识</th>
-									<th>是否审核</th>
-									<th>创建人员</th>
-									<th>配置时间</th>
-									<th>修改人员</th>
-									<th>修改时间</th>
-									<th>审核人员</th>
-									<th>审核时间</th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="creator"/></th>
+									<th><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th><spring:message code="audit_time"/></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -140,19 +140,19 @@
 									<td>${ipCfg.protocol }</td>
 									<%-- <td>${ipCfg.protocolId }</td> --%>
 									<td>
-										<c:if test="${1 eq ipCfg.action }">阻断</c:if>
-										<c:if test="${2 eq ipCfg.action }">监测</c:if>
-										<c:if test="${5 eq ipCfg.action }">封堵白名单</c:if>
-										<c:if test="${6 eq ipCfg.action }">监测白名单</c:if>
-										<c:if test="${7 eq ipCfg.action }">封堵监测白名单</c:if>
-										<c:if test="${8 eq ipCfg.action }">灰名单</c:if>
+										<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>                   
+										<c:if test="${2 eq ipCfg.action }"><spring:message code="monitor"/></c:if>                 
+										<c:if test="${5 eq ipCfg.action }"><spring:message code="block_white_list"/></c:if>        
+										<c:if test="${6 eq ipCfg.action }"><spring:message code="monitor_white_list"/></c:if>      
+										<c:if test="${7 eq ipCfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
+										<c:if test="${8 eq ipCfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
 									<%-- <td>${ipCfg.serviceId }</td> --%>
 									<td>${ipCfg.requestName }</td>
 									<%-- <td>${ipCfg.compileId }</td> --%>
 									<td>
-										<c:if test="${ipCfg.isAreaEffective==0}">否</c:if>
-										<c:if test="${ipCfg.isAreaEffective==1}">是</c:if>
+										<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
@@ -180,16 +180,16 @@
 									</td>
 									<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
 									<td>
-										<c:if test="${ipCfg.isValid==0}">否</c:if>
-										<c:if test="${ipCfg.isValid==1}">是</c:if>
-										<c:if test="${ipCfg.isValid==-1}">已删除</c:if>
+										<c:if test="${ipCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${ipCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${ipCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
 									<td>
 										<c:choose>
 											<c:when test="${ipCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${ipCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${ipCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
+											<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${ipCfg.creatorName }</td>