From 78bfd4dc5e0a2c6e10b81839044114ddd943e225 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Tue, 7 Aug 2018 13:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hex=E5=8D=81=E5=85=AD?=
 =?UTF-8?q?=E8=BF=9B=E5=88=B6=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E5=A4=9A=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E9=85=8D=E7=BD=AE=E6=9F=A5=E7=9C=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=B1=9E=E6=80=A7=E4=B8=BA=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/actionRegionForm.jsp    |  2 +-
 .../WEB-INF/views/cfg/app/appByteCfgForm.jsp  | 14 +++++
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    |  6 +-
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    | 16 +++++
 .../views/cfg/fileTransfer/ftpForm.jsp        | 17 +++++-
 .../views/cfg/fileTransfer/ftpSubList.jsp     | 18 +++++-
 .../WEB-INF/views/cfg/mail/mailForm.jsp       | 17 +++++-
 .../WEB-INF/views/cfg/mail/mailSubList.jsp    | 21 +++++++
 .../WEB-INF/views/cfg/other/bgpForm.jsp       | 17 +++++-
 .../WEB-INF/views/cfg/other/xmppForm.jsp      | 19 +++++-
 .../WEB-INF/views/cfg/other/xmppSubList.jsp   | 23 +++++--
 .../cfg/proxy/control/httpRedirectForm.jsp    | 18 +++++-
 .../cfg/proxy/control/httpRedirectList.jsp    |  2 +
 .../cfg/proxy/control/httpRedirectSubList.jsp | 60 +++++++++++--------
 .../WEB-INF/views/cfg/website/dnsForm.jsp     | 19 +++++-
 .../WEB-INF/views/cfg/website/dnsSubList.jsp  | 18 ++++++
 .../WEB-INF/views/cfg/website/httpForm.jsp    | 23 ++++++-
 .../WEB-INF/views/cfg/website/httpSubList.jsp | 37 +++++++++++-
 .../WEB-INF/views/cfg/website/sslForm.jsp     | 20 ++++++-
 .../WEB-INF/views/cfg/website/sslSubList.jsp  | 16 +++++
 .../static/layouts/layout/scripts/layout.js   | 22 ++++---
 21 files changed, 345 insertions(+), 60 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
index 551f284a7..efb1d5558 100644
--- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
@@ -61,7 +61,7 @@
 				<select name="userRegion1"
 				class="selectpicker show-tick form-control required">
 					<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="redirectResponseCodeC">
-						<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${redirectResponseCodeC.itemValue}"/></option>
+						<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>>${redirectResponseCodeC.itemCode} <spring:message code="${redirectResponseCodeC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index c41709564..01e1e3510 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -32,6 +32,20 @@ $(function(){
 					return;
 				}
 			})
+			$("select[name$='isHexbin']").each(function(){
+				var isHexbin=$(this).val();
+				if(isHexbin == 1){ //十六进制 
+					var keywords=$($(this).attr("name").replace("isHexbin","cfgKeywords")).val();
+					if(/^([0-9|a-z|A-Z]*)$/.test(value)){
+						$(this).parents(".form-group").find(
+								"div[for='"
+										+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+										+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+						flag = false;
+						return;
+					}					
+				}
+			});
 			if(flag){
 				$("input[name$='exprType']").attr("disabled",false);
 				$("#appCode").val($("#specServiceIdId").val());
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 2bf459b3a..f938aad9d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -11,7 +11,6 @@ border:1px solid #eeeeee
 </style>
 <script type="text/javascript">
 $(function(){
-	
 	$("#cancel").on("click",function(){
 		window.history.back();
 	});
@@ -50,7 +49,6 @@ $(function(){
 	}
 });
 
-
 //业务窗口打开
 var addContent=function(obj,contentClassName){
 	$("."+contentClassName+"0").removeClass("hidden").removeClass("disabled");
@@ -210,8 +208,8 @@ var delContent=function(contentClassName,addBtnClassName){
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
 									            <div class="col-md-6">
-									            	<label class="radio-inline">
-									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="1" class="hidden"
+									            	<label class="radio-inline hidden">
+									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="1"
 									            			<c:if test="${voipAccount.exprType==1}">checked</c:if>
 									            		><spring:message code="and_expression"/>
 									            	</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index db56ffb91..8adf976d2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -130,6 +130,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='expression_type'/>：</label>";
@@ -143,6 +145,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='match_method'/>：</label>";
@@ -197,6 +201,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='ip_pattern'/>：</label>";
@@ -213,6 +219,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='client_ip'/>：</label>";
@@ -236,6 +244,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='client_port'/>：</label>";
@@ -244,6 +254,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='server_ip'/>：</label>";
@@ -262,6 +274,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='direction'/>：</label>";
@@ -278,6 +292,8 @@
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
 								html+="<label><spring:message code='protocol'/>：</label>";
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index ae3699dcd..9f4bf4024 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -52,9 +52,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
 										})
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -63,6 +76,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
index d55b92d88..d13361879 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
@@ -36,6 +36,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -46,6 +48,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -66,11 +70,15 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -83,6 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">						
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -93,6 +103,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -104,7 +116,7 @@
 							</div>
 						</div>
 					</div>
-				</div>
+			</div>
 			</c:if>
 			</c:forEach>
 	</c:if>
@@ -132,6 +144,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -142,6 +156,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index 5388623a7..9ecb25d8a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -58,9 +58,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
 										})
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -69,6 +82,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 3ab32b8d7..fe33fdfd3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -37,6 +37,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -47,6 +49,7 @@
 								</label>
 							</div>
 						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -67,11 +70,15 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -84,6 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -94,6 +103,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -119,6 +130,8 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
@@ -140,6 +153,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -150,6 +165,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
@@ -175,6 +192,8 @@
 								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
 							</div>
 						</div>
+						</div>
+					<div class="row">						
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='cfds_level' />:</label>
@@ -194,6 +213,8 @@
 								</a>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='file_url' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 5a694ce19..6d7943ab2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -51,9 +51,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
 										})
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -62,6 +75,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 6b92610c4..9d1598f10 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -52,9 +52,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
-										})
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -62,6 +75,8 @@
 											});
 											$("input[name$='exprType']").attr("disabled",false);
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
index c3790a539..e03edbf18 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
@@ -36,6 +36,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -46,6 +48,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -66,11 +70,15 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -83,6 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -93,6 +103,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -118,6 +130,8 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
@@ -126,6 +140,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='expression_type' />:</label>
@@ -150,6 +166,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
@@ -160,11 +178,6 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-4">
-							<div class="form-group">
-								<label></label><label></label>
-							</div>
-						</div>
 					</div>
 				</div>
 			</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index c1712a8bb..0024d64b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -59,10 +59,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
 										});
-										
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -71,6 +83,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 83e9cc483..06993c734 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -548,6 +548,7 @@
 										<td>
 											<c:forEach items="${fns:getDictList('RESPONSE_CODE') }" var="dict1">
 												<c:if test="${dict1.itemCode eq indexCfg.userRegion1 }">
+												${dict1.itemCode} 
 													<spring:message code="${dict1.itemValue }"/>
 												</c:if>
 											</c:forEach>
@@ -558,6 +559,7 @@
 										<td>
 											<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE') }" var="dict2">
 												<c:if test="${dict2.itemCode eq indexCfg.userRegion1 }">
+													${dict2.itemCode} 
 													<spring:message code="${dict2.itemValue }"/>
 												</c:if>
 											</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
index 949aa08de..2ddfecefa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
@@ -68,6 +68,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='ip_pattern'/>:</label>
@@ -78,6 +80,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='client_ip'/>:</label>
@@ -98,6 +102,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -115,6 +121,8 @@
 				<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='direction'/>:</label>
@@ -125,6 +133,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='protocol'/>:</label>
@@ -146,6 +156,8 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -157,6 +169,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -179,12 +193,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
 		</div>
-	</div>
 </div>
 
 </c:forEach>
@@ -196,11 +205,15 @@
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -224,6 +237,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -234,13 +249,8 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
 		</div>
 	</div>
-	</div>
 </c:forEach>
 <c:forEach items="${_cfg.httpReqBodyList}" var="cfg">
 <div id="reqBodyInfo${index}" class="content" name="subCfg${index}">
@@ -250,6 +260,8 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -261,6 +273,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -283,13 +297,8 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
 		</div>
 	</div>
-	</div>
 
 </c:forEach>
 <c:forEach items="${_cfg.httpResHdrList}" var="cfg">
@@ -300,11 +309,15 @@
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -328,6 +341,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -338,11 +353,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 
@@ -355,7 +365,8 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
-
+		</div>
+<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -367,6 +378,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -389,11 +402,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index a0d5ba238..d4bb37f59 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -52,9 +52,22 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
-										})
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -63,6 +76,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
index bbd5d1d0a..ec8da7a2d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -36,6 +36,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+				<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -46,6 +48,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -66,11 +70,15 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">					
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -83,6 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -93,6 +103,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -118,6 +130,8 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
@@ -139,6 +153,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -149,6 +165,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index 1b79cabc4..ba94b9dc4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -97,9 +97,26 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
-										})
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													alert($(this).parents(".boxSolid").find(
+															"div[for='"
+															+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+															+ "']").length);
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -108,6 +125,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
index 92f2cc7a6..6b1cef82f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -68,6 +68,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='ip_pattern'/>:</label>
@@ -78,6 +80,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='client_ip'/>:</label>
@@ -98,11 +102,15 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -115,6 +123,8 @@
 				<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='direction'/>:</label>
@@ -125,6 +135,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='protocol'/>:</label>
@@ -160,6 +172,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -170,6 +184,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -192,6 +208,8 @@
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
@@ -210,7 +228,8 @@
 				</label>
 			</div>
 		</div>
-		
+		</div>
+		<div class="row">		
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -221,6 +240,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+	<div class="row">		
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -255,6 +276,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -265,6 +288,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -287,6 +312,8 @@
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
@@ -306,6 +333,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -316,6 +345,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
@@ -351,6 +382,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -361,6 +394,8 @@
 				</label>
 			</div>
 		</div>
+		</div>
+		<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index 732c990a9..82e2ce98d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -52,9 +52,23 @@
 																+ $(this).attr("name")
 																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 												flag = false;
-												return;
 											}
-										})
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+													$(this).parents(".boxSolid").find(
+															"div[for='"
+																	+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																	+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+													flag = false;
+													return;
+												}					
+											}
+										});
 										if(flag){
 											//将disable属性的元素删除
 											$(".disabled").each(function(){
@@ -63,6 +77,8 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											loading('onloading...');
 											form.submit();
+										}else{
+											return;
 										}
 										
 									},
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
index 9eed42642..0fe9e1429 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
@@ -36,6 +36,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -46,6 +48,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -66,11 +70,15 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -83,6 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -93,6 +103,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -131,6 +143,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -141,6 +155,8 @@
 								</label>
 							</div>
 						</div>
+						</div>
+						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/static/layouts/layout/scripts/layout.js b/src/main/webapp/static/layouts/layout/scripts/layout.js
index dc9f60fc5..07164ddff 100644
--- a/src/main/webapp/static/layouts/layout/scripts/layout.js
+++ b/src/main/webapp/static/layouts/layout/scripts/layout.js
@@ -141,22 +141,26 @@ var Layout = function () {
                 return;
             }
 
+            var parent =that.parent().parent();
+            var the = that;
+            var menu = $('.page-sidebar-menu');
+            var sub = that.next();
+            
+            var autoScroll = menu.data("auto-scroll");
+            var slideSpeed = parseInt(menu.data("slide-speed"));
+            var keepExpand = menu.data("keep-expanded");
+            
             if (hasSubMenu === false) {
+            	that.parent().parent().find('span.arrow').removeClass('open');
+            	that.parent().parent().find('span.arrow').parent().parent().find('.sub-menu:not(.always-open)').slideUp(slideSpeed);
+            	that.parent().parent().find('span.arrow').parent().parent().find(".sub-menu").attr("style","none");
+            	that.parent().parent().find('li.open').removeClass('open');
                 if (App.getViewPort().width < resBreakpointMd && $('.page-sidebar').hasClass("in")) { // close the menu on mobile view while laoding a page 
                     $('.page-header .responsive-toggler').click();
                 }
                 return;
             }
 
-            var parent =that.parent().parent();
-            var the = that;
-            var menu = $('.page-sidebar-menu');
-            var sub = that.next();
-
-            var autoScroll = menu.data("auto-scroll");
-            var slideSpeed = parseInt(menu.data("slide-speed"));
-            var keepExpand = menu.data("keep-expanded");
-            
             if (!keepExpand) {
                 parent.children('li.open').children('a').children('.arrow').removeClass('open');
                 parent.children('li.open').children('.sub-menu:not(.always-open)').slideUp(slideSpeed);