From 245c051d0aeef0fa186e6cd1643cdda3979a1aa0 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 12 Jul 2018 11:51:57 +0800
Subject: [PATCH] =?UTF-8?q?dns=E6=AC=BA=E9=AA=97ip=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=9B=AE=E7=9A=84ip=E3=80=81=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E7=AB=AF=E5=8F=A3=E3=80=81=E6=96=B9=E5=90=91=E5=92=8C?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  7 ++--
 .../messages/message_zh_CN.properties         |  1 +
 .../WEB-INF/include/form/complexIpInfo.jsp    |  2 +-
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 33 +++----------------
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 2c081c9bb..480826cad 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -93,9 +93,9 @@ rtmp_ip_control=RTMP IP Control
 examine_manage=Confirmation Management
 audit_manage=Audit Management
 log_search=Log Search
-sysService_manage=System Business Management
-service_manage=Service Type Management
-system_service_manage=System Service Management
+sysService_manage=System Business
+service_manage=Service Type
+system_service_manage=System Service
 features_area=Feature Area
 attribute_manage=Attribute Management
 isp_manage=ISP Management
@@ -346,6 +346,7 @@ cancel_approved=Cancel Confirmation
 #==========guankongbaimingdan begin=====================
 client_ip=Client IP
 server_ip=Server IP
+port=port
 client_port=Client Port
 client_port_mask=Client Port Mask
 client_address_mask=Client IP Mask
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 5325e4bc4..8edd86c38 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -346,6 +346,7 @@ cancel_approved=\u53D6\u6D88\u5BA1\u6838\u901A\u8FC7
 #==========guankongbaimingdan begin=====================
 client_ip=\u6E90IP
 server_ip=\u76EE\u7684IP
+port=\u7AEF\u53E3
 client_port=\u6E90\u7AEF\u53E3
 client_port_mask=\u6E90\u7AEF\u53E3\u63A9\u7801
 client_address_mask=\u6E90\u5730\u5740\u63A9\u7801
diff --git a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp
index d6f4f39a1..a6d2daa0d 100644
--- a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp
@@ -64,7 +64,7 @@
 	    </div>
 	    <div class="col-md-6">
 	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
 	            <div class="col-md-6">
 	                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
 	            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 12b1d8d3d..8dd3929ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -102,8 +102,8 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
-												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
+												<form:option value="srcIpAddress"><spring:message code="IP"></spring:message></form:option>
+												<form:option value="srcPort"><spring:message code="port"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -278,16 +278,11 @@
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="policy_name"/></th>
 									<th><spring:message code="ip_type"/></th>
-									<th><spring:message code="client_ip"/></th>
-									<th><spring:message code="client_port"/></th>
-									<th><spring:message code="server_ip"/></th>
-									<th><spring:message code="server_port"/></th>
+									<th><spring:message code="IP"/></th>
+									<th><spring:message code="port"/></th>
 									<th><spring:message code="ip_pattern"/></th>
 									<th><spring:message code="port_pattern"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
 									<th><spring:message code="block_type"/></th>
-									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="type"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -317,8 +312,6 @@
 									</td>
 									<td>${cfg.srcIpAddress }</td>
 									<td>${cfg.srcPort }</td>
-									<td>${cfg.destIpAddress }</td>
-									<td>${cfg.destPort }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
 											<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
@@ -327,16 +320,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
 											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
 									<td>
@@ -346,14 +329,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">
-												<a href="javascript:viewAreaInfo('${ctx}','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
-													<spring:message code="yes"/>
-												</a>
-										</c:if>
-									</td>
 									<td>${cfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>