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

(1)导入验证修正bug,多线程引入service调用时发生异常，将service调用dns响应策略，dns组改为从缓存中获取

Browse Source 
(2)DNS IP导入改为批量导入
This commit is contained in:
wangxin
2018-11-16 17:06:36 +08:00
parent 19be05a25d
commit 0ece4f5729
8 changed files with 98 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java
View File

@@ -21,22 +21,23 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.util.Constants;
import com.nis.web.service.configuration.DnsResStrategyService;
import com.nis.util.DictUtils;
public class CheckComplexStringFormatThread implements Callable<String>{
private Logger logger=Logger.getLogger(CheckComplexStringFormatThread.class);
private BlockingQueue<? extends Object> srcQueue;
private BlockingQueue<ComplexkeywordCfg> destQueue;
private Properties prop;
private DnsResStrategyService dnsResStrategyService;
private FunctionServiceDict serviceDict;
private FunctionRegionDict regionDict;
// private DnsResStrategyDao dnsResStrategyDao;
public CheckComplexStringFormatThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Properties prop,BlockingQueue<? extends Object> srcQueue,BlockingQueue<ComplexkeywordCfg> destQueue) {
this.serviceDict=serviceDict;
this.regionDict=regionDict;
this.srcQueue=srcQueue;
this.destQueue=destQueue;
this.prop=prop;
// this.dnsResStrategyDao=SpringContextHolder.getBean(DnsResStrategyDao.class);
}
@Override
public String call() throws Exception {
@@ -90,8 +91,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
if (regionDict.getFunctionId().equals(7)) {
Long dnsStrategyId = baseStringCfg.getDnsStrategyId();
if (dnsStrategyId != null&&dnsStrategyId>0) {
List<DnsResStrategy> dnsStrategys = dnsResStrategyService.findDnsResStrategys(dnsStrategyId,
Constants.VALID_YES, Constants.AUDIT_YES);
List<DnsResStrategy> dnsStrategys = DictUtils.getDnsResStrategyList(dnsStrategyId);
if (dnsStrategys == null || dnsStrategys.size() == 0) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("dns_res_strategy")) + ";");
@@ -309,10 +309,4 @@ public class CheckComplexStringFormatThread implements Callable<String>{
logger.warn("validate complexString data finish,cost:"+(end-start));
return stringList;
}
public DnsResStrategyService getDnsResStrategyService() {
return dnsResStrategyService;
}
public void setDnsResStrategyService(DnsResStrategyService dnsResStrategyService) {
this.dnsResStrategyService = dnsResStrategyService;
}
}

28
src/main/java/com/nis/util/excel/thread/CheckDnsResStrategyFormatThread.java
View File

@@ -1,9 +1,7 @@
package com.nis.util.excel.thread;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
@@ -15,31 +13,30 @@ import org.jets3t.service.ServiceException;
import org.springframework.beans.BeanUtils;
import com.beust.jcommander.internal.Lists;
import com.beust.jcommander.internal.Sets;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.util.Constants;
import com.nis.web.service.basics.PolicyGroupInfoService;
import com.nis.web.service.configuration.DnsResStrategyService;
import com.nis.util.DictUtils;
public class CheckDnsResStrategyFormatThread implements Callable<String>{
private Logger logger=Logger.getLogger(CheckDnsResStrategyFormatThread.class);
private BlockingQueue<? extends Object> srcQueue;
private BlockingQueue<DnsResStrategy> destQueue;
private Properties prop;
private DnsResStrategyService dnsResStrategyService;
private FunctionServiceDict serviceDict;
private FunctionRegionDict regionDict;
private PolicyGroupInfoService policyGroupInfoService;
// private PolicyGroupInfoDao policyGroupInfoDao;
// private DnsResStrategyDao dnsResStrategyDao;
public CheckDnsResStrategyFormatThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Properties prop,BlockingQueue<? extends Object> srcQueue,BlockingQueue<DnsResStrategy> destQueue) {
this.serviceDict=serviceDict;
this.regionDict=regionDict;
this.srcQueue=srcQueue;
this.destQueue=destQueue;
this.prop=prop;
// this.dnsResStrategyDao=SpringContextHolder.getBean(DnsResStrategyDao.class);
// this.policyGroupInfoDao=SpringContextHolder.getBean(PolicyGroupInfoDao.class);
}
@Override
public String call() throws Exception {
@@ -79,7 +76,8 @@ public class CheckDnsResStrategyFormatThread implements Callable<String>{
errInfo.append(String.format(prop.getProperty("can_not_null"),
prop.getProperty("group")) + ";");
}else {
PolicyGroupInfo info=policyGroupInfoService.getById(resGroup1Id);
PolicyGroupInfo info=DictUtils.getDnsGroups(resGroup1Id);
// PolicyGroupInfo info=policyGroupInfoDao.getById(resGroup1Id);
if(info==null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("group")) + ";");
@@ -139,17 +137,5 @@ public class CheckDnsResStrategyFormatThread implements Callable<String>{
}
return dnsResStrategies;
}
public DnsResStrategyService getDnsResStrategyService() {
return dnsResStrategyService;
}
public void setDnsResStrategyService(DnsResStrategyService dnsResStrategyService) {
this.dnsResStrategyService = dnsResStrategyService;
}
public PolicyGroupInfoService getPolicyGroupInfoService() {
return policyGroupInfoService;
}
public void setPolicyGroupInfoService(PolicyGroupInfoService policyGroupInfoService) {
this.policyGroupInfoService = policyGroupInfoService;
}
}

17
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -26,23 +26,24 @@ import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.service.configuration.DnsResStrategyService;
public class CheckIpFormatThread implements Callable<String>{
private Logger logger=Logger.getLogger(CheckIpFormatThread.class);
private BlockingQueue<? extends Object> srcQueue;
private BlockingQueue<BaseIpCfg> destQueue;
private Properties prop;
private DnsResStrategyService dnsResStrategyService;
// private DnsResStrategyService dnsResStrategyService;
private FunctionServiceDict serviceDict;
private FunctionRegionDict regionDict;
private List<Map<Long,Integer>> asnNoMaps;
// private DnsResStrategyDao dnsResStrategyDao;
public CheckIpFormatThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Properties prop,BlockingQueue<? extends Object> srcQueue,BlockingQueue<BaseIpCfg> destQueue) {
this.serviceDict=serviceDict;
this.regionDict=regionDict;
this.srcQueue=srcQueue;
this.destQueue=destQueue;
this.prop=prop;
// this.dnsResStrategyDao=SpringContextHolder.getBean(DnsResStrategyDao.class);
}
@Override
public String call() throws Exception {
@@ -170,8 +171,7 @@ public class CheckIpFormatThread implements Callable<String>{
if (regionDict.getFunctionId().equals(7)) {
Integer dnsStrategyId = baseIpCfg.getDnsStrategyId();
if (dnsStrategyId != null&&dnsStrategyId>0) {
List<DnsResStrategy> dnsStrategys = dnsResStrategyService
.findDnsResStrategys(Long.valueOf(dnsStrategyId), Constants.VALID_YES, Constants.AUDIT_YES);
List<DnsResStrategy> dnsStrategys = DictUtils.getDnsResStrategyList(Long.valueOf(dnsStrategyId));
if (dnsStrategys == null || dnsStrategys.size() == 0) {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("dns_res_strategy"))
@@ -184,8 +184,7 @@ public class CheckIpFormatThread implements Callable<String>{
Integer dnsStrategyId = baseIpCfg.getDnsStrategyId();
if (dnsStrategyId != null) {
if(dnsStrategyId>0) {
List<DnsResStrategy> dnsStrategys = dnsResStrategyService
.findDnsResStrategys(Long.valueOf(dnsStrategyId), Constants.VALID_YES, Constants.AUDIT_YES);
List<DnsResStrategy> dnsStrategys = DictUtils.getDnsResStrategyList(Long.valueOf(dnsStrategyId));
if (dnsStrategys == null || dnsStrategys.size() == 0) {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("dns_res_strategy"))
@@ -1032,12 +1031,6 @@ public class CheckIpFormatThread implements Callable<String>{
return matchType;
}
public DnsResStrategyService getDnsResStrategyService() {
return dnsResStrategyService;
}
public void setDnsResStrategyService(DnsResStrategyService dnsResStrategyService) {
this.dnsResStrategyService = dnsResStrategyService;
}
public List<Map<Long, Integer>> getAsnNoMaps() {
return asnNoMaps;
}

11
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -22,14 +22,13 @@ import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.service.configuration.DnsResStrategyService;
public class CheckStringFormatThread implements Callable<String>{
private Logger logger=Logger.getLogger(CheckStringFormatThread.class);
private BlockingQueue<? extends Object> srcQueue;
private BlockingQueue<BaseStringCfg<?>> destQueue;
private Properties prop;
private DnsResStrategyService dnsResStrategyService;
// private DnsResStrategyDao dnsResStrategyDao;
private FunctionServiceDict serviceDict;
private FunctionRegionDict regionDict;
public CheckStringFormatThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Properties prop,BlockingQueue<? extends Object> srcQueue,BlockingQueue<BaseStringCfg<?>> destQueue) {
@@ -38,6 +37,7 @@ public class CheckStringFormatThread implements Callable<String>{
this.srcQueue=srcQueue;
this.destQueue=destQueue;
this.prop=prop;
// this.dnsResStrategyDao=SpringContextHolder.getBean(DnsResStrategyDao.class);
}
@Override
public String call() throws Exception {
@@ -320,11 +320,4 @@ public class CheckStringFormatThread implements Callable<String>{
logger.warn("validate stringCfg data finish,cost:"+(end-start));
return stringList;
}
public DnsResStrategyService getDnsResStrategyService() {
return dnsResStrategyService;
}
public void setDnsResStrategyService(DnsResStrategyService dnsResStrategyService) {
this.dnsResStrategyService = dnsResStrategyService;
}
}