IP/domain intercepter增加whitelist

修改配置统计界面无效的service不显示

src/main/resources/messages/message_en.properties

@@ -981,6 +981,8 @@ xmpp_monit=XMPP Monitoring
 xmpp_reject=XMPP Control
 ip_intercepter_monit=IP Intercepter
 domain_monit=Domain Intercepter
+ip_intercepter_whitelist=IP White List
+domain_monit_whitelist=Domain White List
 dns_strategy_reject=DNS Response Strategy Control
 proxy_http_req_body_replace=HTTP Request Content Replacement
 proxy_http_res_body_replace=HTTP Response Content Replacement

src/main/resources/messages/message_zh_CN.properties

@@ -982,6 +982,8 @@ xmpp_monit=XMPP\u76D1\u6D4B
 xmpp_reject=xmpp\u7BA1\u63A7
 ip_intercepter_monit=IP\u62E6\u622A
 domain_monit=\u57DF\u540D\u62E6\u622A
+ip_intercepter_whitelist=IP\u62E6\u622A\u767D\u540D\u5355
+domain_monit_whitelist=\u57DF\u540D\u62E6\u622A\u767D\u540D\u5355
 dns_strategy_reject=DNS\u54CD\u5E94\u7B56\u7565\u7BA1\u63A7
 proxy_http_req_body_replace=PXY HTTP\u8BF7\u6C42\u5185\u5BB9\u66FF\u6362
 proxy_http_res_body_replace=PXY HTTP\u54CD\u5E94\u5185\u5BB9\u66FF\u6362

src/main/resources/sql/add_intercepter_whitelist_service.sql

@@ -0,0 +1,11 @@
+  INSERT INTO function_service_dict
+   ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`)
+VALUES
+   ( 200, 0, 128, 'whitelist', 514, 'ip_intercepter_whitelist', '', 1,NULL , NULL,NULL , NULL);
+
+INSERT INTO function_service_dict
+   ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`)
+VALUES
+   ( 201, 0, 128, 'whitelist', 515, 'domain_whitelist', '', 1,NULL , NULL, NULL, NULL);
+
+ update function_service_dict set is_valid=0 where dict_id in(66,67);

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

@@ -124,21 +124,24 @@
 											</div>
 										</div>
 										<c:if test="${fn:length(serviceList)>1}">
-											<div class="row">
 									    <div class="col-md-6">
 									        <div class="form-group">
-														<label class="control-label col-md-3"><font
-															color="red">*</font>
-														<spring:message code="action" /></label>
+									            <label class="control-label col-md-3"><spring:message code="action"/></label>
 									            <div class="col-md-6">
-															<c:forEach items="${serviceList}" var="service">
+									            	<c:forEach items="${serviceList}" var="service"
+														varStatus="satus">
 														<label class="radio-inline"> <c:if
 																test="${_cfg.functionId eq service.functionId}">
 																<input type="radio" name="action"
 																	serviceId="${service.serviceId }"
+																	protocolId="${service.protocolId }"
 																	value="${service.action }" class="required action"
-																			<c:if test="${_cfg.action==service.action}">checked</c:if>>
-																		<spring:message code="${service.actionCode }" />
+																	<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
 															</c:if>
 														</label>
 													</c:forEach>
@@ -146,7 +149,6 @@
 									            <div for="action"></div>
 									       </div>
 									   </div>
-											</div>
 								   </c:if>
 									</div>
 									<div class="row">

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

@@ -229,10 +229,11 @@
 		</div> --%>
 		<c:forEach items="${serviceList }" var="serviceDict">
 			<c:if test="${serviceDict.functionId== cfg.functionId}">
-				<c:set var="serviceName" value="${serviceDict.serviceName }"/>
+				<c:set var="serviceName1" value="${serviceDict.serviceName }"/>
 				<c:set var="action" value="${serviceDict.action }"/>
 			</c:if>
 		</c:forEach>
+		${serviceName1 }
 		<div class="theme-panel hidden-xs hidden-sm">
 		<c:if test="${action eq 16 }">
 			<c:set var="configPermissionName" value="control:httpBlock:config"/>
@@ -277,7 +278,7 @@
 
 	<h3 class="page-title">
 		
-		<spring:message code="${serviceName }"></spring:message>
+		<spring:message code="${serviceName1 }"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/index.jsp

@@ -95,13 +95,16 @@
 						</thead>
 						<tbody>
 							<c:forEach items="${configStatistics }" var="statistics" varStatus="status" step="1">
-								<tr>
-								<td>	
+								<c:set var="serviceName" value=""></c:set>
 								<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
 									<c:if test="${serviceDict.serviceId eq statistics.service }">
-											<spring:message code="${serviceDict.serviceName }"/>
+										<c:set var="serviceName" value="${serviceDict.serviceName }"></c:set>
 									</c:if>
 								</c:forEach>
+								<c:if test="${!empty serviceName }">
+									<tr>
+										<td>	
+										<spring:message code="${serviceName }"/>
 										</td>
 										<td>
 											${statistics.approved }
@@ -119,6 +122,7 @@
 											${statistics.deleted }
 										</td>
 									</tr>
+								</c:if>
 							</c:forEach>
 						</tbody>
 					</table>