http(s) 监测、白名单自定义域下发置"{}",http(s) 阻断、操控去除日志总量

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

@@ -254,8 +254,9 @@ public class SchedulerTaskUtil {
 								if(entity.getServiceId().equals(656)) {
 									userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
 								}
-								//Intercept Policy
+								//Intercept Policy、http(s) 监测 、http(s) 白名单
-								else if(entity.getServiceId().equals(521)) {
+								else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592)
+										|| entity.getServiceId().equals(750)) {
 									userRegion="{}";
 								}
 								for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId

src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java

@@ -405,7 +405,7 @@ public class HttpRedirectPolicyController extends BaseController {
 			
 			String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 			if (entity.getFunctionId() == 207) {
-				cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-";
+				cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-";
 			} else if (entity.getFunctionId() == 208) {
 				cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-";
 			} else if (entity.getFunctionId() == 209) {

src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java

@@ -432,7 +432,7 @@ public class ManipulatPolicyController extends BaseController {
 				}
 			}
 			
-			String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,&method_export:method-responseCode:response_code-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
+			String cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion1,&method_export:method-responseCode:response_code-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
 			
 			String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 					+ ",config_time,editor,edit_time,auditor,audit_time"

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

@@ -477,8 +477,9 @@ public class ConfigSynchronizationService  extends BaseService{
 			if(entity.getServiceId().equals(656)) {
 				userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
 			}
-			//Intercept Policy
+			//Intercept Policy、http(s) 监测 、http(s) 白名单
-			else if(entity.getServiceId().equals(521)) {
+			else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592)
+					|| entity.getServiceId().equals(750)) {
 				userRegion="{}";
 			}
 			

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

@@ -549,6 +549,10 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			if(StringUtil.isEmpty(userRegion)){
 				userRegion=Constants.USER_REGION_PLACEHOLDER;
 			}
+			//http(s) 监测、http(s)  白名单
+			if(entity.getServiceId().equals(592) || entity.getServiceId().equals(750)) {
+				userRegion="{}";
+			}		
 			maatCfg.setUserRegion(userRegion);
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);

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

@@ -598,7 +598,7 @@
 									<c:if test="${action ne 128}">
 										<th column="do_log" ><spring:message code="do_log"/></th>
 									</c:if>
-									<c:if test="${action ne 128}">
+									<c:if test="${action ne 128 && action ne 16}">
 										 <th column="log_total" ><spring:message code="log_total"/></th> 
 									</c:if>
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -718,7 +718,7 @@
 											</c:forEach>
 										</td>
 									</c:if>
-									<c:if test="${action ne 128}">
+									<c:if test="${action ne 128 && action ne 16}">
 									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									</c:if>
 									<td>

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

@@ -409,7 +409,7 @@
 									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_schduler"/></th>
 									<th column="do_log" ><spring:message code="do_log"/></th>
-									<th column="log_total" ><spring:message code="log_total"/></th> 
+									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%> 
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
@@ -567,7 +567,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%> 
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">