diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f8711f3e7..899f4f0af 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2483,7 +2483,9 @@ public class BaseController { String specServiceId=request.getParameter("appId"); String behaviorId=request.getParameter("behaviorId"); SpecificServiceCfg specificServiceCfg=null; - if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145) { + if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145|| + serviceDict.getServiceId().intValue()==35||serviceDict.getServiceId().intValue()==147|| + serviceDict.getServiceId().intValue()==36||serviceDict.getServiceId().intValue()==148) { if(StringUtils.isNotBlank(specServiceId)) { specificServiceCfg=specificServiceCfgService.getBySpecServiceId(Integer.parseInt(specServiceId)); } @@ -2508,7 +2510,9 @@ public class BaseController { cfg.setServiceId(serviceDict.getServiceId()); cfg.setTableName("ip_port_cfg"); cfg.setCompileId(ipCfgService.getCompileId()); - if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145) { + if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145|| + serviceDict.getServiceId().intValue()==35||serviceDict.getServiceId().intValue()==147|| + serviceDict.getServiceId().intValue()==36||serviceDict.getServiceId().intValue()==148) { if(specificServiceCfg!=null&&appRegion!=null) { AppPolicyCfg appPolicyCfg=new AppPolicyCfg(); BeanUtils.copyProperties(cfg, appPolicyCfg); diff --git a/src/main/resources/sql/20181020/update_app_policy_region_service_.sql b/src/main/resources/sql/20181020/update_app_policy_region_service_.sql new file mode 100644 index 000000000..3addc3c66 --- /dev/null +++ b/src/main/resources/sql/20181020/update_app_policy_region_service_.sql @@ -0,0 +1,7 @@ +UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=63; +UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=407; +UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=408; + +UPDATE function_region_dict SET is_import=1 WHERE function_id=63 AND config_service_type='app_policy'; +UPDATE function_region_dict SET is_import=1 WHERE function_id=407 AND config_service_type='app_policy'; +UPDATE function_region_dict SET is_import=1 WHERE function_id=408 AND config_service_type='app_policy'; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index 258c106df..9b85673d4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -101,6 +101,9 @@ onClick="javascript:window.location='${ctx}/basicprotocol/form?functionId=${cfg.functionId}'"> + @@ -489,6 +492,8 @@ - + + +<%@include file="/WEB-INF/include/excel/importModal.jsp" %> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index 557ab6e57..346710bd6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -98,6 +98,9 @@ onClick="javascript:window.location='${ctx}/encryptedtunnelbehav/form?functionId=${cfg.functionId}'"> + @@ -486,6 +489,8 @@ - + + +<%@include file="/WEB-INF/include/excel/importModal.jsp" %> \ No newline at end of file