Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_ru.properties src/main/resources/messages/message_zh_CN.properties 关键字日志转http url配置功能完成
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -21,6 +21,7 @@
 						<button class="close" data-dismiss="alert"></button>
 						<span></span>
 					</div>
+					
 						<input type="hidden" name="fucntionId" id="fucntionId" value="${cfg.functionId }">
 						</br>
 						<c:if test="${serviceList != null && serviceList.size() > 0}">
--- a/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp
@@ -0,0 +1,423 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%> 
+<script>
+$(function () { 
+	 var options;
+	//模式动框打开之前做好配置列表
+	$('#http_url_modal').on('show.bs.modal', function () {
+		$("#httpUrl").find("tbody").remove();
+		var checkboxes=$("#contentTable tbody tr td input.i-checks:checkbox");
+		var compileIds=[],urls=[];
+		$(checkboxes).filter(":checked").each(function(){
+			compileIds.push($(this).attr("compileId"));
+			urls.push($(this).attr("url"));
+		})
+	 	if(compileIds.length > 0){
+	 		var httpUrlHtml="<tbody>";
+	 		for ( var i = 0; i <compileIds.length; i++){
+	 			httpUrlHtml=httpUrlHtml+"<tr><td></td><td></td><td></td>"
+	 						+"<td></td><td></td><td></td><td></td>"
+	 						+"<td></td><td></td><td></td>"
+	 						+"</tr>";
+			}	
+	 		httpUrlHtml=httpUrlHtml+"</tbody>";
+	 		$("#httpUrl").append(httpUrlHtml);
+	 		for ( var i = 0; i <compileIds.length; i++){
+	 			var prefixName="httpUrlList["+i+"].";
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(0).append(
+	 					$("input[name='cfgDesc']").clone()
+	 					.attr("name",prefixName+"cfgDesc")
+	 					.removeClass("hidden")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(0).append(
+	 					$("div[name='error']").clone()
+	 					.attr("for",prefixName+"cfgDesc")
+	 					);
+	 			
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(1).append(
+	 					$("input[name='cfgKeywords']").clone()
+	 					.attr("name",prefixName+"cfgKeywords").attr("value",urls[i])
+	 					);
+	 			var url=urls[i]
+ 				if(url.length > 15){
+ 					url=url.substring(0,15)+"...";
+	 			}
+	 			//解决火狐title不能自动换行
+	 			var count = Math.floor(urls[i].length/64);
+	 			for(var j=1;j<=count;j++){
+	 				urls[i]=urls[i].substring(0,j*64-1)+"\n"+urls[i].substring(j*64-1);
+	 			}
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(1).attr("title",urls[i]);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(1)
+	 					.append(url);
+	 			
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(2).append(
+	 					$("select[name='service']").clone()
+	 					.attr("name",prefixName+"action")
+	 					.removeClass("hidden")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(2).append(
+	 					$("input[name='serviceId']").clone()
+	 					.attr("name",prefixName+"serviceId")
+	 					.attr("value","6")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(2).append(
+	 					$("input[name='cfgType']").clone()
+	 					.attr("name",prefixName+"cfgType")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(2).append(
+	 					$("input[name='cfgRegionCode']").clone()
+	 					.attr("name",prefixName+"cfgRegionCode")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(2).append(
+	 					$("input[name='serviceId']").clone()
+	 					.attr("name",prefixName+"functionId")
+	 					.attr("value","6")
+	 					);
+	 			
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(3).append(
+	 					$("select[name='doLog']").clone()
+	 					.attr("name",prefixName+"doLog")
+	 					.removeClass("hidden")
+	 					);
+	 			
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(4).append(
+	 					$("select[name='exprType']").clone()
+	 					.attr("name",prefixName+"exprType")
+	 					.removeClass("hidden")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(5).append(
+	 					$("select[name='matchMethod']").clone()
+	 					.attr("name",prefixName+"matchMethod")
+	 					.removeClass("hidden")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(6).append(
+	 					$("input[name='isHexbin']").clone()
+	 					.attr("name",prefixName+"isHexbin")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(7).append(
+	 					$("input[name='requestId']").clone()
+	 					.attr("name",prefixName+"requestId")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(7).append(
+	 					$("input[name='classify']").clone()
+	 					.attr("name",prefixName+"classify")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(7).append(
+	 					$("input[name='attribute']").clone()
+	 					.attr("name",prefixName+"attribute")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(7).append(
+	 					$("input[name='lable']").clone()
+	 					.attr("name",prefixName+"lable")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(8).append(
+	 					$("input[name='isAreaEffective']").clone()
+	 					.attr("name",prefixName+"isAreaEffective")
+	 					);
+	 			$("#httpUrl tbody tr").eq(i).find("td").eq(9).append(
+	 					$("input[name='sourceCompileId']").clone()
+	 					.attr("name",prefixName+"sourceCompileId")
+	 					.attr("value",compileIds[i])
+	 					);
+	 			
+	 			$("#httpUrl tr th").each(function(index){
+	 				if($(this).hasClass("hidden")){
+	 					$("#httpUrl tbody tr").eq(i).find("td").eq(index).addClass("hidden");
+	 				}
+	 			});
+			}
+	 		
+	 		$("select").selectpicker("refresh");
+	 		
+	 		$("select[name$='.action']").each(function(){
+	 			var action=$(this).val();
+	 			var objNamePrefix=$(this).attr("name").split("action")[0];
+	 			$(this).on("change", function() {
+	 				action=$(this).val();
+	 				if(action == 128){ //白名单
+	 					$("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#whiteUrlRegion").val());
+	 					$("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#whiteUrlRegion").attr("cfgRegionCode"));
+	 				}else{
+	 					$("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val());
+	 					$("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode"));
+	 				}
+					$("input[name='"+objNamePrefix+"serviceId']").attr("value",$(this).find("option:selected").attr("serviceId"));
+				});
+	 			if(action == 128){ //白名单
+ 					$("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#whiteUrlRegion").val());
+ 					$("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#whiteUrlRegion").attr("cfgRegionCode"));
+ 				}else{
+ 					$("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val());
+ 					$("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode"));
+ 				}
+				$("input[name='"+objNamePrefix+"serviceId']").attr("value",$(this).find("option:selected").attr("serviceId"));
+	 		});
+	 		
+	 		$("select[name$='.exprType']").each(function(){
+	 			$(this).on("change",function(){
+	 				var objNamePrefix=$(this).attr("name").split("exprType")[0];
+	 				if($(this).val() == 1 ){
+	 					if($("select[name='matchMethod']").find("option[value=1]").length > 0){
+	 						options = $("select[name='matchMethod']").find("option[value=0]");
+	 					 }else{
+	 						options = $("select[name='matchMethod']").find("option");
+	 					}
+	 				}else{
+	 					options = $("select[name='matchMethod']").find("option");
+	 				}
+	 				switchExprType(objNamePrefix,options);
+		 		}); 
+	 			var objNamePrefix=$(this).attr("name").split("exprType")[0];
+	 			if($(this).val() == 1 ){
+ 					if($("select[name='matchMethod']").find("option[value=1]").length > 0){
+ 						options = $("select[name='matchMethod']").find("option[value=0]");
+ 					 }else{
+ 						options = $("select[name='matchMethod']").find("option");
+ 					}
+ 				}else{
+ 					options = $("select[name='matchMethod']").find("option");
+ 				}
+	 			switchExprType(objNamePrefix,options);
+	 		});
+	 		
+	 	}
+    });
+	
+	
+	$("#httpUrlForm").validate(
+			{
+				errorPlacement : function(error, element) {
+						$(element).parents("td").find(
+								"div[for='"
+										+ element.attr("name")
+										+ "']").append(error);
+				},
+				submitHandler : function(form) {
+						loading('onloading...');
+						form.submit();
+						//移除顶部选中菜单
+						window.parent.$(".hor-menu").find("li[class='active']").removeClass("active");
+						//选中配置菜单
+						window.parent.$(".hor-menu").find("a[id='86']").parent("li").addClass("active");
+						/* window.parent.$(".page-container").find("ul[id='menu_152']").addClass("hide");
+						window.parent.$(".page-container").find("ul[id='menu_86']").removeClass("hide");
+						window.parent.$(".page-container").find("li[id='menu_1102']").addClass("active");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").attr("style","display:block");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").prev("a").find(".arrow").addClass("open");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").parent("li[class='nav-item']").prev("a").addClass("open").addClass("active");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").parent("li[class='nav-item']").parent("ul[class='sub-menu']").attr("style","display:block");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").parent("li[class='nav-item']").parent("ul[class='sub-menu']").prev("a").find(".arrow").addClass("open");
+						window.parent.$(".page-container").find("li[id='menu_1102']").parent("ul[class='sub-menu']").parent("li[class='nav-item']").parent("ul[class='sub-menu']").parent("li[class='nav-item']").prev("a").addClass("open").addClass("active"); */
+						window.parent.$("#menu_86").removeClass("hide");
+						window.parent.$("#menu_152").addClass("hide");
+						var left_menu_lis = window.parent.$("#menu_86").find("li");
+						if(!(left_menu_lis.hasClass("active") ||
+								left_menu_lis.hasClass("open"))) {
+							 var $li1 = window.parent.$("#menu_86").find("li:first");
+							 var $li2 = window.parent.$("#menu_86").find("li:first").find("li:first");
+							
+							 var hasSubMenu1 =  $li1.children().hasClass('sub-menu');
+							 if(hasSubMenu1) {
+								 $li1.addClass('open');
+								 $li1.find('> a > .arrow').addClass('open');
+								 $li1.find('> .sub-menu').slideDown();
+
+								 var hasSubMenu2 =  $li2.children().hasClass('sub-menu');
+								 if(hasSubMenu2) {
+									 $li2.addClass('open');
+									 $li2.find('> a > .arrow').addClass('open');
+									 $li2.find('> .sub-menu').slideDown();
+									 
+								 }
+							 }
+							 
+						}
+						window.parent.$("#menu_1102").find("a").click();
+						window.parent.$("#menu_1102").addClass("active");
+				},
+				errorContainer : "#messageBox",
+			});
+ });
+//与表达式时，只允许为子串匹配
+var switchExprType=function (objNamePrefix,options){
+	$("select[name='"+objNamePrefix+"matchMethod']").find("option").remove();
+	$("select[name='"+objNamePrefix+"matchMethod']").append(options.clone());
+	$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
+ }
+</script>
+<div class="modal fade" id="http_url_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
+	<form id="httpUrlForm" action="${ctx}/ntc/whitelist/saveHttpUrlCfgs" method="post" class="form-horizontal">
+		<div class="modal-dialog" role="document" style="width:100%;padding-left:100px;padding-right:100px;">
+			<div class="modal-content" style="width:100%;">
+				<div class="modal-header">
+					<h5 class="modal-title" id="exampleModalLabel">
+						<spring:message code="log_to_url" />
+					</h5>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<div class="alert alert-error hide">
+						<button class="close" data-dismiss="alert"></button>
+						<span></span>
+					</div>
+						<div for="error"></div>
+						<!-- http log option -->
+						<select class="hidden selectpicker select2 form-control required input-small" name="doLog">
+							<c:forEach items="${fns:getDictList('DO_LOG')}" var="doLogC">
+								<option value="${doLogC.itemCode}" 
+									<c:if test="${doLogC.itemCode eq 1}">
+									selected
+									</c:if>
+								>
+								<spring:message code="${doLogC.itemValue}"/>
+								</option>
+						</c:forEach>
+						</select>
+						<!-- http action info -->
+						<select class="hidden selectpicker select2 form-control required input-small" name="service">
+							<c:forEach items="${fns:getFunctionServiceDictList(6) }" var="service">
+									<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq service.action}">
+												<option value="${service.action}"
+														serviceId="${service.serviceId }"
+														functionId="${service.functionId }"
+														protocolId="${service.protocolId }"
+														regionCode="${service.regionCode }"
+														<c:if test="${service.action eq 1}">
+														selected
+														</c:if>
+														>
+													<spring:message code="${dict.itemValue}"/>
+												</option>
+											</c:if>
+									</c:forEach>
+							</c:forEach>
+						</select>
+						<!-- http region info -->
+						<c:forEach items="${fns:getFunctionRegionDictList(6) }" var="region">
+							<c:if test="${region.configServiceType eq 'white_url'}">
+								<input type='text' class='form-control hidden' name='whiteUrlRegion'  id='whiteUrlRegion' 
+																							value="${region.configRegionValue }"
+																							cfgRegionCode="${region.cfgRegionCode }"
+																							>
+							</c:if>
+							<c:if test="${region.configServiceType eq 'http_url'}">
+								<input type="hidden" name="cfgTypeInfo" id="region" 
+												 value="${region.configRegionValue }"
+												 configRegionValue="${region.configRegionValue }" 
+							                     configServiceType="${region.configServiceType}"
+												 configExprType="${region.configExprType }"
+												 configMatchMethod="${region.configMatchMethod }"
+												 configHex="${region.configHex }"
+												 >
+				    			<input type='text' class='form-control hidden' name='httpUrlRegion'  id='httpUrlRegion'
+				    																 value="${region.configRegionValue }"
+				    																 cfgRegionCode="${region.cfgRegionCode }">
+								<input class='form-control hidden input-small'  type='text' name="cfgDesc" value="">
+				    			<input type='text' class='form-control hidden' name='cfgKeywords' value="">
+				    			<input type='text' class='form-control hidden' name='cfgType' value="">
+				    			<input type='text' class='form-control hidden' name='functionId' value="6">
+				    			<input type='text' class='form-control hidden' name='serviceId' value="">
+				    			<input type='text' class='form-control hidden' name='requestId' value="0">
+				    			<input type='text' class='form-control hidden' name='isAreaEffective' value="0">
+				    			<input type='text' class='form-control hidden' name='sourceCompileId' value="">
+				    			<input type='text'class="hidden"  name='isHexbin' value="0">
+				    			<input type="hidden" name="classify" value="0"/>
+								<input type="hidden" name="attribute" value="0"/>
+								<input type="hidden" name="lable" value="0"/>
+				    			<select name="exprType" class="hidden selectpicker select2 form-control required input-small">
+								<c:if test="${!empty region.configExprType}">
+									<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
+										<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+											<c:if test="${exprTypeC.itemCode eq exprType}">
+												<option value="${exprTypeC.itemCode}" 
+												<c:if test="${exprTypeC.itemCode eq 0}">
+												selected
+												</c:if>
+												>
+												<spring:message code="${exprTypeC.itemValue}"/>
+												</option>
+											</c:if>
+										
+										</c:forEach> 
+									</c:forEach>
+								</c:if>
+								<c:if test="${empty region.configExprType}">
+									<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+											<c:if test="${exprTypeC.itemCode eq 0}">
+												<option value="${exprTypeC.itemCode}" 
+												selected
+												>
+												<spring:message code="${exprTypeC.itemValue}"/>
+												</option>
+											</c:if>
+										</c:forEach> 
+								</c:if>
+							</select>
+				    			<select name="matchMethod" class="hidden selectpicker select2 form-control required input-small">
+								<c:if test="${!empty region.configMatchMethod}">
+									<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+											<c:if test="${matchMethodC.itemCode eq matchMethod}">
+												<option value="${matchMethodC.itemCode}" 
+												<c:if test="${matchMethod eq 0}">
+												selected
+												</c:if>
+												>
+												<spring:message code="${matchMethodC.itemValue}"/>
+												</option>
+											</c:if>
+										
+										</c:forEach> 
+									</c:forEach>
+								</c:if>
+								<c:if test="${empty region.configMatchMethod}">
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+											<c:if test="${matchMethodC.itemCode eq 0}">
+												<option value="${matchMethodC.itemCode}" 
+												selected
+												>
+												<spring:message code="${matchMethodC.itemValue}"/>
+												</option>
+											</c:if>
+										</c:forEach> 
+								</c:if>
+							</select>
+								
+							</c:if>
+						</c:forEach>
+						<div style="overflow-x:auto;overflow-y:auto;margin:10px;max-height:450px;min-height:200px" >
+							<table id="httpUrl" class="table table-striped table-bordered table-condensed text-nowrap">
+								<thead>
+									<tr>
+										<th class="config_describe"><spring:message code="config_describe"/></th>
+										<th class="cfg_keywords"><spring:message code="url"/></th>
+										<th calss="block_type"><spring:message code="block_type"/></th>
+										<th calss="do_log"><spring:message code="do_log"/></th>
+										<th calss="expression_type"><spring:message code="expression_type"/></th>
+										<th calss="match_method"><spring:message code="match_method"/></th>
+										<th class="whether_hexbinary hidden"><spring:message code="whether_hexbinary"/></th>
+										<th class="request_id hidden"><spring:message code="request_id"/></th>
+										<th class="is_area_effective hidden"><spring:message code="is_area_effective"/></th>
+										<th class="source_compile_id hidden"><spring:message code="source_compile_id"/></th>
+									</tr>
+								</thead>
+							</table>
+						</div>
+				</div>
+				<div class="modal-footer">
+					<button type="submit" class="btn red">
+						<spring:message code="ok" />
+					</button>
+					<button type="button" class="btn" data-dismiss="modal">
+						<spring:message code="close" />
+					</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -212,7 +212,8 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					var requestName =requestNameArr[1];
 					
 					if(requestName.indexOf("null")==-1&&typeof(indexTableName)!="undefined"&&indexTableName!=null&&indexTableName!=''&&indexTableName.indexOf("null")==-1){
-					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 400, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
+						/******************************************  */
+					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>",500, 400, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
 						submit: function (v, h, f) {
 				    if (v == 0) {
 				        return true; // close the window
@@ -254,6 +255,12 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 									$(".jbox-content,top.document").css("width","90%")
 								}
 						}); 
+					
+					
+					
+					
+					
+					/******************************************  */
 						}else{
 							// 防止有来函无表名的取消审核操作
 							top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
--- a/src/main/webapp/WEB-INF/tlds/fns.tld
+++ b/src/main/webapp/WEB-INF/tlds/fns.tld
@@ -211,6 +211,20 @@
    <function-signature>java.util.List getDictList(java.lang.String)</function-signature>
    <example>${fns:getDictList(key)}</example>  
  </function>
+ <function>
+    <description>获取functionId下的service列表</description>
+    <name>getFunctionServiceDictList</name>
+    <function-class>com.nis.util.DictUtils</function-class>
+    <function-signature>java.util.List getFunctionServiceDictList(java.lang.Integer)</function-signature>
+    <example>${fns:getFunctionServiceDictList(key)}</example>  
+  </function>
+ <function>
+    <description>获取functionId下的region列表</description>
+    <name>getFunctionRegionDictList</name>
+    <function-class>com.nis.util.DictUtils</function-class>
+    <function-signature>java.util.List getFunctionRegionDictList(java.lang.Integer)</function-signature>
+    <example>${fns:getFunctionRegionDictList(key)}</example>  
+  </function>
  
   <function>
    <description>获取字典Map列表</description>
@@ -369,5 +383,13 @@
    <function-signature>java.util.List getCodeList(java.lang.String)</function-signature>
    <example>${fns:getCodeList(str)}</example>
  </function>
+  <!-- 根据id获取配置关键字 -->
+    <function>
+    <description>根据compileId获取关键字</description>
+    <name>getHttpBodyKeyword</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.lang.String getHttpBodyKeyword(java.lang.Integer)</function-signature>
+    <example>${fns:getHttpBodyKeyword(compileId)}</example>
+  </function>
  
 </taglib>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -292,8 +292,9 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -408,11 +409,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -421,6 +417,12 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -294,8 +294,8 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -416,11 +416,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -429,6 +424,11 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -298,8 +298,8 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -406,11 +406,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -419,6 +414,11 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
@@ -332,8 +332,8 @@
 									<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
+								    <th><spring:message code="is_audit"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -354,11 +354,6 @@
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
 								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
@@ -366,6 +361,11 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -357,19 +357,19 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
-								    <th><spring:message code="social_app"/></th>
-								    <th><spring:message code="behaviour_type"/></th>
 <%-- 								    <th><spring:message code="ratelimit"/></th>
 --%>								<th class="sort-column r.action"><spring:message code="block_type"/></th>
+ 									<th><spring:message code="social_app"/></th>
+								    <th><spring:message code="behaviour_type"/></th>
+								    <th><spring:message code="is_audit"/></th>
+								    <th><spring:message code="do_log"/></th>
+								    <th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="do_log"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -387,16 +387,34 @@
 									</td>
 									<td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
-								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
-								<%--     <td>${cfg.ratelimit }</td> --%>
-									<td>
+								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
 									</td>
+								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
+								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
+								<%--     <td>${cfg.ratelimit }</td> --%>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}">
+											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when>
+										</c:choose>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
@@ -464,29 +482,12 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
+									
 								    <td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}">
-											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when>
-										</c:choose>
-									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -293,8 +293,8 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -415,11 +415,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -428,6 +423,11 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -291,8 +291,8 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -425,11 +425,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -438,6 +433,11 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+								    <td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -146,7 +146,7 @@
 		<h3 class="page-title">
 			<spring:message code="${_cfg.menuNameCode }"></spring:message>
 		</h3>
-		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="protocol_note"></spring:message></span>
+		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="av_protocol_note"></spring:message></span>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -364,15 +364,15 @@
 								    <th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -397,6 +397,16 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}">
+											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -404,6 +414,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -475,17 +486,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}">
-											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -153,8 +153,15 @@ $(function(){
 				}
 			}
 			loading('onloading...');
-			form.submit();
-			
+			//如果是新增配置，则校验是否配置量已达上限
+			var flag = true;
+			if($("input[name='cfgId']").val()==""){
+				var serviceId = $("#serviceId").val();
+				flag = validateEffectiveRuleLimit("${ctx}",serviceId);
+			}
+			if(flag){
+				form.submit();
+			}
 		},
 		errorContainer: "#messageBox",
 		errorPlacement: function(error,element){
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -285,18 +285,18 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
+									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="src_file"/></th>
 									<th><spring:message code="sample_file"/></th>
-									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="harm_level"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -312,6 +312,13 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
 									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<a href="${cfg.srcUrl }" data-original-title="${cfg.srcUrl }" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -324,15 +331,22 @@
 											${fn:substring(cfg.sampleUrl,0,20) }
 										</a>	
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
+									
 									<td>${cfg.level }</td>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}">
+											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when></c:choose>
+									</td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									
+									
 									<td>${cfg.requestName }</td>
+									
 									<td>
 									<c:set var="classify"></c:set>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
@@ -397,16 +411,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}">
-											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when></c:choose>
-									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -364,15 +364,15 @@
 								    <th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -397,6 +397,15 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}">
+											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when></c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -404,6 +413,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -475,16 +485,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}">
-											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when></c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -362,19 +362,19 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
-								    <th><spring:message code="basic_protocol"/></th>
 								    <%-- <th><spring:message code="behaviour_type"/></th> --%>
 								   <%--  <th><spring:message code="ratelimit"/></th> --%>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="basic_protocol"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -392,16 +392,26 @@
 									</td>
 								    <td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
-								    <%--<td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>--%>
-								   <%--  <td>${cfg.ratelimit }</td> --%>
-									<td>
+								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
 									</td>
+								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
+								    <%--<td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>--%>
+								   <%--  <td>${cfg.ratelimit }</td> --%>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}">
+											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when></c:choose>
+									</td>
+									
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.doLog }">
@@ -409,6 +419,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
@@ -481,16 +492,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}">
-											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when></c:choose>
-									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -297,6 +297,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<%-- <th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th> --%>
@@ -306,18 +307,19 @@
 									<th><spring:message code="port_pattern"/></th>
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
-									<th><spring:message code="whether_area_block"/></th>
+									
+									
 									<th><spring:message code="antiddos_protocol"/></th>
 									<th><spring:message code="bps_threadshold"/></th>
 									<th><spring:message code="pps_threadshold"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
+									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 								<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -333,6 +335,13 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
 									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</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>
@@ -362,13 +371,18 @@
 											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
+									<td>${cfg.antiddosProtocol }</td>
+									<td>${cfg.bpsThreadshold }</td>
+									<td>${cfg.ppsThreadshold }</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
+									
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
@@ -377,9 +391,6 @@
 												</a>
 										</c:if>
 									</td>
-									<td>${cfg.antiddosProtocol }</td>
-									<td>${cfg.bpsThreadshold }</td>
-									<td>${cfg.ppsThreadshold }</td>
 									<td>${cfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>
@@ -444,14 +455,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -292,19 +292,19 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									 <th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></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="ip_pattern"/></th>
 									<%-- <th><spring:message code="port_pattern"/></th> --%>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -321,6 +321,13 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
 									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>${cfg.dnsStrategyName }
 										<c:if test="${empty cfg.dnsStrategyName}">
 											<spring:message code="default_group"/>
@@ -344,11 +351,12 @@
 				               			</c:forEach>
 									</td> --%>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<td>${cfg.requestName }</td>
 									<td >
@@ -414,14 +422,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -359,19 +359,19 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
+								    <th class="sort-column r.action"><spring:message code="block_type"/></th>
 								    <th><spring:message code="encrypted_tunnel_behavior"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
 								   <%--  <th><spring:message code="ratelimit"/></th> --%>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+								   <th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -389,16 +389,24 @@
 									</td>
 									<td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
-								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
-								   <%--  <td>${cfg.ratelimit }</td> --%>
-									<td>
+								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
 									</td>
+								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
+								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
+								    <td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
+								   <%--  <td>${cfg.ratelimit }</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.doLog }">
@@ -406,6 +414,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
@@ -478,15 +487,7 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -323,11 +323,12 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
+								    <th class="sort-column a.action"><spring:message code="block_type"/></th>
 								    <th><spring:message code="digest"/></th>
 								    <th><spring:message code="raw_len"/></th>
 								    <th><spring:message code="harm_level"/></th>
 								    <th><spring:message code="file_url"/></th>
-									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -335,7 +336,7 @@
 									<th><spring:message code="label"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
+									
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -354,6 +355,13 @@
 									</td>
 									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
+								    <td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 								    <td>
 								    	<a href="javascript:;" data-original-title="${indexCfg.digest}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -369,11 +377,12 @@
 										</a>
 								    </td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
@@ -454,14 +463,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -332,15 +332,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -365,6 +365,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -372,6 +380,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -444,15 +453,7 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -337,15 +337,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 								    <th class="sort-column a.action"><spring:message code="block_type"/></th>
+								    <th><spring:message code="is_audit"/></th>
 								    <th><spring:message code="do_log"/></th>
+								    <th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid" ><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -370,6 +370,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -377,6 +385,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -449,15 +458,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -349,8 +349,8 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
-							    	
-							    	<c:if test="${cfg.functionId ne 212 }">
+									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<c:if test="${cfg.functionId ne 212 }">
 							    		<th><spring:message code="ratelimit"/></th>
 							    		<%-- <th><spring:message code="bandwith"/></th> --%>
 							    		<th><spring:message code="certificate"/></th>
@@ -363,7 +363,7 @@
 							    	<c:if test="${cfg.functionId eq 201 }">
 							    		<th><spring:message code="intercept_intensity"/></th>
 							    	</c:if>
-									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+							    	<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -371,7 +371,6 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -390,7 +389,15 @@
 									</td>
 									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
-								    <c:if test="${cfg.functionId ne 212 }">
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									
+									 <c:if test="${cfg.functionId ne 212 }">
 								    <td>
 								    	<c:if test="${indexCfg.action eq 64}">
 								    		<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
@@ -437,12 +444,13 @@
 											</c:forEach>
 										</td>
 							    	</c:if>
-									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+							    	<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -523,14 +531,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -341,15 +341,15 @@
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="ratelimit"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -381,6 +381,16 @@
 												</c:if>
 											</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}">
+											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
+											</c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -388,6 +398,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -460,17 +471,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}">
-											<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
-											</c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
@@ -233,7 +233,7 @@
 			<div class="row">
 				<div class="col-md-4">
 					<div class="form-group">
-						<label><spring:message code='asn_id'/>:</label>
+						<label><spring:message code='asn_no'/>:</label>
 						<label>
 							${_cfg.userRegion5}
 						</label>
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -343,15 +343,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -376,6 +376,15 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
+									
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -383,6 +392,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -455,15 +465,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -278,10 +278,11 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th class="sort-column r.cfg_id"><spring:message code="policy_number"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="policy_name"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="group"/></th>
 			 						<th><spring:message code="res_group_num"/></th>
 									<th><spring:message code="min_ttl"/></th>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -311,6 +312,13 @@
 											${fns:abbr(cfg.cfgDesc,20)}
 										</a>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.group1Name}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -319,13 +327,7 @@
 									</td>
 									<td>${cfg.resGroup1Num }</td>
 									<td>${cfg.minTtl }-${cfg.maxTtl }</td>
-									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
+									
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -276,6 +276,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="group"/></th>
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
@@ -283,13 +284,12 @@
 									<th><spring:message code="direction"/></th> 
 									<%-- <th><spring:message code="location"/></th>
 									<th><spring:message code="ip_type"/></th> --%>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -310,6 +310,13 @@
 											${fns:abbr(cfg.cfgDesc,20)}
 										</a>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.groupName}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -339,11 +346,12 @@
 										</c:forEach>
 									</td> --%>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<td>${cfg.requestName }</td>
 									<td >
@@ -409,14 +417,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
@@ -278,6 +278,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="group"/></th>
 									<th><spring:message code="isp"/></th>
 									<th><spring:message code="server_ip"/></th>
@@ -286,7 +287,7 @@
 									<th><spring:message code="direction"/></th> --%>
 								<%-- 	<th><spring:message code="location"/></th>
 									<th><spring:message code="ip_type"/></th> --%>
-									<th class="sort-column r.action"><spring:message code="block_type"/></th>
+									
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -313,6 +314,13 @@
 											${fns:abbr(cfg.cfgDesc,20)}
 										</a>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.groupName}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -352,13 +360,6 @@
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
 										</c:forEach>
 									</td> --%>
-									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
@@ -279,6 +279,7 @@
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="protocol"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -286,7 +287,6 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -340,6 +340,14 @@
 												</a>
 										</c:if>
 									</td> --%>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
@@ -404,14 +412,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
@@ -277,6 +277,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="group"/></th>
 									<th><spring:message code="client_ip"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -284,7 +285,7 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
+									
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -334,6 +335,14 @@
 												</a>
 										</c:if>
 									</td> --%>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
@@ -398,14 +407,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -344,15 +344,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -377,6 +377,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 									<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -384,6 +392,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -456,15 +465,7 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -531,19 +531,19 @@
 										<th><spring:message code="replaced_content"/></th>
 										<th><spring:message code="replace_content"/></th>
 									</c:if>
+									<th><spring:message code="is_audit"/></th>
 									<c:if test="${action ne 128}">
 										<th><spring:message code="do_log"/></th>
 									</c:if>
+									<c:if test="${action ne 128}">
+										<th><spring:message code="log_total"/></th>
+									</c:if>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<c:if test="${action ne 128}">
-										<th><spring:message code="log_total"/></th>
-									</c:if>
 									
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -622,6 +622,15 @@
 										<td title="${indexCfg.userRegion2 }">${fns:abbr(indexCfg.userRegion2,20)}</td>
 										<td title="${indexCfg.userRegion3 }">${fns:abbr(indexCfg.userRegion3,20)}</td>
 									</c:if>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
+									
 									<c:if test="${action ne 128}">
 										<td>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -631,6 +640,9 @@
 											</c:forEach>
 										</td>
 									</c:if>
+									<c:if test="${action ne 128}">
+										<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									</c:if>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -703,17 +715,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<c:if test="${action ne 128}">
-										<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
-									</c:if>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -341,17 +341,17 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
+								    <th class="sort-column a.action"><spring:message code="block_type"/></th>
 								    <th><spring:message code="policy_name"/></th>
-									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -369,17 +369,25 @@
 									</td>
 									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
+								    <td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 								    <td>${indexCfg.dnsStrategyName }
 								    	<c:if test="${empty indexCfg.dnsStrategyName && indexCfg.action==16}">
 											<spring:message code="no_strategy"/>
 										</c:if>
 								    </td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -388,6 +396,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -460,15 +469,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -38,6 +38,7 @@
 								"disabled");
 							}
 						}else{
+							$(".glyphicon-plus").first().click();
 							$(".httpResCfg").addClass("hidden").addClass("disabled");
 							$(".httpReqCfg").removeClass("hidden").removeClass(
 							"disabled");
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -324,15 +324,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -357,6 +357,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -364,6 +372,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -436,15 +445,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -148,6 +148,8 @@
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
+							<input type="hidden" id="sourceCompileId" name="sourceCompileId"
+															value="${_cfg.sourceCompileId}">
 							<div class="form-body">
 								<div class="row">
 									<div class="col-md-6">
@@ -247,6 +249,7 @@
 																	<c:forEach items="${_cfg.httpUrlList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
+																		<input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }">
 																		<div class="row boxSolid ${tabName}${status.index}" >
 																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -330,8 +330,9 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
+									
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -431,11 +432,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-								    <td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 									<td>
 										<c:choose>
 											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -444,6 +440,11 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -20,6 +20,7 @@
 			.attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		
 		//筛选功能
 		filterActionInit();
 	});
--- a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
@@ -0,0 +1,149 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>配置审计日志</title>
+<script type="text/javascript">
+	function page(n, s) {
+		$("#pageNo").val(n);
+		$("#pageSize").val(s);
+		$("#searchForm").submit();
+		return false;
+	}
+</script>
+</head>
+<body>
+	 	<%-- <ul class="nav nav-tabs"> 
+	 		<li class="active"><a href="${ctx}/sys/log/">日志列表</a></li> 
+	 	</ul>  --%>
+	<div class="page-content">
+		<h3 class="page-title">
+			<spring:message code="cfg_operation_log"></spring:message>
+		</h3>
+		<h5 class="page-header"></h5>
+		<div class="row">
+			<div class="col-md-12">
+				<div class="portlet">
+					<div class="portlet-body">
+						<div class="row">
+							<form:form id="searchForm" action="${ctx}/sys/log/cfgOperationLogList" method="post"
+								class="breadcrumb form-search" style="background-color:#fff">
+								<input id="pageNo" name="pageNo" type="hidden"
+									value="${page.pageNo}" />
+								<input id="pageSize" name="pageSize" type="hidden"
+									value="${page.pageSize}" />
+								<div class="col-md-12 ">
+									<div class="pull-left">
+										<label><spring:message code="function_name" />：</label> 
+										<select name="functionName" class="selectpicker  select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+											<option value=""><spring:message code="select"></spring:message></option>
+											<c:forEach items="${fns:getDictList('SYS_SERVICE_FUNCTION')}"  var="dict">
+												<option value="${dict.itemValue }" <c:if test="${sysLog.functionName eq dict.itemValue}">selected</c:if>>
+													<spring:message code="${dict.itemValue }"></spring:message>
+												</option>
+											</c:forEach>
+										</select>
+									</div>
+									<div class="pull-left">
+										<label><spring:message code="user" />：</label> <input
+											id="createBy" name="createBy" type="text" maxlength="50"
+											class="form-control" value="${sysLog.createBy}" />
+									</div>
+									<div class="pull-left">
+										<label><spring:message code="operation" />：</label> 
+										<select name="operation" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+											<option value=""><spring:message code="select"></spring:message></option>
+											<option value="query" <c:if test="${sysLog.operation eq 'query'}">selected</c:if>><spring:message code="query"></spring:message></option>
+											<option value="add" <c:if test="${sysLog.operation eq 'add'}">selected</c:if>><spring:message code="add"></spring:message></option>
+											<option value="edit" <c:if test="${sysLog.operation eq 'edit'}">selected</c:if>><spring:message code="edit"></spring:message></option>
+											<option value="delete" <c:if test="${sysLog.operation eq 'delete'}">selected</c:if>><spring:message code="delete"></spring:message></option>
+											<option value="examine" <c:if test="${sysLog.operation eq 'examine'}">selected</c:if>><spring:message code="examine"></spring:message></option>
+										</select>
+									</div>
+									<div class="pull-left">
+										<label><spring:message code="log_date" />：</label> <input
+											id="beginDate" name="beginDate" type="text"
+											readonly="readonly" maxlength="20"
+											class="form-control Wdate"
+											value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd"/>"
+											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+									</div>
+									<div class="pull-left">
+										<label><spring:message code="" />&nbsp;</label> <input
+											id="endDate" name="endDate" type="text" readonly="readonly"
+											maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd"/>"
+											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+									</div>
+									<div class="pull-left">
+										<label>&nbsp;</label>
+										<%-- <label for="exception"><input id="exception"
+											name="exception" type="checkbox"
+											${sysLog.exception eq '1'?' checked':''} value="1" /><spring:message code="log_exception" /></label> --%>
+										<button type="submit" class="btn blue form-control"><i class="fa fa-search"></i><spring:message code="search" /></button>
+									</div>
+								</div>
+							</form:form>
+						</div>
+						<sys:message content="${message}" />
+						<div class="table-responsive">
+							<table  id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+								<thead>
+									<tr>
+										<th><spring:message code="function_name" /></th>										
+										<th><spring:message code="opearation" /></th>
+										<th><spring:message code="log_submission" /></th>
+										<th><spring:message code="log_ip" /></th>
+										<th><spring:message code="log_user" /></th>
+										<th><spring:message code="operate_time" /></th>
+								</thead>
+								<tbody>
+									<%
+										request.setAttribute("strEnter", "\n");
+										request.setAttribute("strTab", "\t");
+									%>
+									<c:forEach items="${page.list}" var="log">
+										<tr>
+											<td><spring:message code="${log.functionName}"></spring:message></td>											
+											<td><strong>
+												<spring:message code="${log.operation}"></spring:message>
+												<c:if test="${not empty log.auditState }">
+													-
+													<c:choose>
+														<c:when test="${log.auditState eq '0'}"><spring:message code="created"></spring:message></c:when>
+														<c:when test="${log.auditState eq '1'}"><spring:message code="approved"></spring:message></c:when>
+														<c:when test="${log.auditState eq '2'}"><spring:message code="unapproved"></spring:message></c:when>
+														<c:when test="${log.auditState eq '3'}"><spring:message code="cancel_approved"/></c:when>
+													</c:choose>
+												</c:if>	
+											</strong></td>
+											<td>
+												${log.method}												
+											</td>
+											<td>${log.remoteAddr}</td>
+											<td>${log.createBy}</td>
+											<td><fmt:formatDate value="${log.createDate}"
+													type="both" /></td>
+										</tr>
+										<c:if test="${not empty log.exception}">
+											<tr>
+												<td colspan="8"
+													style="word-wrap: break-word; word-break: break-all;">
+													<%-- 					用户代理: ${log.userAgent}<br/> --%> <%-- 					提交参数: ${fns:escapeHtml(log.params)} <br/> --%>
+													<spring:message code="log_exception_info" />：<br />
+													${fn:replace(fn:replace(fns:escapeHtml(log.exception), strEnter, '<br/>'), strTab, '&nbsp; &nbsp; ')}
+												</td>
+											</tr>
+										</c:if>
+									</c:forEach>
+								</tbody>
+							</table>
+							<div class="page">${page}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/views/sys/logList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/logList.jsp
@@ -26,73 +26,56 @@
 				<div class="portlet">
 					<div class="portlet-body">
 						<div class="row">
-							<form:form id="searchForm" action="${ctx}/sys/log" method="post"
-								class="breadcrumb form-search" style="background-color:#fff">
+							<form:form id="searchForm" action="${ctx}/sys/log" method="post" class="breadcrumb form-search" style="background-color:#fff" >
 								<input id="pageNo" name="pageNo" type="hidden"
 									value="${page.pageNo}" />
 								<input id="pageSize" name="pageSize" type="hidden"
 									value="${page.pageSize}" />
-								<div class="col-md-12 filter-action-select-panle"
-									style="background-color: transparent">
-									<div class="row">
-										<div class="col-md-2">
-											<div class="form-group">
+								<div class="col-md-12" >
+											<div class="pull-left">
 												<label><spring:message code="log_menu" />：</label> <input
 													id="title" name="title" type="text" maxlength="50"
 													class="form-control" value="${sysLog.title}" />
 											</div>
-										</div>

-										<div class="col-md-2">
-											<div class="form-group">
+											<div class="pull-left">
 												<label><spring:message code="user" />：</label> <input
 													id="createBy" name="createBy" type="text" maxlength="50"
 													class="form-control" value="${sysLog.createBy}" />
 											</div>
-										</div>
-										<div class="col-md-2">
-											<div class="form-group">
+											<div class="pull-left">
 												<label><spring:message code="URL" />：</label> <input
 													id="requestUri" name="requestUri" type="text"
 													maxlength="50" class="form-control"
 													value="${sysLog.requestUri}" />
-											</div>
 										</div>
-										<div class="col-md-2">
-											<div class="form-group">
+											<div class="pull-left">
 												<label><spring:message code="log_date" />：</label> <input
 													id="beginDate" name="beginDate" type="text"
 													readonly="readonly" maxlength="20"
 													class="form-control Wdate"
 													value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd"/>"
 													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
-											</div>
 										</div>
-										<div class="col-md-2">
-											<div class="form-group">
+											<div class="pull-left">
 												<label><spring:message code="" />&nbsp;</label> <input
 													id="endDate" name="endDate" type="text" readonly="readonly"
 													maxlength="20" class="form-control Wdate"
 													value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd"/>"
 													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
 											</div>
-										</div>
-										<div class="col-md-1">
-											<div class="form-group">
-												<label for="exception"><input id="exception"
-													name="exception" type="checkbox"
-													${sysLog.exception eq '1'?' checked':''} value="1" /><spring:message code="log_exception" /></label>
+											<div class="pull-left">
+												<label for="exception"><input id="exception" name="exception" type="checkbox" ${sysLog.exception eq '1'?' checked':''} value="1" /><spring:message code="log_exception" /></label>
 												<button type="submit" class="btn blue form-control"><i class="fa fa-search"></i><spring:message code="search" /></button>
-											</div>
 										</div>
-									</div>
+
+										
 								</div>
 							</form:form>
 						</div>
 						<sys:message content="${message}" />
 						<div class="table-responsive">
-							<table id="contentTable1"
-								class="table table-striped table-bordered table-condensed">
+							<table  id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 								<thead>
 									<tr>
 										<th><spring:message code="log_menu" /></th>
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -341,7 +341,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 					if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
 							||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
 							||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
-							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
+							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
 						if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
 							if((startIp.split(".")[0]!=endIp.split(".")[0])||
 									(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -465,7 +465,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 					if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
 							||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
 							||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
-							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
+							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
 						if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
 							if((startIp.split(".")[0]!=endIp.split(".")[0])||
 									(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -636,7 +636,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 					if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
 							||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
 							||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
-							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
+							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
 						if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
 							if((startIp.split(".")[0]!=endIp.split(".")[0])||
 									(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -692,7 +692,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 					if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
 							||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
 							||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
-							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
+							||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
 						if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
 							if((startIp.split(".")[0]!=endIp.split(".")[0])||
 									(startIp.split(".")[1]!=endIp.split(".")[1])||
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -74,7 +74,7 @@
 		log_1_hour:"Log For The Last Hour",
 		input:"Please Enter  ",
 		protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
-		protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit",
+		protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
 		netAddress:"The class C type of IP addresses must has the same network number bit field",
 		ipUnique:"IP already exists.",
 		asnNoUnique:"ASN already exists."
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -74,7 +74,7 @@
 		log_1_hour:"Log For The Last Hour",
 		input:"Please Enter  ",
 		protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
-		protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit",
+		protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
 		netAddress:"C类IP地址网络位必须相同",
 		ipUnique:"IP already exists."
 	});
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -74,7 +74,7 @@
 		log_1_hour:"1小时日志量",
 		input:"请输入 ",
 		protocolPort:"端口大于0时必须选择TCP协议或者UDP协议",
-		protocolPort1:"只有tcp,udp协议端口号可以不为0,全部协议无限制",
+		protocolPort1:"只有tcp,udp协议端口号可以不为0",
 		netAddress:"C类IP地址网络位必须相同",
 		ipUnique:"IP已存在",
 		asnNoUnique:"ASN号已存在",