From 905f19bc69cc4522a032a5dbc556b549ae028a14 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Thu, 18 Oct 2018 20:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ddos=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E8=B7=9F=E6=B5=81=E9=87=8F=E9=98=88=E5=80=BC=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/form/dDosIpInfo.jsp       | 36 --------------
 .../WEB-INF/views/cfg/ddosIpCfgForm.jsp       | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
index 77bb4eae4..9be36d4b4 100644
--- a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
@@ -2,44 +2,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">
-				<!--  目前支持TCP_SYN, DNS, NTP，单选。 -->
-	            <label class="control-label col-md-3"><spring:message code="antiddos_protocol"/></label>
-	            <div class="col-md-6">
-	            	 <select id="antiddosProtocol" name="antiddosProtocol" class="selectpicker show-tick form-control">
-							<option value=""><spring:message code="select"/></option>
-							<option value="TCP_SYN" <c:if test="${_cfg.antiddosProtocol=='TCP_SYN'}">selected</c:if>>TCP_SYN</option>
-							<option value="UDP_DNS" <c:if test="${_cfg.antiddosProtocol=='UDP_DNS'}">selected</c:if>>UDP_DNS</option>
-							<option value="UDP_NTP" <c:if test="${_cfg.antiddosProtocol=='UDP_NTP'}">selected</c:if>>UDP_NTP</option>
-	                 </select>
-	            </div>
-	            <div for="antiddosProtocol"></div>
-	        </div>
-	    </div><!--  目前支持TCP_SYN, DNS, NTP，单选。 -->
-	    <div class="col-md-6">
-		      <div class="form-group">
-		          <label class="control-label col-md-3"><spring:message code="bps_threadshold"/></label>
-		          <div class="col-md-6">
-		              <input id="bpsThreadshold" class="form-control digits" placeholder="Bit Per Second" maxlength="18" type="text" name="bpsThreadshold" value="${_cfg.bpsThreadshold}">
-		          </div>
-		          <div for="bpsThreadshold"></div>
-		      </div>
-		  </div>
-	</div>
 
 	<div class="row">
-		    <div class="col-md-6">
-		      <div class="form-group">
-		          <label class="control-label col-md-3"><spring:message code="pps_threadshold"/></label>
-		          <div class="col-md-6">
-		              <input id="ppsThreadshold" class="form-control digits" placeholder="Packet Per Second"  maxlength="18" type="text" name="ppsThreadshold" value="${_cfg.ppsThreadshold}">
-		          </div>
-		          <div for="ppsThreadshold"></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_type"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
index 92f8354f4..8f3d9aab5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -20,7 +20,11 @@ $(function(){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 		},
 		submitHandler: function(form){
+				$("div[for='bpsThreadshold']").empty();
+				$("div[for='ppsThreadshold']").empty();
 			if(($("#antiddosProtocol").val()!="")&&(!($("#bpsThreadshold").val().trim()>0)&&!($("#ppsThreadshold").val().trim()>0))){
+				$("div[for='bpsThreadshold']").append("<label id='level-error' class='error'><spring:message code='input'/></label>");
+				$("div[for='ppsThreadshold']").append("<label id='level-error' class='error'><spring:message code='input'/></label>");
 				top.$.jBox.tip("<spring:message code='one_more_greater_zero'/>", "<spring:message code='info'/>");
 				return;
 			}
@@ -110,6 +114,50 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								
+								<h3 class="form-section">
+									<spring:message code="action_region" />
+									<small></small>
+								</h3>
+								
+								
+								
+								<div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+											<!--  目前支持TCP_SYN, DNS, NTP，单选。 -->
+								            <label class="control-label col-md-3"><spring:message code="antiddos_protocol"/></label>
+								            <div class="col-md-6">
+								            	 <select id="antiddosProtocol" name="antiddosProtocol" class="selectpicker show-tick form-control">
+														<option value=""><spring:message code="select"/></option>
+														<option value="TCP_SYN" <c:if test="${_cfg.antiddosProtocol=='TCP_SYN'}">selected</c:if>>TCP_SYN</option>
+														<option value="UDP_DNS" <c:if test="${_cfg.antiddosProtocol=='UDP_DNS'}">selected</c:if>>UDP_DNS</option>
+														<option value="UDP_NTP" <c:if test="${_cfg.antiddosProtocol=='UDP_NTP'}">selected</c:if>>UDP_NTP</option>
+								                 </select>
+								            </div>
+								            <div for="antiddosProtocol"></div>
+								        </div>
+								    </div><!--  目前支持TCP_SYN, DNS, NTP，单选。 -->
+								    <div class="col-md-6">
+									      <div class="form-group">
+									          <label class="control-label col-md-3"><spring:message code="bps_threadshold"/></label>
+									          <div class="col-md-6">
+									              <input id="bpsThreadshold" class="form-control digits" placeholder="Bit Per Second" maxlength="18" type="text" name="bpsThreadshold" value="${_cfg.bpsThreadshold}">
+									          </div>
+									          <div for="bpsThreadshold"></div>
+									      </div>
+									  </div>
+									  <div class="col-md-6">
+									      <div class="form-group">
+									          <label class="control-label col-md-3"><spring:message code="pps_threadshold"/></label>
+									          <div class="col-md-6">
+									              <input id="ppsThreadshold" class="form-control digits" placeholder="Packet Per Second"  maxlength="18" type="text" name="ppsThreadshold" value="${_cfg.ppsThreadshold}">
+									          </div>
+									          <div for="ppsThreadshold"></div>
+									      </div>
+									  </div>
+									  
+								</div>
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/dDosIpInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>