配置列表增加action查询条件.

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"})

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";
 	}
 	

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";
 	}
 	

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"})

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"})

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";
 	}
 	

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>

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>

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">

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">

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>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												
+											</form:select>
-                                            </div>
+									
-                                            
+                                         </div>
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+                                         
-                                     
+                                         <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">

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>

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>

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>

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">

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">

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">

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">

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>

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">

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>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												
+											</form:select>
-                                            </div>
+									
-                                            
+                                         </div>
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+                                         
+                                         <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>

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">

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>

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>

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>

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>
+												<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>
+                                         
+                                         <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">

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>

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>

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">

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>

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>

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">

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>
+												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-                                            </div>
+											</form:select>
-                                            
+									
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
+                                         </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>

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>

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>

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>

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>

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>

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>

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));

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));

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();