diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 6a58c7ea7..dfbe2285c 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -261,18 +261,20 @@ public class BaseCfg extends BaseEntity implements Cloneable{ */ @ExcelField(title="do_log",dictType="DO_LOG",sort=30) protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT; + @ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31) + protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT; protected Integer groupId;//仅用于copy属性使用 protected Integer regionId;//仅用于copy属性使用 -// protected Integer numberRegionGroupId;//仅用于copy属性使用 + protected Integer numberRegionGroupId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用 -// public Integer getNumberRegionGroupId() { -// return numberRegionGroupId; -// } -// public void setNumberRegionGroupId(Integer numberRegionGroupId) { -// this.numberRegionGroupId = numberRegionGroupId; -// } + public Integer getNumberRegionGroupId() { + return numberRegionGroupId; + } + public void setNumberRegionGroupId(Integer numberRegionGroupId) { + this.numberRegionGroupId = numberRegionGroupId; + } public Integer getNumberRegionRegionId() { return numberRegionRegionId; } @@ -964,5 +966,11 @@ public class BaseCfg extends BaseEntity implements Cloneable{ public void setCancelRequestId(Integer cancelRequestId) { this.cancelRequestId = cancelRequestId; } + public Integer getDoBlackList() { + return doBlackList; + } + public void setDoBlackList(Integer doBlackList) { + this.doBlackList = doBlackList; + } } diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 146de6aa4..864c34c6a 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -69,7 +69,28 @@ public class BaseIpCfg extends BaseCfg { protected Integer appCode;//仅用于copy属性使用 protected Integer behavCode;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用 + protected String antiddosProtocol;//仅用于copy属性使用 + protected Long bpsThreadshold;//仅用于copy属性使用 + protected Long ppsThreadshold;//仅用于copy属性使用 + public String getAntiddosProtocol() { + return antiddosProtocol; + } + public void setAntiddosProtocol(String antiddosProtocol) { + this.antiddosProtocol = antiddosProtocol; + } + public Long getBpsThreadshold() { + return bpsThreadshold; + } + public void setBpsThreadshold(Long bpsThreadshold) { + this.bpsThreadshold = bpsThreadshold; + } + public Long getPpsThreadshold() { + return ppsThreadshold; + } + public void setPpsThreadshold(Long ppsThreadshold) { + this.ppsThreadshold = ppsThreadshold; + } public Integer getAppCode() { return appCode; } diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index a75f3405e..8e14a2720 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -44,6 +44,14 @@ public class BaseStringCfg extends BaseCfg { protected Integer behavCode;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用 protected String domain;//仅用于copy属性使用 + protected Integer dnsStrategyId;//仅用作复制属性使用 + + public Integer getDnsStrategyId() { + return dnsStrategyId; + } + public void setDnsStrategyId(Integer dnsStrategyId) { + this.dnsStrategyId = dnsStrategyId; + } public String getDomain() { return domain; } diff --git a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java index ba5b6e5e9..eb7004088 100644 --- a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java +++ b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java @@ -16,7 +16,7 @@ public class DnsResStrategy extends BaseCfg { private static final long serialVersionUID = -2720862431960415564L; private String indexTable="dns_res_strategy"; private Integer resGroup1Id; - @ExcelField(title="res_group_num",sort=3) + @ExcelField(title="res_group_num",sort=4) private Integer resGroup1Num; private Integer resGroup2Id; private Integer resGroup2Num; @@ -28,9 +28,9 @@ public class DnsResStrategy extends BaseCfg { private Integer resGroup5Num; private Integer minTtl; private Integer maxTtl; - @ExcelField(title="group",sort=2) + @ExcelField(title="group",sort=3) private String group1Name; - @ExcelField(title="min_ttl",sort=4) + @ExcelField(title="min_ttl",sort=5) private String miTtlmax; //仅作导入使用 private String ttl; diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index f0a091425..bcbf489e0 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -561,6 +561,9 @@ public class MaatCfg implements Serializable { this.areaEffectiveIds = areaEffectiveIds; } public Integer getDoBlackList() { + if(doBlackList==null){ + doBlackList = 1; + } return doBlackList; } public void setDoBlackList(Integer doBlackList) { @@ -678,7 +681,7 @@ public class MaatCfg implements Serializable { } public void initDefaultValue() { this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT; - this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT; +// this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT; this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT; this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT; this.startTime=new Date(); diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 6019e3212..0b96126c7 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -216,7 +216,14 @@ public class ExcelCsv { } if(!StringUtil.isEmpty(titleStr)){ //去掉不需要展示的header - if(!(noExportField.indexOf(","+titleStr+",") > -1)){ + //去掉不需要展示的header + String noExport=""; + if(noExportField.contains("&")){ + noExport=noExportField.substring(0,noExportField.indexOf("&")); + }else{ + noExport=noExportField; + } + if(!(noExport.indexOf(","+titleStr+",") > -1)){ //需要替换的header boolean flag=true; if(noExportField.contains("&")){ diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 11f28f167..fe63edeb2 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2218,7 +2218,13 @@ public class ExportExcel { } if(!StringUtil.isEmpty(titleStr)){ //去掉不需要展示的header - if(!(noExportField.indexOf(","+titleStr+",") > -1)){ + String noExport=""; + if(noExportField.contains("&")){ + noExport=noExportField.substring(0,noExportField.indexOf("&")); + }else{ + noExport=noExportField; + } + if(!(noExport.indexOf(","+titleStr+",") > -1)){ //需要替换的header boolean flag=true; if(noExportField.contains("&")){ diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f36a6df61..de827a5e8 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1507,7 +1507,7 @@ public class BaseController { List compileIds=Lists.newArrayList(); List regionIds=Lists.newArrayList(); List groupIds=Lists.newArrayList(); -// List numRegionGroupIds=Lists.newArrayList(); + List numRegionGroupIds=Lists.newArrayList(); List numRegionRegionIds=Lists.newArrayList(); if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 try { @@ -1517,7 +1517,7 @@ public class BaseController { regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); //需要获取数值域的id if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) { -// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); + numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); } } @@ -1558,9 +1558,9 @@ public class BaseController { cfg.setRegionId(regionIds.get(ind)); } if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { -// if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { -// cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); -// } + if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { + cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); + } if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); } @@ -1758,8 +1758,14 @@ public class BaseController { while(!complexkeywordCfgs.isEmpty()) { complexkeywordCfgs.drainTo(_complexkeywordCfgs, Constants.MAAT_JSON_SEND_SIZE); List compileIds=Lists.newArrayList(); + List groupIds=Lists.newArrayList(); + List regionIds=Lists.newArrayList(); try { compileIds = ConfigServiceUtil.getId(1,_complexkeywordCfgs.size()); + if(isSend.equals("1")) { + groupIds = ConfigServiceUtil.getId(2,_complexkeywordCfgs.size()); + regionIds = ConfigServiceUtil.getId(3,_complexkeywordCfgs.size()); + } } catch (Exception e) { e.printStackTrace(); logger.info("获取编译ID出错"); @@ -1776,8 +1782,23 @@ public class BaseController { cfg.setCreatorId(UserUtils.getUser().getId()); cfg.setDoLog(2); cfg.setFunctionId(regionDict.getFunctionId()); - cfg.setIsAudit(0); - cfg.setIsValid(0); + if(isSend.equals("1")) { + cfg.setIsAudit(Constants.AUDIT_YES); + cfg.setIsValid(Constants.VALID_YES); + cfg.setAuditorId(UserUtils.getUser().getId()); + cfg.setAuditTime(date); + if(groupIds!=null&&groupIds.size()==_complexkeywordCfgs.size()) { + cfg.setGroupId(groupIds.get(ind)); + } + if(regionIds!=null&®ionIds.size()==_complexkeywordCfgs.size()) { + cfg.setRegionId(regionIds.get(ind)); + } + }else { + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setIsValid(Constants.VALID_NO); + } + //cfg.setIsAudit(0); + //cfg.setIsValid(0); cfg.setIsAreaEffective(0); cfg.setLable("0"); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index bd907b350..7ac57414d 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -333,13 +333,13 @@ public class InterceptController extends CommonController { dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList); } else if (entity.getFunctionId() == 200) {// IP拦截 - cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion2:ratelimit-userregion1:certificate-"; + cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,userregion2,&userregion1:intercept_file_strategy-"; titleList.add("PXY_INTERCEPT_IP"); classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); dataMap.put("PXY_INTERCEPT_IP", ipList); } else if (entity.getFunctionId() == 201) {// 域名拦截 - cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:certificate-userregion5:intercept_intensity-"; + cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:intercept_file_strategy-userregion5:intercept_intensity-"; titleList.add("NTC_HTTP_URL"); classMap.put("NTC_HTTP_URL", HttpUrlCfg.class); noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport); @@ -357,6 +357,10 @@ public class InterceptController extends CommonController { if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; } + if (!StringUtil.isEmpty(entity.gethColumns())) { + cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; + } + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); /* } */ diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index e7f03a08b..14ad1aeae 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -301,12 +301,19 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="protocolList") @ResponseBody - public List protocolList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){ + public List protocolList(Model model,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){ Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST; try { url=urlAddDate(url,beginDate,endDate); + if(protoType!=null){ + for (Integer dom : protoType) { + if(dom!=null){ + url=url+"&protoType="+dom; + } + } + } String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); @@ -372,14 +379,18 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="appList") @ResponseBody - public List appList(@RequestParam(value="appType",required=false)Integer appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){ + public List appList(@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){ Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST; try { url=urlAddDate(url,beginDate,endDate); - if(!StringUtil.isEmpty(appType)){ - url=url+"&appType="+appType; + if(appType!=null){ + for (Integer dom : appType) { + if(dom!=null){ + url=url+"&appType="+dom; + } + } } String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); diff --git a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java index d8fabfdcf..6c39d5fa0 100644 --- a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java +++ b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java @@ -42,9 +42,14 @@ public class DynamicIndexController extends BaseController { public String dynamicIndex(HttpServletRequest request){ String serviceIds = request.getParameter("sid"); String baseNum = request.getParameter("baseNum"); - Object trafficAreaStat = trafficAreaStat(null, Integer.parseInt(baseNum)); - Object dropStat = dropStat(null, Integer.parseInt(baseNum)); - Object logStat = logStat(null, serviceIds, Integer.parseInt(baseNum)); + String hourStr = request.getParameter("hour"); + Integer hour = null; + if(hourStr!=null &&!"".equals(hourStr)){ + hour = Integer.parseInt(hourStr); + } + Object trafficAreaStat = trafficAreaStat(hour, Integer.parseInt(baseNum)); + Object dropStat = dropStat(hour, Integer.parseInt(baseNum)); + Object logStat = logStat(hour, serviceIds, Integer.parseInt(baseNum)); Gson gson = new GsonBuilder().create(); String trafficJson = gson.toJson(trafficAreaStat); String dropJson = gson.toJson(dropStat); @@ -93,12 +98,12 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + hour = 1; } Date now = new Date(); - Date start = new Date(now.getTime()-(hour*60*60*1000)); - + Date start = new Date(now.getTime()-(hour*60*60*1000)-(5*60*1000)); + now = new Date(now.getTime()-5*60*1000); String nowString = DateUtils.formatDate(now, "yyyy-MM-dd HH:mm:ss"); String startString = DateUtils.formatDate(start, "yyyy-MM-dd HH:mm:ss"); /*nowString = "2018-12-05 00:00:00"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java index 7cad815c5..a8f33f21a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java @@ -130,7 +130,7 @@ public class OpenVpnLogController extends BaseController{ }else{ hColumns+=","; } - String cfgIndexInfoNoExport=",cfg_id,action,"+hColumns; + String cfgIndexInfoNoExport=","+hColumns; noExportMap.put("spoofing_ip_policy",cfgIndexInfoNoExport); dataMap.put("spoofing_ip_policy",list); String timeRange= initLogMap(log,"spoofing_ip_policy"); diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml index 1ca23e1cd..d551d6440 100644 --- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml @@ -28,6 +28,7 @@ + @@ -35,7 +36,7 @@ r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.user_region1, - r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log + r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log,r.do_blacklist + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index b207b2535..1e828be7c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -385,6 +385,7 @@ + @@ -433,6 +434,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index 2aa5d678d..a31873033 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -237,6 +237,26 @@ +
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index bc3d40922..d1dfb8600 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -377,6 +377,7 @@ + @@ -423,6 +424,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index f5cf0f263..a928651ac 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -239,6 +239,26 @@ +
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index 8163a4824..e24fc57a9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -357,6 +357,7 @@ + @@ -403,6 +404,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index 7edadf09a..a24a8400c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -212,6 +212,26 @@ +
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 83235c1cf..d85e22714 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -371,6 +371,7 @@ + @@ -416,6 +417,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 1a2c8533c..9599766bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -535,6 +535,26 @@ var showHideIPSECProtocol=function(obj){ +
+
+ + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index c5483e519..447b457b7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -372,6 +372,7 @@ + @@ -419,6 +420,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp index 703d6b6f3..bfa3828dc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -207,6 +207,26 @@ +
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 062bc321d..5a359ae09 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -371,6 +371,7 @@ + @@ -417,6 +418,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index bffba7ce0..2202d784d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -562,17 +562,17 @@ - - + + - - + + - - - + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 2119a0a41..42efd130b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -219,6 +219,27 @@ +
+
+ + + + + + + + + + + + +
+
+
+
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index f3bb6f2fc..532032942 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -527,6 +527,7 @@ + @@ -572,6 +573,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index a39eb30ec..ea8fb3de1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -225,6 +225,26 @@ +
+
+ + + + + + + + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index dd50bd32d..43bf6ca58 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -368,6 +368,7 @@ + @@ -414,6 +415,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index 4746eea48..0e3f105de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -210,6 +210,26 @@ +
+
+ + + + + + + + + + + + +
+

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index da7b8b1aa..1378338ff 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -349,6 +349,7 @@ + @@ -395,6 +396,13 @@ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp index 800217ec5..e6b540661 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp @@ -60,6 +60,7 @@ <%-- --%> + +