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

1、增加SubscribeId分组配置功能 2、增加公共分组相关国际化代码及相关sql文件修改

Browse Source
This commit is contained in:
zhangwenqing
2019-06-10 18:31:52 +08:00
parent 66b3673bce
commit bf03ca1cc0
59 changed files with 4394 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/util/Constants.java
View File

@@ -192,6 +192,22 @@ public final class Constants {
* DNS 策略组KEY
*/
public static final String CACHE_DNSGROUP_DICT = "dnsGroupDict";
/**
* IP公共组缓存KEY
*/
public static final String CACHE_IPGROUP_DICT = "ipComGroupDict";
/**
* URL公共组缓存KEY
*/
public static final String CACHE_URLGROUP_DICT = "urlComGroupDict";
/**
* Domain公共组缓存KEY
*/
public static final String CACHE_DOMAINGROUP_DICT = "domainComGroupDict";
/**
* ScriberId公共组缓存KEY
*/
public static final String CACHE_SCRIBERGROUP_DICT = "scriberComGroupDict";
/**
* 词典数据分类
*/

37
src/main/java/com/nis/util/DictUtils.java
View File

@@ -14,12 +14,14 @@ import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.SysDataDictionaryName;
import com.nis.domain.basics.CommonGroupInfo;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.web.dao.FunctionRegionDictDao;
import com.nis.web.dao.FunctionServiceDictDao;
import com.nis.web.dao.SysDictDao;
import com.nis.web.dao.basics.CommonGroupManageDao;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.dao.basics.SysDictInfoDao;
import com.nis.web.dao.configuration.DnsResStrategyDao;
@@ -42,6 +44,7 @@ public class DictUtils {
private final static FunctionServiceDictDao functionServiceDictDao = SpringContextHolder.getBean(FunctionServiceDictDao.class);
private final static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class);
private final static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
private final static CommonGroupManageDao commonGroupManageDao = SpringContextHolder.getBean(CommonGroupManageDao.class);
public static Map<String, List<SysDataDictionaryItem>> getDictData() {
@@ -401,4 +404,38 @@ public class DictUtils {
}
return null;
}
/**
* 获取公共组字典缓存
*/
public static List<CommonGroupInfo> getCommonGroups(Integer groupType){
String dictKey = Constants.CACHE_IPGROUP_DICT;
if(groupType.equals(7)) {
dictKey = Constants.CACHE_URLGROUP_DICT;
}else if(groupType.equals(8)) {
dictKey = Constants.CACHE_DOMAINGROUP_DICT;
}else if(groupType.equals(9)) {
dictKey = Constants.CACHE_SCRIBERGROUP_DICT;
}
List<CommonGroupInfo> allDictList = (List<CommonGroupInfo>)CacheUtils.get(dictKey);
if(StringUtil.isEmpty(allDictList)){
allDictList = commonGroupManageDao.findCommonGroupInfosByType(groupType);
CacheUtils.put(dictKey, allDictList);
}
return allDictList;
}
public static CommonGroupInfo getCommonGroups(Integer groupId, Integer groupType){
List<CommonGroupInfo> allDictList = getCommonGroups(groupType);
if(StringUtil.isEmpty(allDictList)){
}else {
for(CommonGroupInfo group:allDictList) {
if(group.getServiceGroupId().equals(groupId)) {
return group;
}
}
}
return null;
}
}

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

@@ -465,18 +465,27 @@ public class ExportExcel {
}
}
if("ip_group".equals(headerStr)) {
// IP、URL、Domain和ScriberId公共组
if("group_name".equals(headerStr)) {
commentStr="";
//查询dns fake ip policyGroup列表
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(5);
if(!StringUtil.isEmpty(list)){
for (PolicyGroupInfo policyGroupInfo : list) {
commentStr=commentStr+policyGroupInfo.getServiceGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
index++;
}
List<PolicyGroupInfo> list = null;
if(region.getFunctionId().equals(605)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(5);
}else if(region.getFunctionId().equals(606)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(7);
}else if(region.getFunctionId().equals(607)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(8);
}else if(region.getFunctionId().equals(608)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(9);
}
if(!StringUtil.isEmpty(list)){
for (PolicyGroupInfo policyGroupInfo : list) {
commentStr=commentStr+policyGroupInfo.getServiceGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
index++;
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if("isp".equals(headerStr)) {
commentStr="";
@@ -1807,7 +1816,7 @@ public class ExportExcel {
commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
//2、默认值说明
if(region.getFunctionId().equals(200)) {
if(region.getFunctionId().equals(200) || region.getFunctionId().equals(607)) {
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
}else {
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";

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

@@ -21,6 +21,7 @@ import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.CommonGroupInfo;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
import com.nis.domain.configuration.BaseIpCfg;
@@ -33,6 +34,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.IPUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.dao.configuration.ProxyFileTrafficMirrorDao;
import com.nis.web.dao.configuration.PxyObjKeyringDao;
import com.nis.web.service.BaseService;
@@ -50,6 +52,8 @@ public class CheckIpFormatThread implements Callable<String>{
private Map<Long,AsnGroupInfo> asnGroupInfos;
private static PxyObjKeyringDao pxyObjKeyringDao = SpringContextHolder.getBean(PxyObjKeyringDao.class);
private static ProxyFileTrafficMirrorDao proxyFileDao = SpringContextHolder.getBean(ProxyFileTrafficMirrorDao.class);
private static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
// private DnsResStrategyDao dnsResStrategyDao;
public CheckIpFormatThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Properties prop,BlockingQueue<? extends Object> srcQueue,BlockingQueue<BaseIpCfg> destQueue) {
this.serviceDict=serviceDict;
@@ -832,6 +836,19 @@ public class CheckIpFormatThread implements Callable<String>{
}
}
// IP公共组配置
if(regionDict.getFunctionId().equals(605)) {
Integer groupId = baseIpCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 5);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if (regionDict.getRegionType().equals(1)) {
boolean srcIpEmpty = false;
boolean destIpEmpty = false;

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

@@ -21,6 +21,8 @@ import com.beust.jcommander.internal.Sets;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.CommonGroupInfo;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.PxyObjKeyring;
@@ -131,6 +133,41 @@ public class CheckStringFormatThread implements Callable<String>{
// doLog属性检验
this.validDoLog(baseStringCfg,errInfo);
// URL、Domain、ScriberId公共组配置
if(regionDict.getFunctionId().equals(606)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 7);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if(regionDict.getFunctionId().equals(607)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 8);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if(regionDict.getFunctionId().equals(608)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 9);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if (regionDict.getRegionType().equals(2)) {
if (regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) {
String userRegion1 = baseStringCfg.getUserRegion1();