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/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/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/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/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index cfd89da34..57e71be88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -367,7 +367,7 @@ - + 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 @@ - - + + - - + + - - - + + +