Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/interceptor/MultipartFileIntercepter.java

@@ -125,6 +125,15 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{
 		}else if(functionId.equals(31)){ //voip
 			fileTypes=Constants.VOIP_FILE_TYPE;
 			fileMaxSize=Constants.VOIP_SINGLE_FILE_MAX_SIZE;
+		}else if(functionId.equals(630)){ //说话人识别
+			fileTypes=Constants.SPEAKER_FILE_TYPE;
+			fileMaxSize=Constants.SPEAKER_SINGLE_FILE_MAX_SIZE;
+		}else if(functionId.equals(631)){ //台标识别
+			fileTypes=Constants.LOGO_FILE_TYPE;
+			fileMaxSize=Constants.LOGO_SINGLE_FILE_MAX_SIZE;
+		}else if(functionId.equals(632)){ //人脸识别
+			fileTypes=Constants.FACE_FILE_TYPE;
+			fileMaxSize=Constants.FACE_SINGLE_FILE_MAX_SIZE;
 		}else{
 			return;
 		}

src/main/java/com/nis/util/Constants.java

@@ -526,6 +526,14 @@ public final class Constants {
 	 * 音频文件限制单个文件大小
 	 */
 	public static final long AUDIO_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("audio_single_file_max_size",10485760l);//10M
+	/**
+	 * 说话人识别音频文件支持文件类型
+	 */
+	public static final String SPEAKER_FILE_TYPE = Configurations.getStringProperty("speaker_file_type","");
+	/**
+	 * 说话人识别音频文件限制单个文件大小
+	 */
+	public static final long SPEAKER_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("speaker_single_file_max_size",10485760l);//10M
 	/**
 	 * 视频文件支持文件类型
 	 */
@@ -534,6 +542,14 @@ public final class Constants {
 	 * 视频文件限制单个文件大小
 	 */
 	public static final long VIDEO_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("video_single_file_max_size",10485760l);//10M
+	/**
+	 *人脸识别视频文件支持文件类型
+	 */
+	public static final String FACE_FILE_TYPE = Configurations.getStringProperty("face_file_type","");
+	/**
+	 * 视频文件限制单个文件大小
+	 */
+	public static final long FACE_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("face_single_file_max_size",10485760l);//10M
 	/**
 	 * 图片文件支持文件类型
 	 */
@@ -542,6 +558,14 @@ public final class Constants {
 	 * 图片文件限制单个文件大小
 	 */
 	public static final long PICTURE_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("picture_single_file_max_size",10485760l);//10M
+	/**
+	 * 图片文件支持文件类型
+	 */
+	public static final String LOGO_FILE_TYPE = Configurations.getStringProperty("logo_file_type","");
+	/**
+	 * 图片文件限制单个文件大小
+	 */
+	public static final long LOGO_SINGLE_FILE_MAX_SIZE = Configurations.getLongProperty("logo_single_file_max_size",10485760l);//10M
 	/**
 	 * voip文件支持文件类型
 	 */
@@ -578,6 +602,18 @@ public final class Constants {
 	public static final boolean AUDIO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("audio_sample_proc_param_is_translation", false);
 	public static final boolean VIDEO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("video_sample_proc_param_is_translation", false);
 	public static final boolean PICTURE_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("picture_sample_proc_param_is_translation", false);
+	public static final String MM_SPEAKER_RECOGNIZATION_REGION = Configurations.getStringProperty("mm_speaker_recognization_region", "MM_SPEAKER_RECOGNIZATION");
+	public static final String MM_LOGO_DETECTION_REGION = Configurations.getStringProperty("mm_logo_detection_region", "MM_LOGO_DETECTION");
+	public static final String MM_FACE_RECOGNIZATION_REGION = Configurations.getStringProperty("mm_face_recognization_region", "MM_FACE_RECOGNIZATION");
+	public static final String SPEAKER_SAMPLE_CREATE_PROC = Configurations.getStringProperty("speaker_sample_create_proc", "./audio_convert_proc");
+	public static final String LOGO_SAMPLE_CREATE_PROC = Configurations.getStringProperty("logo_sample_create_proc", "./picture_convert_proc");
+	public static final String FACE_SAMPLE_CREATE_PROC = Configurations.getStringProperty("face_sample_create_proc", "./video_convert_proc");
+	public static final boolean SPEAKER_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("speaker_sample_proc_param_is_quotation", true);
+	public static final boolean LOGO_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("logo_sample_proc_param_is_quotation", true);
+	public static final boolean FACE_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("face_sample_proc_param_is_quotation", true);
+	public static final boolean SPEAKER_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("speaker_sample_proc_param_is_translation", false);
+	public static final boolean LOGO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("logo_sample_proc_param_is_translation", false);
+	public static final boolean FACE_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("face_sample_proc_param_is_translation", false);
 	
 	//HTTP自定义域相关参数
 	public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER");

src/main/java/com/nis/web/controller/configuration/ntc/AvController.java

@@ -48,7 +48,7 @@ import com.nis.web.security.UserUtils;
 public class AvController extends BaseController  {
 
 	//音视频文件样例配置列表
-	@RequestMapping(value = {"/sample/fileSampleList"})
+	@RequestMapping(value = {"/sample/fileSampleList","/sample/fileSampleSpeakerList","/sample/fileSampleLogoList","/sample/fileSampleFaceList"})
 	public String fileSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvFileSampleCfg entity){
 		Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(new Page<AvFileSampleCfg>(request, response,"a"), entity);
 		model.addAttribute("page", page);

src/main/java/com/nis/web/service/configuration/AvCfgService.java

@@ -168,6 +168,30 @@ public class AvCfgService extends BaseService{
 			if(Constants.PICTURE_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理
 				param = "'"+param+"'";
 			}
+		}else if(entity.getCfgType().equals(Constants.MM_SPEAKER_RECOGNIZATION_REGION)){//说话人识别音频样例配置
+			sampleCreatelProc = Constants.SPEAKER_SAMPLE_CREATE_PROC;
+			if(Constants.SPEAKER_SAMPLE_PROC_PARAM_IS_TRANSLATION){
+				param = StringEscapeUtils.escapeJava(param);
+			}
+			if(Constants.SPEAKER_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理
+				param = "'"+param+"'";
+			}
+		}else if(entity.getCfgType().equals(Constants.MM_LOGO_DETECTION_REGION)){//台标识别图片样例配置
+			sampleCreatelProc = Constants.LOGO_SAMPLE_CREATE_PROC;
+			if(Constants.LOGO_SAMPLE_PROC_PARAM_IS_TRANSLATION){
+				param = StringEscapeUtils.escapeJava(param);
+			}
+			if(Constants.LOGO_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理
+				param = "'"+param+"'";
+			}
+		}else if(entity.getCfgType().equals(Constants.MM_FACE_RECOGNIZATION_REGION)){//人脸识别视频样例配置
+			sampleCreatelProc = Constants.FACE_SAMPLE_CREATE_PROC;
+			if(Constants.FACE_SAMPLE_PROC_PARAM_IS_TRANSLATION){
+				param = StringEscapeUtils.escapeJava(param);
+			}
+			if(Constants.FACE_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理
+				param = "'"+param+"'";
+			}
 		}
 		
 		logger.info("调用外部程序输入参数："+param);

src/main/resources/messages/message_en.properties

@@ -531,7 +531,7 @@ file=File
 select_file=Please Select Upload File
 sample_file=Sample File
 sample_sign=Sample Sign
-off=off
+off=OFF
 on=on
 click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you!
 return_lastpage=Return to the last page
@@ -980,7 +980,7 @@ day_of_month_report=Daily Report
 month_report=Monthly Report
 label_report=Tag Report
 attr_type_report=Attribute Report
-lwhh_report=Official Letter Report
+lwhh_report=icial Letter Report
 src_ip_report=Src IP Report
 dest_ip_report=Dest IP Report
 isp_report=Entrance Report

src/main/resources/sql/20180911/update_asn_menu.sql

@@ -0,0 +1 @@
+UPDATE sys_menu SET CODE='ASN' WHERE CODE='asn_policy'

src/main/resources/sql/20180911/update_basic_encrypted_protocol_id.sql

@@ -0,0 +1,3 @@
+#基础协议，加密隧道行为 protocol_id修改与app一致
+UPDATE function_service_dict SET protocol_id=21 WHERE function_id=407
+UPDATE function_service_dict SET protocol_id=21 WHERE function_id=408

src/main/resources/sql/update_function_region_dict-20180910.sql

@@ -0,0 +1,3 @@
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '196', '630', '1', 'MM_SPEAKER_RECOGNIZATION', null, '说话人识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '197', '631', '1', 'MM_LOGO_DETECTION', null, '台标识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '198', '632', '1', 'MM_FACE_RECOGNIZATION', null, '人脸识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');

src/main/resources/sql/update_function_service_dict-20180910.sql

@@ -0,0 +1,6 @@
+INSERT INTO `function_service_dict` VALUES ('121', '630', '0', '1', 'reject', '267', 'mm_speaker_recognization_reject', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('122', '630', '0', '16', 'monit', '395', 'mm_speaker_recognization_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('123', '631', '0', '1', 'monit', '396', 'mm_logo_detection_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('124', '631', '0', '16', 'reject', '268', 'mm_logo_detection_reject', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('125', '632', '0', '1', 'monit', '397', 'mm_face_recognization_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('126', '632', '0', '16', 'reject', '269', 'mm_face_recognization_reject', null, '1', null, null, null, null, '');

src/main/resources/sql/update_sys_menu-20180910.sql

@@ -0,0 +1,9 @@
+INSERT INTO `sys_menu` VALUES ('1056', '932', '0,1,86,932,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '85', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 18:56:37', '1', '2018-09-10 14:24:05', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1058', '932', '0,1,86,932,', 'MM_LOGO_DETECTION', '台标识别', '86', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 19:01:25', '1', '2018-09-10 14:25:01', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1059', '932', '0,1,86,932,', 'MM_FACE_RECOGNIZATION', '人脸识别', '87', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 19:03:54', '1', '2018-09-10 14:25:17', '', '1', null, '0', '0', '632');
+INSERT INTO `sys_menu` VALUES ('1060', '935', '0,1,150,935,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '85', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:17:32', '1', '2018-09-10 14:25:59', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1061', '935', '0,1,150,935,', 'MM_LOGO_DETECTION', '台标识别', '86', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:23:27', '1', '2018-09-10 14:23:27', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1062', '935', '0,1,150,935,', 'MM_FACE_RECOGNIZATION', '人脸识别', '87', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avSignSample:confirm', '1', '2018-09-10 14:27:13', '1', '2018-09-10 14:27:13', '', '1', null, '0', '0', '632');
+INSERT INTO `sys_menu` VALUES ('1063', '938', '0,1,151,938,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '153', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:28:46', '1', '2018-09-10 14:29:24', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1064', '938', '0,1,151,938,', 'MM_LOGO_DETECTION', '台标识别', '154', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:30:27', '1', '2018-09-10 14:30:27', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1065', '938', '0,1,151,938,', 'MM_FACE_RECOGNIZATION', '人脸识别', '155', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:31:09', '1', '2018-09-10 14:31:09', '', '1', null, '0', '0', '632');

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -36,7 +36,7 @@
 				    	<c:set var="classifyValue" value="${classifyValue},${fns:getServiceDictInfoById(_classify).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0"
+           		<sys:treeselect id="classify" name="classify" value="${empty _cfg.classify?0:_cfg.classify}" labelName="classifyName" extId="0"
 				labelValue="${classifyValue}"
 					title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
@@ -86,7 +86,7 @@
 				    	<c:set var="attributeValue" value="${attributeValue},${fns:getServiceDictInfoById(_attribute).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="attribute" name="attribute" value="${_cfg.attribute}" labelName="attributeName" extId="0"
+           		<sys:treeselect id="attribute" name="attribute" value="${empty _cfg.attribute?0:_cfg.attribute}" labelName="attributeName" extId="0"
 				labelValue="${attributeValue}"
 					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
@@ -131,7 +131,7 @@
 				    	<c:set var="lableValue" value="${lableValue},${fns:getServiceDictInfoById(_lable).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="lable" name="lable" value="${_cfg.lable}" labelName="lableName" extId="0"
+           		<sys:treeselect id="lable" name="lable" value="${empty _cfg.lable?0:_cfg.lable}" labelName="lableName" extId="0"
 				labelValue="${lableValue}"
 					title="label" url="/basics/serviceDictInfo/treeData?itType=3&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>

src/main/webapp/WEB-INF/tags/sys/treeselect.tag

@@ -30,7 +30,7 @@
 <%@ attribute name="enableSearch" type="java.lang.Boolean" required="false" description="是否开启节点搜索功能"%>
 <div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
-	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${empty value?labelValue:value}"
+	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${(empty value or value eq extId)?labelValue:value}"
 		class="${cssClass}" style="${cssStyle} background-color:transparent"/>
 		
 		<div class="input-group-btn">

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -83,7 +83,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -334,10 +333,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -83,7 +83,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -334,10 +333,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp

@@ -83,7 +83,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -341,10 +340,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -83,7 +83,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -342,10 +341,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -86,7 +86,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -332,10 +331,10 @@
 										</c:forEach>
 									</td> --%>
 									<%-- <td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td> --%>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -128,7 +128,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -321,7 +320,7 @@
 								    <th><spring:message code="social_app"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
 <%-- 								    <th><spring:message code="ratelimit"/></th>
- --%>								<th><spring:message code="block_type"/></th>
+ --%>								<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -359,10 +358,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -83,7 +83,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -341,10 +340,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp

@@ -81,7 +81,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -80,7 +80,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -351,10 +350,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp

@@ -101,7 +101,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								<div class="pull-left">

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="asn_policy"></spring:message></title>
+<title><spring:message code="ASN"></spring:message></title>
 <script type="text/javascript">
 $(function(){
 	$(".action").on("change", function() {
@@ -29,7 +29,7 @@ $(function(){
 <div class="page-content">
 
 	<h3 class="page-title">
-		<spring:message code="asn_policy"></spring:message>
+		<spring:message code="ASN"></spring:message>
 	</h3>
 	
 	<div class="row">

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="asn_policy"></spring:message></title>
+<title><spring:message code="ASN"></spring:message></title>
 
 <script>
 	 $(document).ready(function() {
@@ -95,7 +95,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="asn_policy"></spring:message>
+		<spring:message code="ASN"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -247,7 +246,7 @@
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="group"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.create_time"><spring:message code="block_type"/></th>
 									<%-- <th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -258,11 +257,11 @@
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
-									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
+									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
-									<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
+									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"/></th>
-									<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -290,10 +289,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -289,7 +289,7 @@
 									<th><spring:message code="port_pattern"/></th>
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -358,10 +358,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -281,7 +281,7 @@
 								    <th><spring:message code="is_case_insenstive"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
@@ -356,10 +356,10 @@
 									</td>
 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -87,7 +87,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -274,7 +273,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="src_file"/></th>
 									<th><spring:message code="sample_file"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="harm_level"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -289,7 +289,7 @@
 									<th><spring:message code="port_pattern"/></th>
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -358,10 +358,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -283,7 +283,7 @@
 								    <th><spring:message code="is_case_insenstive"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
@@ -358,10 +358,10 @@
 									</td>
 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -282,7 +282,7 @@
 									<th><spring:message code="sample_sign"/></th>
 									<th><spring:message code="harm_level"/></th>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="block_type"/></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>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp

@@ -446,7 +446,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -633,7 +632,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -675,10 +674,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -458,7 +458,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -646,7 +645,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -688,10 +687,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -131,7 +131,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -325,7 +324,7 @@
 								    <th><spring:message code="basic_protocol"/></th>
 								    <%-- <th><spring:message code="behaviour_type"/></th> --%>
 								   <%--  <th><spring:message code="ratelimit"/></th> --%>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -370,10 +369,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp

@@ -263,7 +263,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="domain_name"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
 									<th><spring:message code="is_hex"/></th>
@@ -320,14 +320,20 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('WHETHER_AREA_BLOCK')}" var="areaC">
+										<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>
+										<%-- <c:forEach items="${fns:getDictList('WHETHER_AREA_BLOCK')}" var="areaC">
 											<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'no'}"><spring:message code="${areaC.itemValue }"/></c:if>
 											<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'yes'}">
 											<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
 													<spring:message code="${areaC.itemValue }"/>
 												</a>
 											</c:if>
-										</c:forEach>
+										</c:forEach> --%>
 									</td>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
 									<td>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -145,7 +145,11 @@
 									<form:select path="isAudit" class="selectpicker select2 input-small">
 										<form:option value=""><spring:message code="all_states"/></form:option>
 										<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
-									       <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
+									       <c:if test="${auditC.itemCode ne 3}">
+									       	<form:option value="${auditC.itemCode}">
+									       		<spring:message code="${auditC.itemValue}"/>
+									       	</form:option>
+									       </c:if>
 							            </c:forEach>
 									</form:select>
 								</div>
@@ -345,7 +349,7 @@
 									<th exportColumn="client_ip"><spring:message code="IP"/></th>
 									<th exportColumn="client_port"><spring:message code="port"/></th>
 									</c:if>
-									<th exportColumn="block_type"><spring:message code="block_type"/></th>
+									<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'}">
@@ -432,10 +436,10 @@
 									</td>
 									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -92,7 +92,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -285,7 +284,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -290,7 +290,7 @@
 									<th><spring:message code="port_pattern"/></th>
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 								<th><spring:message code="classification"/></th>
@@ -350,10 +350,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -282,7 +282,7 @@
 									<%-- <th><spring:message code="port"/></th> --%>
 									<th><spring:message code="ip_pattern"/></th>
 									<%-- <th><spring:message code="port_pattern"/></th> --%>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp

@@ -131,7 +131,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -325,7 +324,7 @@
 								    <th><spring:message code="encrypted_tunnel_behavior"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
 								   <%--  <th><spring:message code="ratelimit"/></th> --%>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -370,10 +369,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -123,7 +123,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -311,7 +310,7 @@
 								    <th><spring:message code="raw_len"/></th>
 								    <th><spring:message code="cfds_level"/></th>
 								    <th><spring:message code="file_url"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -359,10 +358,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -125,7 +125,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -313,7 +312,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -355,10 +354,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -304,7 +303,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -346,10 +345,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -128,7 +128,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -323,7 +322,7 @@
 							    		<th><spring:message code="replaced_content"/></th>
 							    		<th><spring:message code="replace_content"/></th>
 							    	</c:if>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -402,10 +401,10 @@
 										</c:forEach>
 									</td> --%>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -89,7 +89,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								<div class="pull-left">	
@@ -287,7 +286,7 @@
 									<th><spring:message code="server_address_mask"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="server_port_mask"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<c:choose>
 										<c:when test="${action==5}">
 										</c:when>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -133,10 +132,6 @@
                                         	<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="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
-												<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:select>
 									
                                          </div>
@@ -308,7 +303,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -350,10 +345,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -122,7 +122,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -309,7 +308,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -351,10 +350,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp

@@ -266,7 +266,7 @@
 			 						<th><spring:message code="res_group_num"/></th>
 									<th><spring:message code="min_ttl"/></th>
 									<th><spring:message code="max_ttl"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -321,10 +321,10 @@
 										</c:choose>
 									</td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -268,7 +268,7 @@
 									<th><spring:message code="direction"/></th> --%>
 									<th><spring:message code="location"/></th>
 									<th><spring:message code="ip_type"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>

src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp

@@ -114,7 +114,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								<div class="pull-left">
@@ -381,7 +380,7 @@
 										</c:if>
 									</c:forEach>
 									<%--遍历子表属性 --%>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="classification"/></th>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -123,7 +123,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -311,7 +310,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -353,10 +352,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -123,7 +123,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -310,7 +309,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -352,10 +351,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -311,7 +311,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -505,7 +504,7 @@
 									<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><spring:message code="block_type"/></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>
 										<th><spring:message code="response_content"/></th>
@@ -620,10 +619,10 @@
 										</td>
 									</c:if>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp

@@ -262,7 +262,7 @@
 								    <th><spring:message code="is_case_insenstive"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -330,10 +330,10 @@
 									</td>
 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp

@@ -263,7 +263,7 @@
 								    <th><spring:message code="is_case_insenstive"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -331,10 +331,10 @@
 									</td>
 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<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="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp

@@ -86,7 +86,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								

src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp

@@ -91,7 +91,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -267,7 +266,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<c:choose>
 										<c:when test="${action==5}">
 										</c:when>

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -309,7 +308,7 @@
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="policy_name"/></th>
-									<th><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -356,10 +355,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -279,7 +279,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -466,7 +465,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -508,10 +507,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -308,7 +307,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -350,10 +349,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -308,7 +307,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -350,10 +349,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp

@@ -121,7 +121,6 @@
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
 								
@@ -308,7 +307,7 @@
 									<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><spring:message code="block_type"/></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>
 									<th><spring:message code="letter"/></th>
@@ -350,10 +349,10 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
-													<spring:message code="yes"/>
+													<spring:message code="selective"/>
 												</a>
 										</c:if>
 									</td>

src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp

@@ -211,7 +211,11 @@ $(document).ready(function(){
 									</td>
 									
 									<td>
-									<c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
+										<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(log.ftpUrl,0,42) }
+										</a>
+									<%-- <c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
 										<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${fn:substring(log.ftpUrl,0,20) }
@@ -222,7 +226,7 @@ $(document).ready(function(){
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											ftp://${fn:substring(log.ftpUrl,0,20) }
 										</a>
-									</c:if>	
+									</c:if> --%>	
 									</td>
 									
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp

@@ -172,7 +172,7 @@
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
 								
-								<th>URL</th>
+								 <th>  URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> 
 								<th><spring:message code="req_hdr_key"/></th>
 								<th><spring:message code="req_hdr_file"/></th>
 								<th><spring:message code="req_body_key"/></th>
@@ -226,12 +226,13 @@
 									</td>
 									
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+										${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 													${log.url}
 												</c:if>
 												<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 													http://${log.url}
-												</c:if>
+												</c:if> --%>
 									</td>
 									<td>${log.reqHdrKey }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -151,7 +151,7 @@
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
-								<th>URL</th>
+								<th> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code="server_ip"/></th>
@@ -186,12 +186,13 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+									${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 											${log.url}
 										</c:if>
 										<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 											http://${log.url}
-										</c:if>
+										</c:if> --%>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto }</td>

src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp

@@ -186,6 +186,11 @@
 					$("#businessType"+cfgType).selectpicker("val","");
 					$("#businessType"+cfgType).parents(".businessType").addClass("hidden");
 				}
+				if(!$(this).val()||$(this).val()==0){
+					$("#isLeaf").val(0);
+				}else{
+					$("#isLeaf").val(1);
+				}
 			});
 		});
 	</script>
@@ -341,7 +346,7 @@
 														<div for="groupId"></div>
 													</div> 
 													
-													 <div class="form-group hidden">
+													 <%-- <div class="form-group hidden">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 														<div class="col-md-4">
 															<form:select path="isLeaf"  class="form-control leafChange">
@@ -350,7 +355,13 @@
 																		</c:forEach>				                    
 															</form:select>
 														</div>
-													</div>  
+													</div>  --%> 
+													<c:if test="${not empty specificServiceCfg and specificServiceCfg.isLeaf ne null}">
+														<input type="hidden" name="isLeaf" id="isLeaf" value="${specificServiceCfg.isLeaf}">
+													</c:if>
+													<c:if test="${empty specificServiceCfg or specificServiceCfg.isLeaf eq null}">
+														<input type="hidden" name="isLeaf" id="isLeaf" value="0">
+													</c:if>
 													 <%-- <div class="form-group">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label>
 														<div class="col-md-4">

src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp

@@ -238,7 +238,7 @@
 									<div class="col-md-2">
 										<div class="form-group">
                                             <label><spring:message code="business_type"/>：</label>
-	                                          <form:select path="businessType" class="selectpicker select2 input-middle" >
+	                                          <form:select path="businessType" class="selectpicker select2 input-middle" data-live-search="true" data-live-search-placeholder="search">
 	                                          	<form:option value=""><spring:message code='business_type'/></form:option>
 	                                          	<c:if test="${specificServiceCfg.cfgType==1}">
 	                                          		<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE') }" var="dict">
@@ -313,7 +313,7 @@
 									</c:if>
 								  </th>
 								   <%-- <th><spring:message code="group_id"/></th> --%>
-								   <th><spring:message code="is_leaf"/></th>
+								  <%--  <th><spring:message code="is_leaf"/></th> --%>
 								   <th><spring:message code="cfg_type"/></th>
 								   <th class="sort-column op_time"><spring:message code="operate_time"/></th>
   							    </tr>
@@ -350,7 +350,7 @@
 												<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
 												<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
 												<%-- <td>${specificServiceCfg.groupId }</td> --%>
-												<td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td>
+												<%-- <td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td> --%>
 												<td><c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
 													<c:if test="${dict.itemCode==specificServiceCfg.cfgType}"><spring:message code="${dict.itemValue}"/></c:if>
 													</c:forEach>

src/main/webapp/static/global/css/page.css

@@ -83,3 +83,10 @@
 	margin:-3px 0 0 0;
 	text-align:center;
 }
+.keyword-disinline {
+	width: 1130px;
+	display: block;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: normal;
+}