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

白名单、packed、stream导出

Browse Source
This commit is contained in:
leijun
2018-10-17 10:36:38 +08:00
parent f7cbf39325
commit e71d14254b
16 changed files with 553 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.dao.configuration.AppCfgDao;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.specific.SpecificServiceCfgDao;
import com.nis.web.security.UserUtils;
@@ -68,6 +69,8 @@ public class AppCfgService extends BaseService {
@Autowired
protected StringCfgDao stringcfgDao;
@Autowired
protected IpCfgDao ipCfgDao;
@Autowired
protected SpecificServiceCfgDao specificServiceCfgDao;
public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
@@ -101,6 +104,16 @@ public class AppCfgService extends BaseService {
page.setList(list);
return page;
}
public AppPolicyCfg exportIpInfo(AppPolicyCfg policy){
List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy);
policy.setIpPortList(ipPortList);
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
ntcSubscribeIdCfg.setCompileId(policy.getCompileId());
List<NtcSubscribeIdCfg> ntcList = stringcfgDao.findSubscribeIdCfgList(ntcSubscribeIdCfg);
policy.setNtcSubscribeIdCfgList(ntcList);
return policy;
}
// 主题网站列表
public Page<AppTopicDomainCfg> findAppTopicDomainList(Page<AppTopicDomainCfg> page, AppTopicDomainCfg entity) {

7
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -926,6 +926,10 @@ public class AvContentCfgService extends BaseService{
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
if (ipMap.get("numRegionList") != null) {
numRegionList.addAll(ipMap.get("numRegionList"));
}
}
if(!StringUtil.isEmpty(areaIpCfgList)){
Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
@@ -1261,6 +1265,9 @@ public class AvContentCfgService extends BaseService{
Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=ipMap.get("groupList");
ipRegionList=ipMap.get("dstList");
if (ipMap.get("numRegionList") != null) {
numRegionList.addAll(ipMap.get("numRegionList"));
}
}
if(!StringUtil.isEmpty(areaIpCfgList)){

11
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -25,6 +25,7 @@ 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.StringCfg;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
@@ -73,6 +74,16 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
* @param entity
*/
public CfgIndexInfo exportIpInfo(CfgIndexInfo entity){
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
entity.setIpPortList(ipPortList);
if(StringUtils.isNotBlank(entity.getUserRegion1())) {
List<InterceptPktBin> info=interceptCfgDao.getInterceptPktBin(entity);
entity.setInterceptPktBinList(info);
}
return entity;
}
public void saveInterceptCfg(CfgIndexInfo entity){
if(!entity.getAction().equals(Constants.REPLACE_ACTION)){
entity.setInterceptPktBinList(null);

3
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -469,6 +469,9 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
Map<String,List> map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList);
groupRelationList=map.get("groupList");
ipRegionList=map.get("dstList");
if (map.get("numRegionList") != null) {
numRegionList.addAll(map.get("numRegionList"));
}
maatCfg.setAreaEffectiveIds("0");
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());