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

修改关注网站配置导入 主题、网站大小写不敏感；修改App Ip配置导入模板

Browse Source 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
This commit is contained in:
zhangwenqing
2019-01-21 15:47:32 +08:00
committed by wangxin
parent 4ed438f8aa
commit e412d22569
5 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
View File

@@ -39,6 +39,9 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
@ExcelField(title="topic",dictType="TOPIC",sort=2)
private Long topicId;
private String topic;
private String websiteService;
/**
* 表达式类型
*/
@@ -180,4 +183,20 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
this.websiteServiceId = websiteServiceId;
}
public String getTopic() {
return topic;
}
public void setTopic(String topic) {
this.topic = topic;
}
public String getWebsiteService() {
return websiteService;
}
public void setWebsiteService(String websiteService) {
this.websiteService = websiteService;
}
}

36
src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java
View File

@@ -9,26 +9,10 @@ import com.nis.util.excel.ExcelField;
*/
public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{
private Long topicId; // 主题
private Long websiteServiceId; // 网站
private String topic; // 主题
private String websiteService; // 网站
private String cfgKeywords; // 域名
@ExcelField(title="topic",dictType="TOPIC",sort=2)
public Long getTopicId() {
return topicId;
}
public void setTopicId(Long topicId) {
this.topicId = topicId;
}
@ExcelField(title="website_server",dictType="WEBSITE_SERVER",sort=3)
public Long getWebsiteServiceId() {
return websiteServiceId;
}
public void setWebsiteServiceId(Long websiteServiceId) {
this.websiteServiceId = websiteServiceId;
}
@ExcelField(title="domain_name",sort=4)
public String getCfgKeywords() {
return cfgKeywords;
@@ -37,4 +21,20 @@ public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{
this.cfgKeywords = cfgKeywords;
}
@ExcelField(title="topic",sort=2)
public String getTopic() {
return topic;
}
public void setTopic(String topic) {
this.topic = topic;
}
@ExcelField(title="website_server",sort=3)
public String getWebsiteService() {
return websiteService;
}
public void setWebsiteService(String websiteService) {
this.websiteService = websiteService;
}
}

35
src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java
View File

@@ -3,12 +3,14 @@ package com.nis.util.excel.thread;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.collections.map.CaseInsensitiveMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.jets3t.service.ServiceException;
@@ -20,6 +22,7 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.security.UserUtils;
import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.configuration.AppCfgService;
@@ -99,16 +102,36 @@ public class CheckTopicWebsiteFormatThread implements Callable<String>{
}
if (regionDict.getRegionType().equals(2)) {
// 主题、网站校验
Long topicId = baseStringCfg.getTopicId();
Long websiteServiceId = baseStringCfg.getWebsiteServiceId();
if (topicId == null) {
// 主题、网站验证
String topic = baseStringCfg.getTopic();
String websiteService = baseStringCfg.getWebsiteService();
if(StringUtils.isBlank(topic)) {
errInfo.append(
String.format(prop.getProperty("can_not_null"), prop.getProperty("topic") + " ") + ";");
}else {
Map<String, String> dictMap = DictUtils.getDictOptionInReversion("TOPIC");
CaseInsensitiveMap topicDictMap = new CaseInsensitiveMap(dictMap);
String topicDictCode = (String)topicDictMap.get(topic);
if(StringUtils.isBlank(topicDictCode)) {
errInfo.append(prop.getProperty("topic") +" "+ prop.getProperty("not_exist") + ";");
}else {
baseStringCfg.setTopicId(Long.parseLong(topicDictCode));
}
}
if (websiteServiceId == null) {
if(StringUtils.isBlank(websiteService)) {
errInfo.append(
String.format(prop.getProperty("can_not_null"), prop.getProperty("website_server") + " ") + ";");
}else {
Map<String, String> dictMap = DictUtils.getDictOptionInReversion("WEBSITE_SERVER");
CaseInsensitiveMap websiteDictMap = new CaseInsensitiveMap(dictMap);
String websiteServiceDictCode = (String)websiteDictMap.get(websiteService);
if(StringUtils.isBlank(websiteServiceDictCode)) {
errInfo.append(prop.getProperty("website_server") +" "+ prop.getProperty("not_exist") + ";");
}else {
baseStringCfg.setWebsiteServiceId(Long.parseLong(websiteServiceDictCode));
}
}
String keyword = baseStringCfg.getCfgKeywords();

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

@@ -1437,6 +1437,9 @@ public class BaseController {
}else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing
BlockingQueue<IpSpoofingTemplate> list = ei.getDataList(IpSpoofingTemplate.class );
ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
}else if(regionDict.getFunctionId().equals(405)) { // APP IP
BlockingQueue<IpAllNotDoLogTemplate> list = ei.getDataList(IpAllNotDoLogTemplate.class );
ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
}else {
BlockingQueue<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class );
ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list);
@@ -2376,6 +2379,8 @@ public class BaseController {
ei.loadInitParams(IpWhitelistTemplate.class, msgProp, regionDict, serviceDict);
} else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing
ei.loadInitParams(IpSpoofingTemplate.class, msgProp, regionDict, serviceDict);
} else if(regionDict.getFunctionId().equals(405)) { // APP IP
ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict);
} else {
ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict);
}

5
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -423,6 +423,11 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpSpoofingTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(405)) { // APP IP
List<IpAllNotDoLogTemplate> classList=new ArrayList<IpAllNotDoLogTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else{
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2);