gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整IP拦截、DNS响应策略、IP Spoofing日志 导出后 列标题不对应

Browse Source
This commit is contained in:
leijun
2018-12-21 17:38:50 +08:00
parent 34e243fb3b
commit e85e987fca
7 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/configuration/DnsResStrategy.java
View File

@@ -16,7 +16,7 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
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<DnsResStrategy> {
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;

9
src/main/java/com/nis/util/excel/ExcelCsv.java
View File

@@ -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("&")){

8
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -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("&")){

8
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -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);
/* } */

2
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -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");

2
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -367,7 +367,7 @@
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="userregion2" ><spring:message code="ratelimit"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>

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

@@ -562,17 +562,17 @@
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<c:if test="${action == 16}">
<th column="response_code" ><spring:message code="response_code"/></th>
<th column="response_content" ><spring:message code="response_content"/></th>
<th column="userregion1" ><spring:message code="response_code"/></th>
<th column="userregion2" ><spring:message code="response_content"/></th>
</c:if>
<c:if test="${action == 48}">
<th column="redirect_response_code" ><spring:message code="redirect_response_code"/></th>
<th column="redirect_url" ><spring:message code="redirect_url"/></th>
<th column="userregion1" ><spring:message code="redirect_response_code"/></th>
<th column="userregion2" ><spring:message code="redirect_url"/></th>
</c:if>
<c:if test="${action == 80}">
<th column="replace_zone" ><spring:message code="replace_zone"/></th>
<th column="replaced_content" ><spring:message code="replaced_content"/></th>
<th column="replace_content" ><spring:message code="replace_content"/></th>
<th column="userregion1" ><spring:message code="replace_zone"/></th>
<th column="userregion2" ><spring:message code="replaced_content"/></th>
<th column="userregion3" ><spring:message code="replace_content"/></th>
</c:if>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<c:if test="${action ne 128}">