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

恢复之前的定时任务配置取消不走综合服务的问题；

Browse Source 
去掉英文国际化的合并记录

Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
duandongmei
2019-05-05 11:02:11 +08:00
committed by 段冬梅
parent 1eaa2e668b
commit 00ffdd863c
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -554,7 +554,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("http配置下发响应信息："+result.getMsg());
}else if(isAudit==3 && entity.getIsValid() == 1) {
}else if(isAudit==3) {
maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效

4
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -410,7 +410,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
logger.error("欺骗IP池配置配置下发失败",e);
throw e;
}
}else if(entity.getIsAudit()==3 && entity.getIsValid() == 1) {
}else if(entity.getIsAudit()==3) {
PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
cfg.setIsValid(0);
cfg.setCompileId(pool.getCompileId());
@@ -592,7 +592,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg());
}else if(isAudit==3 && entity.getIsValid() == 1) {
}else if(isAudit==3) {
maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效

2
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -734,7 +734,7 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
throw new RuntimeException(
"<spring:message code=\"request_service_failed\"/>:" + props.getProperty("unknown_cfg_type"));
}
} else if (isAudit == 3 && entity.getIsValid() == 1) {
} else if (isAudit == 3) {
if (maatType == Constants.CALLBACK_TYPE) {
List<InlineIp> ipList = new ArrayList<>();
for (IpPortCfg cfg : entity.getIpPortList()) {

11
src/main/resources/messages/message_en.properties
View File

@@ -1515,6 +1515,15 @@ src_ip_pattern=Client IP Pattern
dest_ip_pattern=Server IP Pattern
src_port_pattern=Client Port Pattern
dest_port_pattern=Server Port Pattern
url_group_configuration=URL Group Configuration
dns_keyword_group_configuration=DNS Keyword Group Configuration
app_ip_correlation=APP IP Correlation
ip_group=IP Group
common_ip_config=Common IP Config
common_group=Common Group
dns_keyword_group_manage=DNS Keyword Group Manage
old_asn_group_manage=ASN Group
url_group_manage=URL Group Manage
range_cross=Found intersections between Server IP address and Client IP address
app_ip_correlation=APP IP Correlation
public_private_file_error=Public-private key mismatch
public_private_file_error=Public-private key mismatch