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

(1)dns策略Id类型修复，解决不能copy value

Browse Source 
(2)导入模板验证是否合法，根据title判断，如果不同语言的导入模板，也会被判定不合法。
(3)注掉部分废弃导入方法
This commit is contained in:
wangxin
2018-10-24 13:32:30 +08:00
parent 068e1e696e
commit 92b389914d
12 changed files with 101 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1033,9 +1033,9 @@ public class BaseController {
BeanUtils.copyProperties(list.get(i), baseStringCfg);
if (regionDict.getRegionType().equals(3)) {
if(regionDict.getFunctionId().equals(7)) {
Integer dnsStrategyId=baseStringCfg.getDnsStrategyId();
Long dnsStrategyId=baseStringCfg.getDnsStrategyId();
if(dnsStrategyId!=null) {
List<DnsResStrategy> dnsStrategys=dnsResStrategyService.findDnsResStrategys(Long.valueOf(dnsStrategyId), Constants.VALID_YES, Constants.AUDIT_YES);
List<DnsResStrategy> dnsStrategys=dnsResStrategyService.findDnsResStrategys(dnsStrategyId, Constants.VALID_YES, Constants.AUDIT_YES);
if(dnsStrategys==null||dnsStrategys.size()==0) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("dns_res_strategy"))+";");
}
@@ -1054,8 +1054,7 @@ public class BaseController {
//baseStringCfg.setDistrict(dirtrictP.split(",")[0]);
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("district")+" ")+";");
}
}
if(dirtrictP.indexOf(district)==-1) {
}else if(dirtrictP.indexOf(district)==-1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("district")+" ")+";");
}
}
@@ -2930,37 +2929,37 @@ public class BaseController {
if (regionDict.getRegionType().equals(1)) {//IP
if (regionDict.getFunctionId().equals(5)) {
if (serviceDict.getAction().equals(64)) {
List<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class);
List<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class,this.getMsgProp());
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}else {
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class,this.getMsgProp());
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}
}else if(regionDict.getFunctionId().equals(212)) {
List<IpPayloadTemplate> list = ei.getDataList(IpPayloadTemplate.class);
List<IpPayloadTemplate> list = ei.getDataList(IpPayloadTemplate.class,this.getMsgProp());
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP
List<P2pIpTemplate> list = ei.getDataList(P2pIpTemplate.class);
List<P2pIpTemplate> list = ei.getDataList(P2pIpTemplate.class,this.getMsgProp());
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}else {
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class,this.getMsgProp());
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}
}else if(regionDict.getRegionType().equals(2)) {//字符串类
if(regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())){ //P2p hash
List<P2pHashStringTemplate> list = ei.getDataList(P2pHashStringTemplate.class);
List<P2pHashStringTemplate> list = ei.getDataList(P2pHashStringTemplate.class,this.getMsgProp());
stringCfgs=this.checkStringCfg(serviceDict, regionDict, list);
}else{
List<StringAllTemplate> list = ei.getDataList(StringAllTemplate.class);
List<StringAllTemplate> list = ei.getDataList(StringAllTemplate.class,this.getMsgProp());
stringCfgs=this.checkStringCfg(serviceDict, regionDict, list);
}
}else if(regionDict.getRegionType().equals(3)) {//增强字符串类
if(regionDict.getFunctionId().equals(7)) {
List<DnsComplexStringTemplate> list = ei.getDataList(DnsComplexStringTemplate.class);
List<DnsComplexStringTemplate> list = ei.getDataList(DnsComplexStringTemplate.class,this.getMsgProp());
complexkeywordCfgs=this.checkComplexStringCfg(serviceDict, regionDict, list);
}else {
List<ComplexStringAllTemplate> list = ei.getDataList(ComplexStringAllTemplate.class);
List<ComplexStringAllTemplate> list = ei.getDataList(ComplexStringAllTemplate.class,this.getMsgProp());
complexkeywordCfgs=this.checkComplexStringCfg(serviceDict, regionDict, list);
}