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

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1354,7 +1354,7 @@ public class AppCfgService extends BaseService {
entity.setTableName(AppDomainCfg.getTablename());
appCfgDao.auditCfg(entity);
if (isAudit == 1) {
entity.setCfgKeywords(entity.getDomain());
entity.setCfgKeywords(entity.getCfgKeywords());
List<AppDomainCfg> list = new ArrayList();
list.add(entity);
Map<String, List> map = cfgConvert(strRegionList, list, 2, entity, groupRelationList);
@@ -1391,7 +1391,7 @@ public class AppCfgService extends BaseService {
// 设置APP自定义域
String userRegion = "APP_ID=" + entity.getAppCode() + Constants.USER_REGION_SPLIT + "DOMAIN_ID="
+ entity.getCompileId() + Constants.USER_REGION_SPLIT + "DOMAIN_STR="
+ keywordsEscape(entity.getDomain());
+ keywordsEscape(entity.getCfgKeywords());
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
@@ -1440,7 +1440,7 @@ public class AppCfgService extends BaseService {
appCfgDao.auditCfg(entity);
// 域名为关键字
if (isAudit == 1) {
entity.setCfgKeywords(entity.getDomain());
entity.setCfgKeywords(entity.getCfgKeywords());
List<AppTopicDomainCfg> list = new ArrayList();
list.add(entity);
Map<String, List> map = cfgConvert(strRegionList, list, 2, entity, groupRelationList);
@@ -1476,7 +1476,7 @@ public class AppCfgService extends BaseService {
maatCfg.setIsValid(entity.getIsValid());
// 设置APP自定义域
String domain = entity.getDomain();
String domain = entity.getCfgKeywords();
WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
websiteDomainTopic.setDomain(domain);
//查询domainId

179
src/main/java/com/nis/web/service/configuration/CommonPolicyService.java Normal file
View File

@@ -0,0 +1,179 @@
package com.nis.web.service.configuration;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.common.collect.Lists;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.CommonStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsIpCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.configuration.HttpReqHeadCfg;
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.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.FileUtils;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.CommonPolicyDao;
import com.nis.web.dao.configuration.ConfigSynchronizationDao;
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;
@Service
public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo> {
@Autowired
protected CommonPolicyDao commonPolicyDao;
@Autowired
protected ConfigSynchronizationDao synchronizationDao;
/**
* maat配置批量失效
* @param cfgList
* @param page
* @param entity
* @param list
* @param hasData
* @return
* @throws NoSuchFieldException
* @throws SecurityException
* @throws IllegalArgumentException
* @throws IllegalAccessException
*/
public boolean auditNtcMaatData(List<Map<String,Object>> cfgList,
Page page,
BaseCfg entity,
List<BaseCfg> list,
boolean hasData)throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
ToMaatBean maatBean;
MaatCfg maatCfg;
List<MaatCfg> configCompileList;
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
List<Integer> compileIds = new ArrayList();
for(BaseCfg cfg:list){
compileIds.add(cfg.getCompileId());
}
if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null);
}
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
String tableName = m.get("tableName").toString();
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
}
}
for(BaseCfg cfg:list){
maatCfg = new MaatCfg();
maatCfg.setCompileId(cfg.getCompileId());
maatCfg.setServiceId(cfg.getServiceId());
maatCfg.setIsValid(0);//无效
configCompileList.add(maatCfg);
}
page.setList(list);
if(page.isLastPage()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(entity.getAuditTime());
maatBean.setCreatorName(entity.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.UPDATE_ACTION);
//调用服务接口取消配置
String json=gsonToJson(maatBean);
logger.info("配置下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.put(json,1);
logger.info("配置取消配置响应信息："+result.getMsg());
}
return hasData;
}
public List<IpPortCfg> getIpDropList(String tabName,List compileIds){
return synchronizationDao.getIpDropList(tabName, compileIds);
}
public List<IpPortCfg> getIpPortList(IpPortCfg entity){
return synchronizationDao.getIpPortListByService(entity);
}
/**
* 回调类配置下发
* @param className
* @param page
* @param entity
* @param hasData
* @param isUpdateCfg
* @throws ClassNotFoundException
*/
public void auditCallBackData(List auditList,List compileIds,List ids,BaseCfg entity){
if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
commonPolicyDao.auditCfgBatch( "cfg_index_info", entity,compileIds,null);
}
if(!StringUtil.isEmpty(ids) && !StringUtil.isEmpty(entity.getTableName())) {
commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,ids,null);
}
if(entity.getIsAudit()==1){
//调用服务接口下发配置数据
String json=gsonToJson(auditList);
logger.info("批量下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("批量下发响应信息："+result.getMsg());
}else if(entity.getIsAudit()==3){
//调用服务接口取消配置
String json=gsonToJson(auditList);
logger.info("批量下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.put(json,2);
logger.info("批量响应信息："+result.getMsg());
}
}
}

6
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -1303,18 +1303,24 @@ public class ConfigSynchronizationService extends BaseService{
ipCfg.setRegionId(regionIds.get(0));
regionIds.remove(0);
ipCfg.setGroupId(groupIds.get(0));
ipCfg.setIsValid(entity.getIsValid());
ipCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
groupIds.remove(0);
list1.add(ipCfg);
}else if(cfgType==2){
strCfg.setRegionId(regionIds.get(0));
regionIds.remove(0);
strCfg.setGroupId(groupIds.get(0));
strCfg.setIsValid(entity.getIsValid());
strCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
groupIds.remove(0);
list1.add(strCfg);
}else if(cfgType==3){
complexStrCfg.setRegionId(regionIds.get(0));
regionIds.remove(0);
complexStrCfg.setGroupId(groupIds.get(0));
complexStrCfg.setIsValid(entity.getIsValid());
complexStrCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
groupIds.remove(0);
list1.add(complexStrCfg);
}

21
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -432,7 +432,11 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setRawLen(result.getData().getRawLen());
entity.setDigest(result.getData().getDigest());
entity.setFileUrl(result.getData().getAccessUrl());
if(!StringUtil.isEmpty(entity.getCfdsLevel()) && entity.getCfdsLevel() > 0) {
int cfdsLevel=entity.getCfdsLevel();
cfdsLevel= cfdsLevel > 10 ? (cfdsLevel/10):cfdsLevel;
entity.setCfdsLevel(cfdsLevel);
}
mailCfgDao.saveMailFileDigestCfg(entity);
// 保存SubscribeId域配置信息
@@ -454,7 +458,11 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}else{
if(!StringUtil.isEmpty(entity.getCfdsLevel()) && entity.getCfdsLevel() > 0) {
int cfdsLevel=entity.getCfdsLevel();
cfdsLevel= cfdsLevel > 10 ? (cfdsLevel/10):cfdsLevel;
entity.setCfdsLevel(cfdsLevel);
}
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
if(result.getData() !=null ) {
@@ -584,13 +592,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList");
if(!StringUtil.isEmpty(digestRegionList)){
for (DigestCfg digest : digestRegionList) {
if(!StringUtil.isEmpty(digest.getCfdsLevel()) && (digest.getCfdsLevel() > 1)){
digest.setCfdsLevel((int)(digest.getCfdsLevel()/10));
}
}
}
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
@@ -657,7 +658,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
if(entity.getCompileId()!=null){
if(entity != null && entity.getCompileId()!=null){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
List<NtcSubscribeIdCfg> ntcList = stringCfgDao.findSubscribeIdCfgList(ntcSubscribeIdCfg);