From df690cffd3221921f801d8214f5ad383a6c98c15 Mon Sep 17 00:00:00 2001 From: wangwei Date: Sat, 8 Jun 2019 15:36:06 +0800 Subject: [PATCH] =?UTF-8?q?http(s)=20=E7=9B=91=E6=B5=8B=E3=80=81=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E7=BD=AE"{}",http(s)=20=E9=98=BB=E6=96=AD=E3=80=81?= =?UTF-8?q?=E6=93=8D=E6=8E=A7=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97=E6=80=BB?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/SchedulerTaskUtil.java | 7 ++++--- .../configuration/proxy/HttpRedirectPolicyController.java | 2 +- .../configuration/proxy/ManipulatPolicyController.java | 2 +- .../configuration/ConfigSynchronizationService.java | 5 +++-- .../web/service/configuration/HttpRedirectCfgService.java | 4 ++++ .../WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp | 4 ++-- .../views/cfg/proxy/control/manipulatPolicyList.jsp | 4 ++-- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java index c134af774..c09be8ff4 100644 --- a/src/main/java/com/nis/util/SchedulerTaskUtil.java +++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java @@ -254,10 +254,11 @@ public class SchedulerTaskUtil { if(entity.getServiceId().equals(656)) { userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion); } - //Intercept Policy - else if(entity.getServiceId().equals(521)) { + //Intercept Policy、http(s) 监测 、http(s) 白名单 + else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592) + || entity.getServiceId().equals(750)) { userRegion="{}"; - } + } for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 ip.setIsValid(entity.getIsValid()); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 53d39418b..f0765f627 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/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) { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java index 5212497cc..c80fe35ae 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java +++ b/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" diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 2db348d41..2f3f6abca 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/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 - else if(entity.getServiceId().equals(521)) { + //Intercept Policy、http(s) 监测 、http(s) 白名单 + else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592) + || entity.getServiceId().equals(750)) { userRegion="{}"; } diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 8de38acc4..0e799a522 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -549,6 +549,10 @@ public class HttpRedirectCfgService extends CrudService - + @@ -718,7 +718,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp index d5d6166d9..e53c85076 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp @@ -409,7 +409,7 @@ - + <%-- --%> @@ -567,7 +567,7 @@ -
+ <%--
--%>