From ef5e737bd49020dae602dcaa5498fb93b95cf858 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 12 Sep 2018 13:20:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=EF=BC=8CAPP=E5=8D=8F=E8=AE=AE=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E4=B8=9A=E5=8A=A1=EF=BC=8Cip=E5=9F=9F?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties        | 3 ++-
 src/main/resources/messages/message_ru.properties        | 3 ++-
 src/main/resources/messages/message_zh_CN.properties     | 3 ++-
 .../webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp    | 9 ++++++++-
 src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp | 9 ++++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 4877442a2..ff7a35546 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1145,4 +1145,5 @@ dest_country=Dest IP Country
 MM_SPEAKER_RECOGNIZATION=Speaker Recognization
 MM_LOGO_DETECTION=Logo Detection
 MM_FACE_RECOGNIZATION=Face Recognization
-preset=Preset
\ No newline at end of file
+preset=Preset
+ip_must_select=IP Configuration must select
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 2c5d44e22..c67825cec 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1136,4 +1136,5 @@ dest_country=\u0421\u0442\u0440\u0430\u043D\u0430 \u0446\u0435\u043B\u0435\u0432
 MM_SPEAKER_RECOGNIZATION=Speaker Recognization
 MM_LOGO_DETECTION=Logo Detection
 MM_FACE_RECOGNIZATION=Face Recognization
-preset=Preset
\ No newline at end of file
+preset=Preset
+ip_must_select=IP配置必选
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 29181b949..900df1bd7 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1143,4 +1143,5 @@ dest_country=\u76EE\u7684IP\u6240\u5C5E\u56FD\u5BB6
 MM_SPEAKER_RECOGNIZATION=\u8BF4\u8BDD\u4EBA\u8BC6\u522B
 MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B
 MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B
-preset=\u9884\u7F6E
\ No newline at end of file
+preset=\u9884\u7F6E
+ip_must_select=IP\u914D\u7F6E\u5FC5\u9009
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 24dfd8847..b8005a74b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -18,6 +18,9 @@ $(function(){
 		}else{
 			$(".subscribeId").hide();
 		}
+		if($(this).val()==1){
+			$(".ipPortAdd").click();
+		}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -46,6 +49,10 @@ $(function(){
 				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 				return;
 			} */
+			if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){
+				 top.$.jBox.tip("<spring:message code='ip_must_select'/>", "<spring:message code='info'/>");
+				 return false;
+			}
 			$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
 					$(this).parents(".form-group").find(
@@ -330,7 +337,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<spring:message code="NTC_UNIVERSAL_IP" />
 										<small> <span
-														class="glyphicon glyphicon-plus  ${tabName}Add"
+														class="glyphicon glyphicon-plus  ${tabName}Add ipPortAdd"
 														onClick="addContent(this,'${tabName}')" title="add"></span></small>
 									</h4>
 									<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 74bf2b1ae..984d5978e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -24,6 +24,9 @@ $(function(){
 		}else{
 			$("#ratelimit").hide();
 		}
+		if($(this).val()==1){
+			$(".ipPortAdd").click();
+		}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -51,6 +54,10 @@ $(function(){
 			}
 			 */
 			 var flag = true;
+			 if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){
+				 top.$.jBox.tip("<spring:message code='ip_must_select'/>", "<spring:message code='info'/>");
+				 return false;
+			 }
 			 $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 					
 					if($(this).val()==''){
@@ -299,7 +306,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<spring:message code="NTC_UNIVERSAL_IP" />
 										<small> <span
-														class="glyphicon glyphicon-plus  ${tabName}Add"
+														class="glyphicon glyphicon-plus  ${tabName}Add ipPortAdd"
 														onClick="addContent(this,'${tabName}')" title="add"></span></small>
 									</h4>
 									<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>

From b0f0aac6f038497fdf18aafd2c40fbadbd04bf7f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 12 Sep 2018 14:14:20 +0800
Subject: [PATCH 2/7] =?UTF-8?q?IP=E9=AA=8C=E8=AF=81v4=E5=92=8Cv6=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A9=E7=A0=81=E6=8E=92=E9=99=A40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jquery-validation/1.11.0/jquery.validate.method.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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
index 0966d22b3..c78c5bb7d 100644
--- 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
@@ -212,8 +212,8 @@ jQuery.validator.addMethod("httpCheck",function(value, element) {
 
 //ip地址校验
 jQuery.validator.addMethod("ipCheck",function(value, element) {
-	var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|[1-2][0-9]|[0-9])$/;
-	var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(0|2|4|8|16|32|64|128)$/;
+	var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|[1-2][0-9]|[1-9])$/;
+	var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(2|4|8|16|32|64|128)$/;
 	var ipv4_ip_range_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)-(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;
 	var ipv6_ip_range_regexp= /^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))$/;
 	var ipv4_ip_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;

From 04b3d4dc62e9208cba81e3caaa63bfd81b703b66 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 12 Sep 2018 15:45:18 +0800
Subject: [PATCH 3/7] =?UTF-8?q?IPv4=E6=8E=A9=E7=A0=8116~32=EF=BC=8CIPv6?=
 =?UTF-8?q?=E6=8E=A9=E7=A0=81128?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1.11.0/jquery.validate.method.js                | 13 ++++++++-----
 .../1.11.0/localization/messages_en.js              |  6 ++++--
 .../1.11.0/localization/messages_ru.js              |  6 ++++--
 .../1.11.0/localization/messages_zh.js              |  6 ++++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git 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
index c78c5bb7d..a3c1ffc67 100644
--- 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
@@ -212,8 +212,8 @@ jQuery.validator.addMethod("httpCheck",function(value, element) {
 
 //ip地址校验
 jQuery.validator.addMethod("ipCheck",function(value, element) {
-	var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|[1-2][0-9]|[1-9])$/;
-	var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(2|4|8|16|32|64|128)$/;
+	var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|1[6-9]|2[0-9])$/;
+	var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(128)$/;
 	var ipv4_ip_range_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)-(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;
 	var ipv6_ip_range_regexp= /^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))$/;
 	var ipv4_ip_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;
@@ -332,7 +332,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 					if(!ipv6_ip_regexp.test(ipMaskArr[0])){
 						$.validator.messages.ipCheck=$.validator.messages.ipPart;
 						return false;
-					}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+					//}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+					}else if(!/^(128)$/.test(ipMaskArr[1])){
 						$.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart;
 						return false;
 					} else{
@@ -446,7 +447,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 						if(!ipv6_ip_regexp.test(ipMaskArr[0])){
 							$.validator.messages.ipCheck=$.validator.messages.ipPart;
 							return false;
-						}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+						//}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+						}else if(!/^(128)$/.test(ipMaskArr[1])){
 							$.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart;
 							return false;
 						} else{
@@ -503,7 +505,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
 						if(!ipv6_ip_regexp.test(ipMaskArr[0])){
 							$.validator.messages.ipCheck=$.validator.messages.ipPart;
 							return false;
-						}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+						//}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){
+						}else if(!/^(128)$/.test(ipMaskArr[1])){
 							$.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart;
 							return false;
 						} else{
diff --git 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
index 04cd92a2a..1f13c57bb 100644
--- 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
@@ -26,8 +26,10 @@
 		ipCheck:"Please enter a correct IP address",
 		ipMask:"Please enter a correct IP/mask",
 		ipPart:"Invalid IP part",
-		ipv6MaskPart:"Mask must be exponent of 2,not greater than 128",
-		ipMaskRange:"IP mask must between 0 and 32",
+		//ipv6MaskPart:"Mask must be exponent of 2,not greater than 128",
+		ipv6MaskPart:"Mask must be 128",
+		//ipMaskRange:"IP mask must between 0 and 32",
+		ipMaskRange:"IP mask must between 16 and 32",
 		srcIpNotEqDestIp:"Sourse IP ",
 		destIpNotEqDestIp:" and destination IP ",
 		IpNotEqDestIp:" can't be the same",
diff --git 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
index 2386c0de0..6cf457893 100644
--- 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
@@ -26,8 +26,10 @@
 		ipCheck:"Заполните правильный IP-адрес",
 		ipMask:"Заполните правильный IP-адрес / маска",
 		ipPart:"Ошибка формата части IP",
-		ipv6MaskPart:"Mаска-показатель степени 2, небольше 128",
-		ipMaskRange:"Маска IP между 0 и 32",
+		//ipv6MaskPart:"Mаска-показатель степени 2, небольше 128",
+		ipv6MaskPart:"掩码必须为128",
+		//ipMaskRange:"Маска IP между 0 и 32",
+		ipMaskRange:"Маска IP между 16 и 32",
 		srcIpNotEqDestIp:"IP-адрес источника ",
 		destIpNotEqDestIp:" с IP-адресом назначения",
 		IpNotEqDestIp:" не может быть одинаковым",
diff --git 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
index 1706c6575..73e14be06 100644
--- 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
@@ -26,8 +26,10 @@
 		ipCheck:"请填写正确的IP地址",
 		ipMask:"请填写正确的IP地址/掩码",
 		ipPart:"IP部分格式错误",
-		ipv6MaskPart:"掩码为不大于128的2的指数幂",
-		ipMaskRange:"IP掩码介于0到32",
+		//ipv6MaskPart:"掩码为不大于128的2的指数幂",
+		ipv6MaskPart:"掩码必须为128",
+		//ipMaskRange:"IP掩码介于0到32",
+		ipMaskRange:"IP掩码介于16到32",
 		srcIpNotEqDestIp:"源IP ",
 		destIpNotEqDestIp:" 与目的IP ",
 		IpNotEqDestIp:" 不能相同",

From fc8c9951c8115c44b107c95a3f76f0885f2655aa Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 12 Sep 2018 16:27:16 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=A0=B7=E4=BE=8B=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/configuration/ntc/AvController.java   | 9 ++++++---
 .../com/nis/web/service/configuration/AvCfgService.java  | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index 9bbb01534..df71e617f 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -118,7 +118,7 @@ public class AvController extends BaseController  {
 		try{
 //			if(srcFile!=null && sampleFile!=null && 
 //			   srcFile.getSize()>0 && sampleFile.getSize()>0){
-			if(srcFile!=null && srcFile.getSize()>0){
+			if(srcFile!=null && srcFile.getSize()>0 && entity!=null){
 				String sep = System.getProperty("file.separator");
 				String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径
 				String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径
@@ -159,7 +159,8 @@ public class AvController extends BaseController  {
 //				entity.setSampleMd5(sampleMd5);
 			}
 			
-			avCfgService.saveOrUpdateAvFileSample(entity);
+			avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
+			addMessage(redirectAttributes,"save_success");
 			
 		}catch(Exception e){
 			logger.error("文件上传失败",e);
@@ -178,6 +179,7 @@ public class AvController extends BaseController  {
 	public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){
 		try{
 			avCfgService.saveOrUpdateAvSignSample(entity);
+			addMessage(redirectAttributes,"save_success");
 		}catch(Exception e){
 			logger.error("saveAudioSignSample failed",e);
 			e.printStackTrace();
@@ -191,8 +193,9 @@ public class AvController extends BaseController  {
 	}
 	//修改文件样例配置状态
 	@RequestMapping(value = {"/sample/updateAvFileSampleValid"})
-	public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){
 		avCfgService.updateAvFileSampleValid(isAudit,isValid,ids);
+		addMessage(redirectAttributes,"delete_failed");
 		return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
 	}
 	//修改文件样例配置审核状态
diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
index 26766af66..819d30360 100644
--- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
@@ -16,6 +16,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.AvFileSampleCfg;
@@ -77,7 +78,7 @@ public class AvCfgService extends BaseService{
 		List<AvSignSampleCfg> list = avCfgDao.getAvSignSampleList(entity);
 		return list;
 	}
-	public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){
+	public void saveOrUpdateAvFileSample(AvFileSampleCfg entity,MultipartFile srcFile){
 		//设置区域运营商信息
 		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
@@ -116,7 +117,7 @@ public class AvCfgService extends BaseService{
 			entity.setEditTime(new Date());
 			entity.setIsValid(0);
 			entity.setIsAudit(0);
-			if(!oldEntity.getSrcMd5().equals(entity.getSrcMd5())){
+			if(null!=srcFile){
 				//删除旧的文件
 				FileUtils.deleteFile(oldEntity.getSrcPath());
 				FileUtils.deleteFile(oldEntity.getSamplePath());

From 4ecbbf0dc2d50cec9f4e532c1e3e26a51ad70696 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 12 Sep 2018 17:00:40 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=85=8D=E7=BD=AEID=EF=BC=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8F=8F=E8=BF=B0=EF=BC=8C=E6=9C=89=E6=95=88=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manipulation/RatelimitController.java     |  1 +
 .../proxy/ControlController.java              |  1 +
 .../proxy/InterceptController.java            |  9 ---
 src/main/resources/nis.properties             |  4 +-
 .../WEB-INF/views/cfg/app/appByteCfgList.jsp  |  6 +-
 .../views/cfg/app/appDomainCfgList.jsp        |  6 +-
 .../views/cfg/app/appHeaderCfgList.jsp        |  6 +-
 .../WEB-INF/views/cfg/app/appHttpCfgList.jsp  |  6 +-
 .../WEB-INF/views/cfg/app/appIpCfgList.jsp    |  6 +-
 .../views/cfg/app/appPolicyCfgList.jsp        |  6 +-
 .../WEB-INF/views/cfg/app/appSslCfgList.jsp   |  6 +-
 .../WEB-INF/views/cfg/app/appTcpCfgList.jsp   |  6 +-
 .../views/cfg/app/appTopicDomainCfgList.jsp   |  6 +-
 .../WEB-INF/views/cfg/asnPolicyCfgList.jsp    |  6 +-
 .../views/cfg/av/contIp/contIpList.jsp        |  6 +-
 .../views/cfg/av/contUrl/contUrlList.jsp      |  6 +-
 .../WEB-INF/views/cfg/av/fileSampleList.jsp   |  6 +-
 .../WEB-INF/views/cfg/av/picIp/picIpList.jsp  |  6 +-
 .../views/cfg/av/picUrl/picUrlList.jsp        |  6 +-
 .../WEB-INF/views/cfg/av/signSampleList.jsp   |  6 +-
 .../views/cfg/av/voip/voipAccountList.jsp     |  6 +-
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    |  6 +-
 .../WEB-INF/views/cfg/basicprotocol/list.jsp  |  6 +-
 .../WEB-INF/views/cfg/common/ipList.jsp       | 76 ++-----------------
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       |  6 +-
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp |  6 +-
 .../views/cfg/encryptedtunnelbehav/list.jsp   |  6 +-
 .../views/cfg/fileTransfer/fileDigestList.jsp |  6 +-
 .../views/cfg/fileTransfer/ftpList.jsp        |  6 +-
 .../views/cfg/fileTransfer/p2pList.jsp        |  6 +-
 .../views/cfg/intercept/interceptList.jsp     |  6 +-
 .../views/cfg/intercept/strateagy/list.jsp    |  6 +-
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       |  6 +-
 .../WEB-INF/views/cfg/mail/mailList.jsp       |  6 +-
 .../cfg/maintenance/dnsResStrategy/list.jsp   |  6 +-
 .../cfg/maintenance/ipMultiplexPool/list.jsp  |  6 +-
 .../WEB-INF/views/cfg/other/bgpList.jsp       |  6 +-
 .../WEB-INF/views/cfg/other/xmppList.jsp      |  6 +-
 .../cfg/proxy/control/httpRedirectList.jsp    |  6 +-
 .../views/cfg/proxy/fileStrategy/list.jsp     |  6 +-
 .../WEB-INF/views/cfg/website/dnsList.jsp     |  6 +-
 .../WEB-INF/views/cfg/website/httpList.jsp    |  6 +-
 .../WEB-INF/views/cfg/website/sslList.jsp     |  6 +-
 .../views/cfg/whitelist/domainList.jsp        |  6 +-
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    |  6 +-
 45 files changed, 137 insertions(+), 194 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
index 40911eb46..13e585115 100644
--- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
+++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
@@ -36,6 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
  */
 @Controller ///manipulation/ratelimit/domain/list?cfgName=domain_ratelimit
 @RequestMapping("${adminPath}/manipulation/ratelimit")
+@Deprecated
 public class RatelimitController extends CommonController {
 	@RequestMapping(value = {"/ip/list"})
 //	@RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR)
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
index 5ad5837db..251a8719d 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
@@ -35,6 +35,7 @@ import com.nis.web.controller.configuration.CommonController;
  */
 @Controller
 @RequestMapping("${adminPath}/proxy/control")
+@Deprecated
 public class ControlController extends CommonController {
 	@RequestMapping(value = {"/ip/list"})
 //	@RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR)
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
index 428417107..801c3744e 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -13,22 +13,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.ComplexkeywordCfg;
-import com.nis.domain.configuration.DnsResStrategy;
-import com.nis.domain.configuration.HttpUrlCfg;
-import com.nis.domain.configuration.InterceptPktBin;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
-import com.nis.domain.configuration.template.IpAddrTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 585e8d610..530f4687a 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -358,8 +358,8 @@ user_region_placeholder=0
 #\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5206\u9694\u7B26
 user_region_split=;
 #IP\u76F8\u5173\u9A8C\u8BC1\u6B63\u5219
-ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|[1-2][0-9]|[0-9])$
-ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(0|2|4|8|16|32|64|128)$
+ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$
+ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(128)$
 ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
 ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$
 ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index ff15630b2..49e0eb98b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -269,8 +269,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="bytes"/></th>
 								    <th><spring:message code="is_hex"/></th>
@@ -283,7 +283,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 828bf6cb9..bfc75fc18 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -269,8 +269,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="domain"/></th>
 								    <th><spring:message code="is_hex"/></th>
@@ -283,7 +283,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 0ece44f29..bf7580afa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -269,8 +269,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="layer"/></th>
 								    <th><spring:message code="header"/></th>
@@ -284,7 +284,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index cb27b1b33..637dde070 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -270,8 +270,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="district"/></th>
 								    <th><spring:message code="keywords"/></th>
@@ -285,7 +285,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index aba8cf4c3..55a07eb8b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -274,8 +274,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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>IP <spring:message code="type"/></th>
 									<%-- <th><spring:message code="client_ip"/></th>
@@ -289,7 +289,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 9d272d8be..aea0b405d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -315,8 +315,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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>
@@ -327,7 +327,7 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 44c67c10a..550cb5533 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -269,8 +269,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="district"/></th>
 								    <th><spring:message code="keywords"/></th>
@@ -284,7 +284,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 7d3a09d9f..59a5ab851 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -267,8 +267,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="min_tcp"/></th>
 								    <th><spring:message code="max_tcp"/></th>
@@ -283,7 +283,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 7ca8af3a7..27dd17e90 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -266,8 +266,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th style="display: none;"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="topic"/></th>
 								    <th><spring:message code="website_server"/></th>
 								    <th><spring:message code="domain"/></th>
@@ -282,7 +282,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
index 1757914de..64e04188e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
@@ -243,8 +243,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="group"/></th>
 									<th class="sort-column r.create_time"><spring:message code="block_type"/></th>
 									<%-- <th><spring:message code="do_log"/></th>
@@ -253,7 +253,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index fa82e2334..f2b4195aa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -278,8 +278,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-									<th><spring:message code="config_describe"/></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><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th>
@@ -296,7 +296,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index fd6a2b77c..3352b3b76 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -274,8 +274,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-									<th><spring:message code="config_describe"/></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><spring:message code="URL"/></th>
 									<th><spring:message code="is_hex"/></th>
 								    <th><spring:message code="is_case_insenstive"/></th>
@@ -290,7 +290,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 3754bdf64..a3d92cc17 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -268,8 +268,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-									<th><spring:message code="config_describe"/></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><spring:message code="seq"/></th> --%>
 									<th><spring:message code="src_file"/></th>
 									<th><spring:message code="sample_file"/></th>
@@ -279,7 +279,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 9360cc261..454d7c22c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -278,8 +278,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-									<th><spring:message code="config_describe"/></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><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th>
@@ -296,7 +296,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 1520a9e4d..986c18178 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -276,8 +276,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-									<th><spring:message code="config_describe"/></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><spring:message code="URL"/></th>
 									<th><spring:message code="is_hex"/></th>
 								    <th><spring:message code="is_case_insenstive"/></th>
@@ -292,7 +292,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 0cf7b5100..15c0a1754 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -278,17 +278,17 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
+									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="sample_sign"/></th>
 									<th><spring:message code="harm_level"/></th>
-									<th><spring:message code="config_describe"/></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="do_log"/></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="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index cb8c73214..039ef8679 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -628,8 +628,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -637,7 +637,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 674d81499..fe3a72aa0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -642,8 +642,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -651,7 +651,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index a240e90ed..74a033bb1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -319,8 +319,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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> --%>
@@ -331,7 +331,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index a852f8786..f7bbdef28 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -41,11 +41,6 @@
 </script>
 </head>
 <body>
-<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
-<c:if test="${sfi.itemCode==cfg.functionId}">
-<c:set var="specialFunctionId" value="${sfi.itemValue}"/>
-</c:if>
-</c:forEach>
 <div class="page-content">
 	<!-- 模板导入，start -->
 	 <%@include file="/WEB-INF/include/excel/importIp.jsp" %>
@@ -335,42 +330,26 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th exportColumn="config_describe" ><spring:message code="config_describe"/></th>
+									<th class="sort-column r.compile_id" exportColumn="cfg_id" ><spring:message code="cfg_id"/></th>
+									<th class="sort-column r.cfg_desc" exportColumn="config_describe" ><spring:message code="config_describe"/></th>
 									<th exportColumn="ip_type"><spring:message code="ip_type"/></th>
 									<th exportColumn="ip_pattern"><spring:message code="ip_pattern"/></th>
 									<th exportColumn="port_pattern"><spring:message code="port_pattern"/></th>
-									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
-									<th exportColumn="client_ip"><spring:message code="client_ip"/></th>
-									<th exportColumn="client_port"><spring:message code="client_port"/></th>
-									<th exportColumn="server_ip"><spring:message code="server_ip"/></th>
-									<th exportColumn="server_port"><spring:message code="server_port"/></th>
-									</c:if>
-									<c:if test="${specialFunctionId eq 'ipmulitiplex'}">
 									<th exportColumn="client_ip"><spring:message code="IP"/></th>
 									<th exportColumn="client_port"><spring:message code="port"/></th>
-									</c:if>
 									<th exportColumn="block_type" class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th exportColumn="direction"><spring:message code="direction"/></th>
 									<th exportColumn="protocol"><spring:message code="protocol"/></th>
-									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
-									<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
-									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
 									<th exportColumn="group_name"><spring:message code="group"/></th>
 									<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
-									</c:if>
 									<c:if test="${hasRatelimit==1}">
 									<th exportColumn="ratelimit"><spring:message code="ratelimit"/></th>
 									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'pxyIpControl'}">
-									<th exportColumn="userRegion1"><spring:message code="REDIRECT_RESPONSE_CODE"/></th>
-									<th exportColumn="userRegion2"><spring:message code="redirect_content"/></th>
-									</c:if>
 									<th exportColumn="letter"><spring:message code="letter"/></th>
 									<th exportColumn="classification"><spring:message code="classification"/></th>
 									<th exportColumn="attribute"><spring:message code="attribute"/></th>
 									<th exportColumn="label"><spring:message code="label"/></th>
-									<th exportColumn="valid_identifier"><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid" exportColumn="valid_identifier"><spring:message code="valid_identifier"/></th>
 									<th exportColumn="is_audit"><spring:message code="is_audit"/></th>
 									<%-- <th exportColumn="log_total"><spring:message code="log_total"/></th> --%>
 									<th exportColumn="creator"><spring:message code="creator"/></th>
@@ -387,7 +366,8 @@
 									<tr pId="${status.index}">
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
 									<%-- <td>${status.index+1 }</td> --%>
-									<td>${cfg.cfgDesc }</td>
+									<td>${cfg.compileId }</td>
+									<td class="sort-column r.cfg_desc">${cfg.cfgDesc }</td>
 									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
 										<c:if test="${ipType.itemCode==cfg.ipType}"><spring:message code="${ipType.itemValue}"/></c:if>
 					                </c:forEach></td>
@@ -397,16 +377,8 @@
 					                <td><c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPattern">
 										<c:if test="${portPattern.itemCode==cfg.portPattern}"><spring:message code="${portPattern.itemValue}"/></c:if>
 					                </c:forEach></td>
-					                <c:if test="${specialFunctionId ne 'ipmulitiplex'}">
-										<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
-										<td>${cfg.srcPort }</td>
-										<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-										<td>${cfg.destPort }</td>
-									</c:if>
-					                <c:if test="${specialFunctionId eq 'ipmulitiplex'}">
-										<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
-										<td>${cfg.srcPort }</td>
-									</c:if>
+									<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
+									<td>${cfg.srcPort }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
 									       <c:if test="${cfg.action eq serviceC.itemCode}"><spring:message code="${serviceC.itemValue }"/></c:if>
@@ -418,56 +390,22 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${specialFunctionId ne 'ipsec'}">
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
 											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 										</c:forEach>
-										</c:if>
-										<c:if test="${specialFunctionId eq 'ipaddr'}">
-											<c:forEach items="${fns:getDictList('ICMP_PROTOCOL')}" var="icmp">
-												<c:if test="${cfg.protocol eq icmp.itemCode}"><spring:message code="${icmp.itemValue }"/></c:if>
-											</c:forEach>
-										</c:if>
-										<c:if test="${specialFunctionId eq 'ipsec'}">
-										<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
-										</c:forEach>
-										</c:if>
 									</td>
-									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
-									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">
-												<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
-													<spring:message code="selective"/>
-												</a>
-										</c:if>
-									</td>
-									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
 									<td>${cfg.groupName }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
 											<c:if test="${cfg.irType==irTypeC.itemCode}"><spring:message code="${irTypeC.itemValue}"/></c:if>
 							             </c:forEach>
 									</td>
-									</c:if>
 									<c:if test="${hasRatelimit==1}">
 									<td>
 									<c:if test="${cfg.ratelimit eq null and cfg.action==64}">0%</c:if>
 									<c:if test="${cfg.ratelimit ne null}">${cfg.ratelimit}%</c:if>
 									</td>
 									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'pxyIpControl'}">
-									<td>
-										<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="codeC">
-											<c:if test="${codeC.itemValue eq cfg.userRegion1}">
-												<spring:message code="${codeC.itemCode}" />
-											</c:if>
-										</c:forEach>
-									</td>
-									<td>${cfg.userRegion2 }</td>
-									</c:if>
 									<td>${cfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 07a213366..c83aafc7e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -280,7 +280,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="config_describe"/></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><spring:message code="ip_type"/></th>
 									<%-- <th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th> --%>
@@ -296,7 +297,7 @@
 								<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
@@ -312,6 +313,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<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('IP_TYPE')}" var="ipTypeC">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 33cd98ceb..d21ddced7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -275,7 +275,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="config_describe"/></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><spring:message code="group"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="IP"/></th>
@@ -287,7 +288,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
@@ -303,6 +304,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<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>${cfg.dnsStrategyName }
 										<c:if test="${empty cfg.dnsStrategyName}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index b22f7b45e..93efd85f5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -319,8 +319,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="encrypted_tunnel_behavior"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
 								   <%--  <th><spring:message code="ratelimit"/></th> --%>
@@ -331,7 +331,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index 9e51d3536..e0f0911a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -305,7 +305,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th><spring:message code="config_describe"/></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><spring:message code="digest"/></th>
 								    <th><spring:message code="raw_len"/></th>
 								    <th><spring:message code="cfds_level"/></th>
@@ -317,7 +318,7 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
@@ -335,6 +336,7 @@
 										<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 								    <td>
 								    	<a href="javascript:;" data-original-title="${indexCfg.digest}"
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index f41c3d260..6173b9e12 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -310,8 +310,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -319,7 +319,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 212d8c044..c3d109a3e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -301,8 +301,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -310,7 +310,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 447163f3e..d861f23a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -312,8 +312,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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><spring:message code="ratelimit"/></th>
 							    	<%-- <th><spring:message code="bandwith"/></th> --%>
 							    	<th><spring:message code="certificate"/></th>
@@ -329,7 +329,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 019aff7df..1bb5efaa2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -256,7 +256,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="keyring_name"/></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="keyring_name"/></th>
 									<th><spring:message code="keyring_type"/></th>
 									<th><spring:message code="private_key_file"/></th>
 									<th><spring:message code="public_key_file"/></th>
@@ -271,7 +272,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></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>
@@ -287,6 +288,7 @@
 									<td>
 										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 0ffd04076..96286277c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -301,8 +301,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -310,7 +310,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 1dc574b55..99adf4f17 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -306,8 +306,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -315,7 +315,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index a54e8c5fc..febb17ae1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -260,8 +260,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="policy_number"/></th>
-									<th><spring:message code="policy_name"/></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><spring:message code="group"/></th>
 			 						<th><spring:message code="res_group_num"/></th>
 									<th><spring:message code="min_ttl"/></th>
@@ -273,7 +273,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index 965f2736a..34111db6e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -260,7 +260,8 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="config_describe"/></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><spring:message code="group"/></th>
 									<th><spring:message code="ip"/></th>
 									<th><spring:message code="port"/></th>
@@ -274,7 +275,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></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>
@@ -288,6 +289,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId}</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.cfgDesc}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index ed8b9064e..1845c431f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -308,8 +308,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -317,7 +317,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 912ca138b..92ffaae9c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -307,8 +307,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -316,7 +316,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index b29dfee8d..21b3bb1d8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -502,8 +502,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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>
 									<c:if test="${action == 16}">
 										<th><spring:message code="response_code"/></th>
@@ -526,7 +526,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
index 14e954e75..9f7c429e8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -267,7 +267,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-								    <th><spring:message code="file_desc"/></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="file_desc"/></th>
 									<th><spring:message code="content_type"/></th>
 									<th><spring:message code="content_length"/></th>
 									<%-- <th><spring:message code="block_type"/></th> --%>
@@ -275,7 +276,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -291,6 +292,7 @@
 									<td>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+									<td>${indexCfg.compileId }</td>
 								    <td><a href="${indexCfg.url }" target="_blank">${indexCfg.fileDesc }</a></td>
 								    <td>${indexCfg.contentType }</td>
 								    <td>${indexCfg.contentLength }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index cfd8418fc..fa5164037 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -305,8 +305,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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><spring:message code="policy_name"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
@@ -315,7 +315,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index ade307040..5bada9b7d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -463,8 +463,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -472,7 +472,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 1bbba778a..5cf7e2609 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -305,8 +305,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 532aeefd2..158bfefdf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -305,8 +305,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 3451c6cd6..dde1815af 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -305,8 +305,8 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th style="display: none"><spring:message code="cfg_id"/></th>
-								    <th class="cfgDesc"><spring:message code="config_describe"/></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="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th> --%>
-									<th><spring:message code="valid_identifier"/></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>

From 745713979b4b509dac69b7099338126b5463112d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 12 Sep 2018 17:30:32 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9C=8D=E5=8A=A1=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/httpclient/HttpClientUtil.java | 6 ++++--
 src/main/java/com/nis/web/controller/BaseController.java  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
index e07445cf0..b90f86caf 100644
--- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
+++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
@@ -222,9 +222,10 @@ public class HttpClientUtil {
 //				result = EntityUtils.toString(response.getEntity());
 				//调用处理数据方法
 				result = galaxyMessageFormat(result);
-				logger.debug("获取消息成功，相应内容如下： " + result);
+				logger.info("获取消息成功，相应内容如下： " + result);
 				
 			} else {
+				logger.error("获取消息失败，相应内容如下： " + result);
 				throw new MaatConvertException(status+"");
 			}
 		} /*catch (SocketTimeoutException e) {
@@ -237,8 +238,9 @@ public class HttpClientUtil {
 			throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":timeout");
 		}*/ catch (Exception e) {
 			e.printStackTrace();
+			logger.error("获取消息失败，相应内容如下： " + result);
 			logger.error("获取消息失败 ", e);
-			throw new MaatConvertException(requestContext.getMessage("request_service_failed"));
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
 		} /*finally {
 			try {
 				if (response != null) {
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 94c69a02e..537c83f8a 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -271,6 +271,8 @@ public class BaseController {
 				messages="data_format_error";
 			}else if("500".equals(status)){
 				messages="server_internal_error";
+			}else if(status.indexOf("request_service_failed")!=-1){
+				messages="server_internal_error";
 			}
 		}
 		model.addAttribute("message",messages);

From ab7eea2b89397722d3c9533cb28c8b5fc266bf89 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 12 Sep 2018 18:11:05 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0action=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/DnsIpCfgController.java       |  2 +-
 .../maintenance/DnsResStrategyController.java |  2 +-
 .../IpMultiplexPoolCfgController.java         |  2 +-
 .../manipulation/DdosCfgController.java       |  2 +-
 .../ntc/AsnPolicyCfgController.java           |  2 +-
 .../proxy/PxyObjKeyringController.java        |  2 +-
 .../views/cfg/app/appPolicyCfgList.jsp        |  9 ++++
 .../WEB-INF/views/cfg/asnPolicyCfgList.jsp    |  9 ++++
 .../WEB-INF/views/cfg/basicprotocol/list.jsp  | 10 +++-
 .../WEB-INF/views/cfg/common/domainList.jsp   | 10 +++-
 .../WEB-INF/views/cfg/common/ipList.jsp       | 20 ++++---
 .../WEB-INF/views/cfg/complexCfgList.jsp      |  9 ++++
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       |  9 ++++
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp |  9 ++++
 .../views/cfg/encryptedtunnelbehav/list.jsp   | 10 +++-
 .../views/cfg/fileTransfer/fileDigestList.jsp | 10 +++-
 .../views/cfg/fileTransfer/ftpList.jsp        | 10 +++-
 .../views/cfg/fileTransfer/p2pList.jsp        | 10 +++-
 .../views/cfg/intercept/interceptList.jsp     |  9 ++++
 .../views/cfg/intercept/strateagy/list.jsp    | 10 +++-
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 19 +++++--
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       | 10 +++-
 .../WEB-INF/views/cfg/mail/mailList.jsp       |  9 ++++
 .../cfg/maintenance/dnsResStrategy/list.jsp   |  9 ++++
 .../cfg/maintenance/ipMultiplexPool/list.jsp  |  9 ++++
 .../WEB-INF/views/cfg/multipleCfgList.jsp     | 18 +++++--
 .../WEB-INF/views/cfg/other/bgpList.jsp       |  9 ++++
 .../WEB-INF/views/cfg/other/xmppList.jsp      |  9 ++++
 .../cfg/proxy/control/httpRedirectList.jsp    | 10 +++-
 .../cfg/proxy/control/httpReqReplaceList.jsp  |  9 ++++
 .../cfg/proxy/control/httpResReplaceList.jsp  |  9 ++++
 .../views/cfg/proxy/fileStrategy/list.jsp     | 11 ++++
 .../webapp/WEB-INF/views/cfg/requestList.jsp  | 18 +++++--
 .../WEB-INF/views/cfg/stringCfgList.jsp       |  9 ++++
 .../WEB-INF/views/cfg/website/dnsList.jsp     |  9 ++++
 .../WEB-INF/views/cfg/website/httpList.jsp    |  9 ++++
 .../WEB-INF/views/cfg/website/sslList.jsp     |  9 ++++
 .../views/cfg/whitelist/domainList.jsp        |  9 ++++
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    |  9 ++++
 .../1.11.0/localization/messages_en.js        |  3 +-
 .../1.11.0/localization/messages_zh.js        |  3 +-
 .../webapp/static/global/scripts/common.js    | 53 ++++++++++++++++++-
 42 files changed, 380 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
index 1e27a9f50..331d08418 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
@@ -38,7 +38,7 @@ public class DnsIpCfgController extends BaseController {
 			,RedirectAttributes redirectAttributes){
 		Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/dnsIpCfgList";
 	}
 	@RequestMapping(value = {"/form"})
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
index 4e45f7c12..de7f9deed 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
@@ -89,7 +89,7 @@ public class DnsResStrategyController extends BaseController  {
 		//查询时left join policyGroup
 		Page<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/maintenance/dnsResStrategy/list";
 	}
 	
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
index 4a20956ed..735e5e833 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
@@ -76,7 +76,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		//查询时left join policyGroup
 		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/maintenance/ipMultiplexPool/list";
 	}
 	
diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
index 2437f7b38..ade797550 100644
--- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
@@ -34,7 +34,7 @@ public class DdosCfgController extends BaseController {
 	public String list(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")DdosIpCfg entity){
 		Page<DdosIpCfg> page = ddosCfgService.findPage(new Page<DdosIpCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/ddosIpCfgList";
 	}
 	@RequestMapping(value = {"/form"})
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java
index 4ae935ff5..7e34dec44 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java
@@ -28,7 +28,7 @@ public class AsnPolicyCfgController extends BaseController {
 			,RedirectAttributes redirectAttributes){
 		Page<CfgIndexInfo> page = asnPolicyCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/asnPolicyCfgList";
 	}
 	@RequestMapping(value = {"/form"})
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
index 6ebeb7d02..9fc8da615 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
@@ -163,7 +163,7 @@ public class PxyObjKeyringController extends BaseController  {
 		//查询时left join policyGroup
 		Page<PxyObjKeyring> page = pxyObjKeyringService.findPage(new Page<PxyObjKeyring>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model);
+		initPageCondition(model,entity);
 		return "/cfg/intercept/strateagy/list";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index aea0b405d..4150fc6de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -146,11 +146,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
index 64e04188e..90cf18e20 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
@@ -136,11 +136,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 74a033bb1..5ab1b4b8f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -149,13 +149,21 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
index 5628d668c..e5dcf9850 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
@@ -101,12 +101,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index f7bbdef28..00d4afcf9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -159,12 +159,20 @@
 													<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 													<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												</form:select>
-												
-                                            </div>
-                                            
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
-                                     
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                         </div> 
 	                               </div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 3b6eea6a1..c1e039950 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -103,11 +103,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="keywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index c83aafc7e..60fef2c07 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -110,11 +110,20 @@
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 												<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index d21ddced7..41bd359f0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -104,11 +104,20 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
 												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 93efd85f5..320a4db4d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -150,12 +150,20 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index e0f0911a9..0bb068168 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -135,12 +135,20 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfdsLevel"><spring:message code="cfds_level"/></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 6173b9e12..4065b54ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -141,12 +141,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index c3d109a3e..58923378b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -132,12 +132,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index d861f23a4..ca78203b3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -143,11 +143,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 1bb5efaa2..35a3a28c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -85,12 +85,20 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="keyring_name"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 6efdd9639..5da1f5c12 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -100,11 +100,20 @@
 													<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
 													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												</form:select>
-												
-                                            </div>
-                                            
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                      
                                         </div> 
 	                               </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 96286277c..5cfeb9b5f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -132,12 +132,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 99adf4f17..e86d65e15 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -137,11 +137,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index febb17ae1..5211daa16 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -89,11 +89,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="policy_name"></spring:message></form:option>
 												<form:option value="group1Name"><spring:message code="group"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index 34111db6e..e011e43e5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -90,11 +90,20 @@
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index 5ad894e0a..dd23dee2a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -142,10 +142,20 @@
 														<form:option value="complexCfg.keywords"><spring:message code="key_word"></spring:message></form:option>
 													</c:if>
 													
-												</form:select>
-												
-                                            </div>
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                         </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 1845c431f..d61b7ef92 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -138,11 +138,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 92ffaae9c..16d3e5116 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -138,11 +138,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 21b3bb1d8..99fbdd0c6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -326,12 +326,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 18414d12c..7220b04ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -86,11 +86,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 171ddb21d..3e55f3e59 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -87,11 +87,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
index 9f7c429e8..0181c3649 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -94,9 +94,20 @@
                                          <div class="input-group-btn">
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="fileDesc"><spring:message code="file_desc"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
+									
                                          </div>
+                                         
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                     </div> 
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 712dc5d41..4b8dc9ba7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -77,10 +77,20 @@
 													<form:option value="requestNumber"><spring:message code="title"></spring:message></form:option>
 													<form:option value="requestTitle"><spring:message code="request_number"></spring:message></form:option>
 													<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
-												</form:select>
-                                            </div>
-                                            
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                             
                                         </div>
 	                               </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 5d43fb58b..0072647ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -102,11 +102,20 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index fa5164037..6cf1e7dda 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -136,11 +136,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 5bada9b7d..e5b1887c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -294,11 +294,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 5cf7e2609..7dcc4b5d8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -136,11 +136,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 158bfefdf..455001410 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -136,11 +136,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index dde1815af..d3078f861 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -136,11 +136,20 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select>
+										 </div>
                                   
                                     </div> 
 								</div>
diff --git 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
index 1f13c57bb..8887f61cc 100644
--- 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
@@ -71,6 +71,7 @@
 		failed:"Failed",
 		go_back:"Go Back Policies",
 		log_5_minutes:"Log Five Minutes' Amount",
-		log_1_hour:"Log One Hour's Amount"
+		log_1_hour:"Log One Hour's Amount",
+		input:"Please Enter  "
 	});
 }(jQuery));
diff --git 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
index 73e14be06..5c9ea8ada 100644
--- 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
@@ -71,6 +71,7 @@
 		failed:"获取失败",
 		go_back:"返回配置界面",
 		log_5_minutes:"5分钟日志量",
-		log_1_hour:"1小时日志量"
+		log_1_hour:"1小时日志量",
+		input:"请输入 "
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 0536664dd..b339d1609 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -464,7 +464,54 @@ $(function(){
 		   }
 	   }
 	   
-   })
+   });
+   // 初始
+   if($("#seltype").val() == "action"){
+	   $("#intype").hide();// 隐藏输入框
+	   if($("#actionSelect").find("option").length < 3){
+		   $("#actionSelect").find("option[value='']").remove();
+	   }
+   }else{
+	   $("#actionSelect").selectpicker("hide");// 隐藏下拉框
+   }
+   // 改变
+   $("#seltype").on("change",function() {
+	   if($(this).val() == "action"){
+		   if($("#actionSelect").find("option").length < 3){
+			   $("#actionSelect").find("option[value='']").remove();
+		   }
+		   
+		   $("#intype").hide(); // 隐藏输入框
+		   $("#intype").val("");// 清空input条件
+		   $("#actionSelect").find("option").removeAttr("selected",false);
+		   $("#actionSelect").selectpicker("refresh");
+		   $("#actionSelect").selectpicker("show");// 显示下拉框
+	   }else{
+		   $("#intype").show(); // 显示输入框
+		   $("#intype").val("");// 清空input条件
+		   $("#actionSelect").find("option:first").attr("selected",true);// 清空action条件
+		   $("#actionSelect").selectpicker("hide");// 隐藏下拉框
+	   }
+   });
+   
+   // 重置操作（增加）
+   $("#resetBtn").on("click",function(){
+	   // action查询条件放最上面的情况
+	   if($("#seltype").find("option:first").val() == "action"){
+		   $("#intype").hide();
+		   $("#actionSelect").selectpicker("show");
+		   return false;
+	   }
+	   if($("#seltype").val() == "action"){
+		   $("#intype").show();
+		   $("#intype").attr("placeholder",$.validator.messages.input+$("#seltype").find("option:first").text());
+		   $("#actionSelect").selectpicker("hide");
+	   }else{
+		   $("#intype").attr("placeholder",$.validator.messages.input+$("#seltype").find("option:first").text());
+	   }
+	   
+   });
+   
 });
 window.onload=function(){
 	$("span[id^=open]").click(function(){
@@ -1139,7 +1186,9 @@ var areaControlInit=function(){
 }
 //查询
 var page=function(n,s){
-	$("#intype").attr("name",$("#seltype").val());
+	if($("#intype").val() != null && $("#intype").val() != ""){
+		$("#intype").attr("name",$("#seltype").val());
+	}
 	$("#pageNo").val(n);
 	$("#pageSize").val(s);
 	$("#searchForm").submit();