From cb1a2b4c427351bbbdfacdee4254c6ee527607af Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 26 Jul 2018 14:32:29 +0800
Subject: [PATCH] =?UTF-8?q?ip=E6=AC=BA=E9=AA=97=E4=BF=AE=E6=94=B9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E7=BC=BA=E7=9C=81=E7=BB=84=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=BB=84=E5=90=8D=E7=A7=B0=E4=B8=BA=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 10 ++++++----
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 3d06b11e6..9fc26d8e4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -73,10 +73,10 @@ $(function(){
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="group_name"/></label>
+								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select name="dnsStrategyId" class="selectpicker show-tick form-control required">
-								            		<option value="0" ><spring:message code="select"/></option>
+								            		<option value="0" ><spring:message code="default_group"/></option>
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
@@ -159,7 +159,7 @@ $(function(){
 								        </div>
 								    </div>
 								</div>
-								<div class="row port">
+								<%-- <div class="row port">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
@@ -182,8 +182,10 @@ $(function(){
 								            <div for="destPort"></div>
 								        </div>
 								    </div>
-								</div>
+								</div> --%>
+								<input type="hidden" name="portPattern" value="1">
 								<input type="hidden" name="srcPort" value="0">
+								<input type="hidden" name="destPort" value="0">
 								<input type="hidden" name="srcIpAddress" value="0.0.0.0">
 								<input type="hidden" name="direction" value="1">
 								<input type="hidden" name="protocolId" value="0">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 6939dc5e1..80e1d44f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -103,7 +103,7 @@
                                         	<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="destIpAddress"><spring:message code="IP"></spring:message></form:option>
-												<form:option value="destPort"><spring:message code="port"></spring:message></form:option>
+												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
 											</form:select>
 									
                                          </div>
@@ -276,12 +276,12 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="policy_name"/></th>
+									<th><spring:message code="group"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="IP"/></th>
-									<th><spring:message code="port"/></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="port_pattern"/></th> --%>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -304,24 +304,28 @@
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
 									<td>${cfg.cfgDesc }</td>
-									<td>${cfg.dnsStrategyName }</td>
+									<td>${cfg.dnsStrategyName }
+										<c:if test="${empty cfg.dnsStrategyName}">
+											<spring:message code="default_group"/>
+										</c:if>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
 									<td>${cfg.destIpAddress }</td>
-									<td>${cfg.destPort }</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>
 				               			</c:forEach>
 									</td>
-									<td>
+									<%-- <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> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">