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

//http url

Browse Source 
//dns
//mail address
//mail advanced
//https monitor
//https block
//https redirect
//https replace
//https whitelist
#以上业务的配置批量失效功能提交
This commit is contained in:
段冬梅
2019-02-28 17:55:56 +08:00
parent d8b05f9431
commit 6b37a95ee2
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
View File

@@ -70,6 +70,7 @@ public class ScheduleUpdateInterceptor extends BaseInterceptor{
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus"); EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus");
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao"); EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao");
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl"); EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl");
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.CommonPolicyDao.auditCfgBatch");
} }
/** /**
* is_valid 字段名 * is_valid 字段名

9
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -3240,6 +3240,15 @@ public class BaseController {
} }
} }
} }
//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
if(!StringUtil.isEmpty(entity)) {
BaseCfg base=(BaseCfg)entity ;
if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
base.setIsValid(null);
BeanUtils.copyProperties(base, entity);
}
}
} }

21
src/main/resources/service/service_config.xml
View File

@@ -40,7 +40,13 @@
<userRegion regionKey="nat_type" regionColumn="userRegion1" userRegionPosition="0"></userRegion> <userRegion regionKey="nat_type" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="spoofing_ip_pool" regionColumn="userRegion3" userRegionPosition="0"></userRegion> <userRegion regionKey="spoofing_ip_pool" regionColumn="userRegion3" userRegionPosition="0"></userRegion>
</service> </service>
<service id="2" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="URL白名单"> <service id="67" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="URL白名单">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<service id="129" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="URL监测">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<service id="17" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="URL阻断">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service> </service>
<!-- <service id="129" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"> <!-- <service id="129" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
@@ -94,23 +100,20 @@
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service> </service>
<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址白名单"> <service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
</service> </service>
<!--<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测"> <service id="132" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service> </service>
<service id="20" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵"> <service id="20" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵">
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> </service>
</service>--> <service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件监测">
<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service> </service>
<service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵"> <service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>

17
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -247,18 +247,27 @@ function cancelPassOpt(url){
} }
}else{ }else{
/* 批量下发待测试 //批量下发待测试
if(url.indexOf("functionId") > -1){ if(url.indexOf("functionId=6") > -1 //http url
|| url.indexOf("functionId=7") > -1 //dns
|| url.indexOf("functionId=37") > -1 //mail address
|| url.indexOf("functionId=35") > -1 //mail advanced
|| url.indexOf("functionId=210") > -1 //https monitor
|| url.indexOf("functionId=207") > -1 //mail block
|| url.indexOf("functionId=208") > -1 //mail redirect
|| url.indexOf("functionId=209") > -1 //mail replace
|| url.indexOf("functionId=211") > -1 //mail whitelist
){
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='cancle_all'/>",function(v,h,f){ top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='cancle_all'/>",function(v,h,f){
if(v=="ok"){ if(v=="ok"){
$("#searchForm").attr("action",url); $("#searchForm").attr("action",url);
page(); page();
} }
}); });
}else{ */ }else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
/* } */ }
} }
} }
function doAll(checkboxes,url){ function doAll(checkboxes,url){