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

HTTP导入从公共导入分离

Browse Source
This commit is contained in:
wangxin
2019-03-29 15:29:12 +08:00
parent 068d2e859c
commit 873b3333af
11 changed files with 325 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/domain/configuration/template/BlackComplexStringTemplate.java Normal file
View File

@@ -0,0 +1,15 @@
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
public class BlackComplexStringTemplate extends ComplexStringAllTemplate {
private Integer doBlackList;
@ExcelField(title="doBlacklist",align=2,sort=2)
public Integer getDoBlackList() {
return doBlackList;
}
public void setDoBlackList(Integer doBlackList) {
this.doBlackList = doBlackList;
}
}

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

@@ -111,7 +111,8 @@ public class CheckComplexStringFormatThread implements Callable<String>{
// doLog属性检验
this.validDoLog(baseStringCfg,errInfo);
//doBlackList属性检验
this.validDoBlackList(baseStringCfg, errInfo);
if (regionDict.getRegionType().equals(3)) {
if (regionDict.getFunctionId().equals(7)) {
Long dnsStrategyId = baseStringCfg.getDnsStrategyId();
@@ -473,4 +474,33 @@ public class CheckComplexStringFormatThread implements Callable<String>{
}
}
/**
* doBlackList属性校验
* @param baseStringCfg
* @param errInfo
*/
public void validDoBlackList(ComplexkeywordCfg baseStringCfg, StringBuffer errInfo) {
if((regionDict.getFunctionId().equals(34)||regionDict.getFunctionId().equals(6)||
regionDict.getFunctionId().equals(635)||regionDict.getFunctionId().equals(8)
)&&serviceDict.getAction().equals(16)
) {
List<SysDataDictionaryItem> dict=DictUtils.getDictList("DO_BLACKLIST");
if(baseStringCfg.getDoBlackList()==null) {
baseStringCfg.setDoBlackList(Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT);
}
String dobalcklistVals=new String();
if(dict !=null && dict.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : dict) {
String itemCode = sysDataDictionaryItem.getItemCode();
dobalcklistVals+=itemCode+",";
}
}
Integer doBlackList = baseStringCfg.getDoBlackList();
if(!dobalcklistVals.contains(doBlackList+"")) {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("do_blacklist"))
+ ";");
}
}
}
}

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

@@ -1222,9 +1222,14 @@ public class CheckIpFormatThread implements Callable<String>{
}
Integer doLog = baseIpCfg.getDoLog();
if(!doLogOption.contains(doLog+"")) {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("do_log"))
+ ";");
if(configDoLog.startsWith("0")) {
baseIpCfg.setDoLog(Integer.parseInt(defaultValue));
}else {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("do_log"))
+ ";");
}
}
}
@@ -1235,7 +1240,7 @@ public class CheckIpFormatThread implements Callable<String>{
* @param errInfo
*/
public void validDoBlackList(IpPortCfg baseIpCfg, StringBuffer errInfo) {
if(regionDict.getFunctionId().equals(34)&&serviceDict.getAction().equals(16)) {
if((regionDict.getFunctionId().equals(34)||regionDict.getFunctionId().equals(8))&&serviceDict.getAction().equals(16)) {
List<SysDataDictionaryItem> dict=DictUtils.getDictList("DO_BLACKLIST");
if(baseIpCfg.getDoBlackList()==null) {
baseIpCfg.setDoBlackList(Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT);

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

@@ -518,7 +518,6 @@ public class CheckStringFormatThread implements Callable<String>{
* @param errInfo
*/
public void validDoLog(BaseStringCfg baseStringCfg, StringBuffer errInfo) {
String configDoLog = serviceDict.getConfigDoLog();
if(StringUtils.isNotBlank(configDoLog)) {
String defaultValue = configDoLog.substring(configDoLog.lastIndexOf(";")+1);
@@ -528,9 +527,14 @@ public class CheckStringFormatThread implements Callable<String>{
}
Integer doLog = baseStringCfg.getDoLog();
if(!doLogOption.contains(doLog+"")) {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("do_log"))
+ ";");
if(configDoLog.startsWith("0")) {
baseStringCfg.setDoLog(Integer.parseInt(defaultValue));
}else {
errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("do_log"))
+ ";");
}
}
}
@@ -541,7 +545,9 @@ public class CheckStringFormatThread implements Callable<String>{
* @param errInfo
*/
public void validDoBlackList(BaseStringCfg baseStringCfg, StringBuffer errInfo) {
if(regionDict.getFunctionId().equals(34)&&serviceDict.getAction().equals(16)) {
if((regionDict.getFunctionId().equals(34)||regionDict.getFunctionId().equals(6)||
regionDict.getFunctionId().equals(635)||regionDict.getFunctionId().equals(8))
&&serviceDict.getAction().equals(16)) {
List<SysDataDictionaryItem> dict=DictUtils.getDictList("DO_BLACKLIST");
if(baseStringCfg.getDoBlackList()==null) {
baseStringCfg.setDoBlackList(Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT);

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

@@ -53,6 +53,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.AppDomainTemplate;
import com.nis.domain.configuration.template.AppPayloadTemplate;
import com.nis.domain.configuration.template.AsnIpTemplate;
import com.nis.domain.configuration.template.BlackComplexStringTemplate;
import com.nis.domain.configuration.template.BlackListIPTemplate;
import com.nis.domain.configuration.template.BlackListStringTemplate;
import com.nis.domain.configuration.template.ComplexStringAllNotDoLogTemplate;
@@ -452,11 +453,16 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(34)&&serviceDict.getAction().equals(16)) {//SSL
}else if((regionDict.getFunctionId().equals(34)||regionDict.getFunctionId().equals(8))&&serviceDict.getAction().equals(16)) {//SSL , HTTP ADVANCED URL
List<BlackListIPTemplate> classList=new ArrayList<BlackListIPTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, BlackListIPTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if((regionDict.getFunctionId().equals(63)||regionDict.getFunctionId().equals(407)||regionDict.getFunctionId().equals(408)) && serviceDict.getAction().equals(64)){// APP Policy限速
List<IpRateLimitTemplate> classList=new ArrayList<IpRateLimitTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.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);
@@ -518,11 +524,21 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, TopicWebsiteTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(34)&&serviceDict.getAction().equals(16)) {//SSL
}else if(regionDict.getFunctionId().equals(34)&&serviceDict.getAction().equals(16)) {//SSL BLOCK
List<BlackListStringTemplate> classList=new ArrayList<BlackListStringTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, BlackListStringTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if((regionDict.getFunctionId().equals(6)||regionDict.getFunctionId().equals(635)||regionDict.getFunctionId().equals(8))&&serviceDict.getAction().equals(16)) {//URL, Advanced Website Keyword BLOCK
List<BlackListStringTemplate> classList=new ArrayList<BlackListStringTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, BlackListStringTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(6)&&serviceDict.getAction().equals(128)) {//URL WHITELIST
List<StringAllNotDoLogTemplate> classList=new ArrayList<StringAllNotDoLogTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else{
List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, StringAllTemplate.class, 2);
@@ -568,6 +584,11 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, ComplexStringAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else if((regionDict.getFunctionId().equals(8))&&serviceDict.getAction().equals(16)) {// request header response header
List<BlackComplexStringTemplate> classList=new ArrayList<BlackComplexStringTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, BlackComplexStringTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else{
List<ComplexStringAllTemplate> classList=new ArrayList<ComplexStringAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, ComplexStringAllTemplate.class, 2);

13
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -41,6 +41,7 @@ import com.nis.domain.configuration.HttpResHeadCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.BlackComplexStringTemplate;
import com.nis.domain.configuration.template.BlackListIPTemplate;
import com.nis.domain.configuration.template.BlackListStringTemplate;
import com.nis.domain.configuration.template.ComplexStringAllTemplate;
@@ -1090,7 +1091,7 @@ public class WebsiteController extends BaseController {
// return "redirect:" + adminPath
// +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"dnsImport","sslImport"}, method=RequestMethod.POST)
@RequestMapping(value = {"dnsImport","sslImport","httpImport"}, method=RequestMethod.POST)
public String importDns(HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
@RequestParam("files") MultipartFile[] files
,Integer serviceDictId
@@ -1122,7 +1123,7 @@ public class WebsiteController extends BaseController {
ei.loadInitParams(DnsIpTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<DnsIpTemplate> list = ei.getDataList(DnsIpTemplate.class );
ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,null, list);
}else if(regionDict.getFunctionId().intValue()==34&&serviceDict.getAction().intValue()==16) {
}else if((regionDict.getFunctionId().intValue()==34||regionDict.getFunctionId().intValue()==8)&&serviceDict.getAction().intValue()==16) {
//加载模板
ei.loadInitParams(BlackListIPTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<BlackListIPTemplate> list = ei.getDataList(BlackListIPTemplate.class );
@@ -1138,7 +1139,7 @@ public class WebsiteController extends BaseController {
ei.loadInitParams(DnsStringTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<DnsStringTemplate> list = ei.getDataList(DnsStringTemplate.class );
stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
}else if(regionDict.getFunctionId().intValue()==34&&serviceDict.getAction().intValue()==16) {
}else if((regionDict.getFunctionId().intValue()==34||regionDict.getFunctionId().intValue()==635||regionDict.getFunctionId().intValue()==8)&&serviceDict.getAction().intValue()==16) {
ei.loadInitParams(BlackListStringTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<BlackListStringTemplate> list = ei.getDataList(BlackListStringTemplate.class );
stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
@@ -1149,10 +1150,14 @@ public class WebsiteController extends BaseController {
}
}else if (regionDict.getRegionType().equals(3)) {
if(serviceDict.getAction().intValue()==16) {
if(regionDict.getFunctionId().equals(7)&&serviceDict.getAction().intValue()==16) {
ei.loadInitParams(DnsComplexStringTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<DnsComplexStringTemplate> list = ei.getDataList(DnsComplexStringTemplate.class);
complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list);
}else if((regionDict.getFunctionId().intValue()==8)&&serviceDict.getAction().intValue()==16) {
ei.loadInitParams(BlackComplexStringTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<BlackComplexStringTemplate> list = ei.getDataList(BlackComplexStringTemplate.class);
complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list);
}else {
ei.loadInitParams(ComplexStringAllTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<ComplexStringAllTemplate> list = ei.getDataList(ComplexStringAllTemplate.class);

146
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -33,10 +33,20 @@ import com.nis.domain.Page;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.BlackListIPTemplate;
import com.nis.domain.configuration.template.BlackListStringTemplate;
import com.nis.domain.configuration.template.ComplexStringAllTemplate;
import com.nis.domain.configuration.template.DnsComplexStringTemplate;
import com.nis.domain.configuration.template.DnsIpTemplate;
import com.nis.domain.configuration.template.DnsStringTemplate;
import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpWhitelistTemplate;
import com.nis.domain.configuration.template.StringAllNotDoLogTemplate;
import com.nis.domain.configuration.template.StringAllTemplate;
import com.nis.domain.configuration.template.WhiteListIpTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
@@ -721,5 +731,139 @@ public class WhiteListController extends CommonController {
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@RequestMapping(value = "domain/import", method=RequestMethod.POST)
public String importDomain(HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
@RequestParam("files") MultipartFile[] files
,Integer serviceDictId
,Integer requestId
,String attribute
,String classify
,String regionDictIds
,String importPath) {
logger.warn("import start...");
long start=System.currentTimeMillis();
ImportBigExcel ei=null;
try {
FunctionServiceDict serviceDict = DictUtils.getFunctionServiceDict(serviceDictId);
StringBuffer errTip=new StringBuffer();
BlockingQueue<BaseIpCfg> ipPortCfgs =null;
BlockingQueue<BaseStringCfg<?>> stringCfgs =null;
BlockingQueue<ComplexkeywordCfg> complexkeywordCfgs =null;
List<CfgIndexInfo> cfgIndexInfos = new ArrayList<CfgIndexInfo>();
Properties properties=this.getMsgProp();
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
ei = new ImportBigExcel(file, 0, 1);
FunctionRegionDict regionDict = DictUtils
.getFunctionRegionDict(Integer.parseInt(regionDictIds.split(",")[i]));
//------------------------------------check format start----------------------------
if (regionDict.getRegionType().equals(2)) {
if(serviceDict.getAction().intValue()==128) {
ei.loadInitParams(StringAllNotDoLogTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<StringAllNotDoLogTemplate> list = ei.getDataList(StringAllNotDoLogTemplate.class );
stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
}else if(serviceDict.getAction().intValue()==16) {
ei.loadInitParams(BlackListStringTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<BlackListStringTemplate> list = ei.getDataList(BlackListStringTemplate.class );
stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
}else {
ei.loadInitParams(StringAllTemplate.class, properties, regionDict, serviceDict);
BlockingQueue<StringAllTemplate> list = ei.getDataList(StringAllTemplate.class );
stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
}
}
//删除文件
if(ei.getUploadFile()!=null&&ei.getUploadFile().exists()) {
ei.getUploadFile().delete();
}
//------------------------------------check format end----------------------------
Date date = new Date();
String isSend = request.getParameter("isSend")==null?"":request.getParameter("isSend");
if (regionDict.getRegionType().equals(2)) {//账号
List<BaseStringCfg<?>> _stringCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
while(!stringCfgs.isEmpty()) {
stringCfgs.drainTo(_stringCfgs, Constants.MAAT_JSON_SEND_SIZE);
List<Integer> compileIds=Lists.newArrayList();
List<Integer> groupIds=Lists.newArrayList();
List<Integer> regionIds=Lists.newArrayList();
try {
compileIds = ConfigServiceUtil.getId(1,_stringCfgs.size());
if(isSend.equals("1")) {
groupIds = ConfigServiceUtil.getId(2,_stringCfgs.size());
regionIds = ConfigServiceUtil.getId(3,_stringCfgs.size());
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
int ind=0;
for (BaseStringCfg cfg : _stringCfgs) {
cfg.setAction(serviceDict.getAction());
cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
//cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId());
if(isSend.equals("1")) {
cfg.setIsAudit(Constants.AUDIT_YES);
cfg.setIsValid(Constants.VALID_YES);
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(date);
if(groupIds!=null&&groupIds.size()==_stringCfgs.size()) {
cfg.setGroupId(groupIds.get(ind));
}
if(regionIds!=null&&regionIds.size()==_stringCfgs.size()) {
cfg.setRegionId(regionIds.get(ind));
}
}else {
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setIsValid(Constants.VALID_NO);
}
cfg.setIsAreaEffective(0);
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setAttribute(attribute);
cfg.setClassify(classify);
cfg.setServiceId(serviceDict.getServiceId());
if(compileIds!=null&&compileIds.size()==_stringCfgs.size()) {
cfg.setCompileId(compileIds.get(ind));
}
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
BeanUtils.copyProperties(cfg, cfgIndexInfo, new String[] {"cfgId"});
cfgIndexInfos.add(cfgIndexInfo);
ind++;
}
domainService.saveAndSend(regionDict, cfgIndexInfos, _stringCfgs, isSend.equals("1"));
cfgIndexInfos.clear();
_stringCfgs.clear();
}
}
}
if(errTip.toString().length()>0) {
addMessage(redirectAttributes,"error", errTip.toString());
}
} catch (Exception e) {
if(ei!=null) {
if(ei.getUploadFile().exists()) {
ei.getUploadFile().delete();
}
}
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else if(e instanceof ServiceException) {
addMessage(redirectAttributes,"error", e.getMessage());
}else if(e instanceof IndexOutOfBoundsException){
addMessage(redirectAttributes,"error", "template_error");
}else {
addMessage(redirectAttributes,"error", "import_failed");
}
e.printStackTrace();
}
long end=System.currentTimeMillis();
logger.warn("import finish,cost:"+(end-start));
return "redirect:" + adminPath+ importPath;
}
}

55
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -11,10 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
@@ -36,6 +39,7 @@ import com.nis.web.dao.configuration.DomainDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.configuration.WebsiteCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import com.nis.web.service.CrudService;
/**
@@ -674,4 +678,55 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
entity.setHttpUrlList(httpUrlList);
return entity;
}
public void saveAndSend(FunctionRegionDict regionDict, List<CfgIndexInfo> cfgIndexInfos,
List<BaseStringCfg<?>> data, boolean send) {
// TODO Auto-generated method stub
if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) {
this.saveCfgIndexOf(cfgIndexInfos);
}
if(data!=null&&!data.isEmpty()) {
List<MaatCfg> configCompileList = new ArrayList();
for (int index = 0; index < data.size(); index++) {
BaseStringCfg cfg = (BaseStringCfg)data.get(index);
if(cfg.getCfgKeywords()!=null && !"".equals(cfg.getCfgKeywords())){
cfg.setTableName("http_url_cfg");
stringCfgDao.saveStringCfgBatch(cfg);
}
if (send) {
if(regionDict.getIsMaat().intValue()==1) {
MaatCfg maatCfg=convertMaatCfg(cfg,2);
//userregion处理
if(!StringUtil.isEmpty(cfg.getDnsStrategyId())){
maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+cfg.getDnsStrategyId());
}
configCompileList.add(maatCfg);
}
}
}
if (send && configCompileList.size() > 0) {
ToMaatBean maatBean = new ToMaatBean();
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
long start=System.currentTimeMillis();
// 调用服务接口下发配置数据
String json = BaseService.gsonToJson(maatBean);
if(configCompileList.size()>10) {
logger.info("URL配置下发配置条数：" + configCompileList.size());
}else {
logger.info("URL配置下发配置参数：" + json);
}
// 调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("URL配置下发响应信息：" + result.getMsg());
long end=System.currentTimeMillis();
logger.info("URL配置下发配置耗时：" + (end-start));
}
}
}
}

30
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -1286,8 +1286,12 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
if(cfg.getCfgKeywords()!=null && !"".equals(cfg.getCfgKeywords())){
if("subscribe_id".equals(regionDict.getConfigServiceType())){
cfg.setTableName("ntc_subscribe_id_cfg");
}else {
}else if(regionDict.getFunctionId().equals(34)){
cfg.setTableName("ssl_keyword_cfg");
}else if(regionDict.getFunctionId().equals(635)||regionDict.getDictId().equals(12)||regionDict.getDictId().equals(13)){
cfg.setTableName("http_body_cfg");
}else if(regionDict.getDictId().equals(9)){
cfg.setTableName("http_url_cfg");
}
stringCfgDao.saveStringCfgBatch(cfg);
}
@@ -1309,6 +1313,10 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
if(cfg.getCfgKeywords()!=null && !"".equals(cfg.getCfgKeywords())){
if(regionDict.getFunctionId().intValue()==7) {
cfg.setTableName("dns_domain_cfg");
}else if(regionDict.getDictId().intValue()==10) {
cfg.setTableName("http_req_head_cfg");
}else if(regionDict.getDictId().intValue()==11) {
cfg.setTableName("http_res_head_cfg");
}
stringCfgDao.saveComplexkeywordCfgBatch(cfg);
}
@@ -1319,6 +1327,18 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
if(!StringUtil.isEmpty(cfg.getDnsStrategyId())){
maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+cfg.getDnsStrategyId());
}
if(regionDict.getDictId().intValue()==10) {//请求头域
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, cfg.getDistrict());
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
}
}
if(regionDict.getDictId().intValue()==11) {//应答头域
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, cfg.getDistrict());
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
}
}
configCompileList.add(maatCfg);
}
@@ -1336,15 +1356,15 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
// 调用服务接口下发配置数据
String json = BaseService.gsonToJson(maatBean);
if(configCompileList.size()>10) {
logger.info("dns/ssl配置下发配置条数：" + configCompileList.size());
logger.info("dns/ssl/http配置下发配置条数：" + configCompileList.size());
}else {
logger.info("dns/ssl配置下发配置参数：" + json);
logger.info("dns/ssl/http配置下发配置参数：" + json);
}
// 调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("dns/ssl配置下发响应信息：" + result.getMsg());
logger.info("dns/ssl/http配置下发响应信息：" + result.getMsg());
long end=System.currentTimeMillis();
logger.info("dns/ssl配置下发配置耗时：" + (end-start));
logger.info("dns/ssl/http配置下发配置耗时：" + (end-start));
}
}

1
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -689,6 +689,7 @@
</div>
</div>
<c:set var="importPath" value="/ntc/website/httpList?functionId=${cfg.functionId}"/>
<c:set var="importUrl" value="/ntc/website/httpImport"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>

1
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -516,6 +516,7 @@
</div>
</div>
<c:set var="importPath" value="/ntc/whitelist/domain/list?functionId=${cfg.functionId}"/>
<c:set var="importUrl" value="/ntc/whitelist/domain/import"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>