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

去掉回调类配置批量下发的打印，打开asn的配置文件

Browse Source
This commit is contained in:
段冬梅
2019-03-12 11:01:53 +08:00
parent 62056ed718
commit ef5c6cdfa6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/service/configuration/CommonPolicyService.java
View File

@@ -165,7 +165,7 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
maatBean.setOpAction(Constants.UPDATE_ACTION); maatBean.setOpAction(Constants.UPDATE_ACTION);
//调用服务接口取消配置 //调用服务接口取消配置
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
if(StringUtil.isEmpty(list)) { if(!StringUtil.isEmpty(list)) {
logger.info("批量配置取消（"+page.getPageNo()+"次）个数："+list.size()); logger.info("批量配置取消（"+page.getPageNo()+"次）个数："+list.size());
} }
//调用服务接口下发配置 //调用服务接口下发配置
@@ -269,6 +269,8 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
* @throws ClassNotFoundException * @throws ClassNotFoundException
*/ */
public void auditCallBackData(List auditList,List compileIds,List ids,BaseCfg entity){ public void auditCallBackData(List auditList,List compileIds,List ids,BaseCfg entity){
long start=System.currentTimeMillis();
long end=System.currentTimeMillis();
if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) { if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
commonPolicyDao.auditCfgBatch( "cfg_index_info", entity,compileIds,null); commonPolicyDao.auditCfgBatch( "cfg_index_info", entity,compileIds,null);
} }
@@ -290,10 +292,17 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
}else if(entity.getIsAudit()==3){ }else if(entity.getIsAudit()==3){
//调用服务接口取消配置 //调用服务接口取消配置
String json=gsonToJson(auditList); String json=gsonToJson(auditList);
logger.info("批量下发配置参数："+json); //logger.info("批量下发配置参数："+json);
if(!StringUtil.isEmpty(auditList)) {
logger.info("批量配置取消个数："+auditList.size());
}
logger.info("回调配置批量失效-下发：start()");
start=System.currentTimeMillis();
//调用服务接口下发配置 //调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.put(json,2); ToMaatResult result = ConfigServiceUtil.put(json,2);
end=System.currentTimeMillis();
logger.info("批量响应信息："+result.getMsg()); logger.info("批量响应信息："+result.getMsg());
logger.info("回调配置批量失效-下发耗时：end("+(end-start)+")");
} }
} }
} }

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

@@ -18,14 +18,14 @@
<!-- <service id="128" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址监测"> <!-- <service id="128" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service> --> </service> -->
<!-- <service id="37" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN封堵"> <service id="37" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN封堵">
<serviceCfg cfgType="2" tableName="asn_keyword_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg> <serviceCfg cfgType="2" tableName="asn_keyword_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg>
<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"></userRegion> <userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
</service> </service>
<service id="149" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN监测"> <service id="149" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN监测">
<serviceCfg cfgType="2" tableName="asn_keyword_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg> <serviceCfg cfgType="2" tableName="asn_keyword_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg>
<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0" ></userRegion> <userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0" ></userRegion>
</service> --> </service>
<!-- <service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃"> <!-- <service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service> --> </service> -->