From f9f6fc527105e3da4763cbaa80200ab66271e1b9 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 20 Jul 2018 09:15:57 +0800
Subject: [PATCH] =?UTF-8?q?DNS=E6=AC=BA=E9=AA=97IP=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8A=E6=94=B9=E4=B8=BAdsestIp=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=94=B9=E4=B8=BAdestPort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 83 ++++++++++++++++++-
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp |  8 +-
 2 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 35b0355de..95f87e9cf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -52,8 +52,7 @@ $(function(){
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                       	<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
-                   				<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
@@ -77,7 +76,6 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="policy_name"/></label>
 								            <div class="col-md-6">
 								            	<select name="dnsStrategyId" class="selectpicker show-tick form-control">
-														<option value="0" ><spring:message code="select"/></option>
 					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
 														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
 							              			</c:forEach>
@@ -112,7 +110,84 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
+                           <%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> --%>
+                           <div class="row ipInfo">
+								<div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
+								            <div class="col-md-6">
+								            	 <select name="ipType" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('WHITELIST_IPTYPE')}" var="ipTypeC">
+														<option value="${ipTypeC.itemCode}" 
+																<c:if test="${_cfg.ipType==ipTypeC.itemCode 
+																	|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
+																	selected
+																</c:if>
+																>
+														<spring:message code="${ipTypeC.itemValue}"/>
+														</option>
+							               			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="ipType"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+								            <div class="col-md-6">
+								            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
+								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+							              			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="ipPattern"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								            </div>
+								            <div for="destIpAddress"></div>
+								        </div>
+								    </div>
+								</div>
+								<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>
+								            <div class="col-md-6">
+								            	 <select name="portPattern" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+							              			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="portPattern"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <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="destPort" value="${_cfg.destPort}">
+								            </div>
+								            <div for="destPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<input type="hidden" name="srcPort" 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">
+								<input type="hidden" name="protocol" value="0">
+							</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 2bdd08375..6939dc5e1 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="IP"></spring:message></form:option>
-												<form:option value="srcPort"><spring:message code="port"></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:select>
 									
                                          </div>
@@ -310,8 +310,8 @@
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
 				               			</c:forEach>
 									</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>