From 53ec3978d59d5ae26e6fc50cce77f05357f7d773 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 18 Jul 2018 17:30:04 +0800
Subject: [PATCH] =?UTF-8?q?DDOS=E7=9B=AE=E6=A0=87IP=E9=98=B2=E6=8A=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=BA=90IP?=
 =?UTF-8?q?=EF=BC=8C=E6=BA=90=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/form/dDosIpInfo.jsp       | 139 ++++++++++++++++++
 .../WEB-INF/views/cfg/ddosIpCfgForm.jsp       |   2 +-
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       |   8 +-
 3 files changed, 144 insertions(+), 5 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp

diff --git a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
new file mode 100644
index 000000000..77d4897db
--- /dev/null
+++ b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
@@ -0,0 +1,139 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
+<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('IP_TYPE')}" 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="server_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>
+	<c:choose>
+		<c:when test="${_cfg.cfgId==null}">
+			<div class="row hidden port">
+		</c:when>
+		<c:otherwise>
+			<div class="row port">
+		</c:otherwise>
+	</c:choose>
+	    <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="server_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>
+	<c:choose>
+		<c:when test="${_cfg.cfgId==null}">
+			<div class="row hidden destPort">
+		</c:when>
+		<c:otherwise>
+			<div class="row destPort">
+		</c:otherwise>
+	</c:choose>
+		<div class="col-md-6">
+	        <div class="form-group ">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+	            <div class="col-md-6">
+           				<select name="protocol" class="selectpicker show-tick form-control required">
+           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+								<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+            				</c:forEach>
+           				</select>
+	                <input type="hidden" name="protocolId" value="0">
+	            </div>
+	            <div for="protocol"></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="direction"/></label>
+	            <div class="col-md-6">
+	            	<select name="direction" class="selectpicker show-tick form-control required" >
+	                   <c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+							<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+              			</c:forEach>
+	                 </select>
+	            </div>
+	            <div for="direction"></div>
+	        </div>
+	    </div>
+	</div>
+	<c:if test="${_cfg.cfgId==null}">
+		<div class="row">
+		<button type="button" class="btn btn-red-hollow center-block" onClick="more(this);" data-click-times="0"><spring:message code="show_more"/></button>
+		</div>
+	</c:if>
+	<div class="row destPort">
+	    <div class="col-md-6">
+	        <div class="form-group">
+	            <div class="col-md-6">
+	                 <input type="hidden" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+	            </div>
+	        </div>
+	    </div>
+	    <div class="col-md-6">
+	        <div class="form-group ">
+	            <div class="col-md-6">
+	                 <input type="hidden" name="srcPort" value="${_cfg.srcPort}">
+	            </div>
+	        </div>
+	    </div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
index b55fbc526..bc8d554d0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -95,7 +95,7 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
+                           <%@include file="/WEB-INF/include/form/dDosIpInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 23bbc51de..981201ca9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -281,8 +281,8 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></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="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_pattern"/></th>
@@ -317,8 +317,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.srcIpAddress }</td>
+									<td>${cfg.srcPort }</td> --%>
 									<td>${cfg.destIpAddress }</td>
 									<td>${cfg.destPort }</td>
 									<td>