diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 8796a0613..a75f3405e 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -44,7 +44,6 @@ public class BaseStringCfg extends BaseCfg { protected Integer behavCode;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用 protected String domain;//仅用于copy属性使用 - public String getDomain() { return domain; } @@ -251,4 +250,17 @@ public class BaseStringCfg extends BaseCfg { public void setIndex(Integer index) { this.index = index; } + public Integer getGroupId() { + return groupId; + } + public void setGroupId(Integer groupId) { + this.groupId = groupId; + } + public Integer getRegionId() { + return regionId; + } + public void setRegionId(Integer regionId) { + this.regionId = regionId; + } + } diff --git a/src/main/java/com/nis/util/excel/ImportBigExcel.java b/src/main/java/com/nis/util/excel/ImportBigExcel.java index 8bfab75a6..8313a5450 100644 --- a/src/main/java/com/nis/util/excel/ImportBigExcel.java +++ b/src/main/java/com/nis/util/excel/ImportBigExcel.java @@ -397,7 +397,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{ * @throws SAXException * @throws ParserConfigurationException * @throws OpenXML4JException - * @throws IOException + * @throws IOException */ public BlockingQueue getDataList(Class cls) throws InstantiationException, IllegalAccessException, IOException, OpenXML4JException, ParserConfigurationException, SAXException, SQLException{ log.warn("start to load data..."); @@ -494,7 +494,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{ log.debug("Read success: ["+i+"] "+sb.toString()); } long end=System.currentTimeMillis(); - log.warn(" load data finish,cost:"+(end-start)); + log.warn(" load data finish,size:"+_dataList.size()+",cost:"+(end-start)); return _dataList; } public File getUploadFile() { diff --git a/src/main/java/com/nis/util/excel/thread/SaveStringCfgThread.java b/src/main/java/com/nis/util/excel/thread/SaveStringCfgThread.java new file mode 100644 index 000000000..4c005927e --- /dev/null +++ b/src/main/java/com/nis/util/excel/thread/SaveStringCfgThread.java @@ -0,0 +1,390 @@ +package com.nis.util.excel.thread; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; + +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.DefaultTransactionDefinition; + +import com.beust.jcommander.internal.Lists; +import com.nis.domain.FunctionRegionDict; +import com.nis.domain.FunctionServiceDict; +import com.nis.domain.configuration.AppDomainCfg; +import com.nis.domain.configuration.AppPolicyCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; +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.domain.specific.SpecificServiceCfg; +import com.nis.exceptions.MaatConvertException; +import com.nis.util.ConfigServiceUtil; +import com.nis.util.Constants; +import com.nis.util.DictUtils; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.AppCfgDao; +import com.nis.web.dao.configuration.IpCfgDao; +import com.nis.web.dao.configuration.StringCfgDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; +import com.nis.web.service.SpringContextHolder; + +public class SaveStringCfgThread implements Callable{ + private Logger logger=LoggerFactory.getLogger(getClass()); + private BlockingQueue> stringCfgs; + private FunctionServiceDict serviceDict; + private FunctionRegionDict regionDict; + private Integer requestId; + private SpecificServiceCfg specificServiceCfg; + private String specServiceId; + private String behaviorId; + private String asnIpGroup; + private boolean audit;//是否下发 + private static final SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); + public SaveStringCfgThread(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,Integer requestId,BlockingQueue> stringCfgs,boolean audit) { + this.serviceDict=serviceDict; + this.regionDict=regionDict; + this.stringCfgs=stringCfgs; + this.requestId=requestId; + this.audit=audit; + } + @Override + public Throwable call() { + // TODO Auto-generated method stub + try { + FunctionRegionDict appRegion = null; + if(serviceDict!=null) { + String regionCode = serviceDict.getRegionCode(); + for (String code : regionCode.split(",")) { + if (StringUtils.isNotBlank(code)) { + FunctionRegionDict d = DictUtils.getFunctionRegionDictByRegionCode(serviceDict.getFunctionId(), + Integer.parseInt(code)); + if (d != null && d.getConfigServiceType() != null + && d.getConfigServiceType().equals("app_policy")) { + appRegion = d; + break; + } + } + + } + } + DataSourceTransactionManager transactionManager=(DataSourceTransactionManager)SpringContextHolder.getBean("transactionManager"); + List _stringCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); + List appPolicyCfgs = new ArrayList(); + List cfgIndexInfos = new ArrayList(); + while(!stringCfgs.isEmpty()) { + //开启一个新事物 + DefaultTransactionDefinition def = new DefaultTransactionDefinition(); + def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); // 事物隔离级别，开启新事务，这样会比较安全些。 + TransactionStatus status = transactionManager.getTransaction(def); // 获得事务状态 + try { + stringCfgs.drainTo(_stringCfgs, Constants.MAAT_JSON_SEND_SIZE); + if(_stringCfgs.size()>0) { + List compileIds=Lists.newArrayList(); + List groupIds=Lists.newArrayList(); + List regionIds=Lists.newArrayList(); + try { + compileIds = ConfigServiceUtil.getId(1,_stringCfgs.size()); + if(audit) { + groupIds = ConfigServiceUtil.getId(2,_stringCfgs.size()); + regionIds = ConfigServiceUtil.getId(3,_stringCfgs.size()); + } + } catch (Exception e) { + e.printStackTrace(); + logger.info("获取编译ID出错"); + throw new MaatConvertException(":"+e.getMessage()); + } + int ind=0; + Date date=new Date(); + 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(1); + cfg.setFunctionId(regionDict.getFunctionId()); + if(audit){ + 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&®ionIds.size()==_stringCfgs.size()) { + cfg.setRegionId(regionIds.get(ind)); + } + }else { + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setIsValid(Constants.VALID_NO); + } + + cfg.setIsAreaEffective(0); + cfg.setAttribute("0"); + cfg.setClassify("0"); + cfg.setLable("0"); + cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); + cfg.setServiceId(serviceDict.getServiceId()); + if(compileIds!=null&&compileIds.size()==_stringCfgs.size()) { + cfg.setCompileId(compileIds.get(ind)); + } + if(specificServiceCfg!=null) { + cfg.setAppCode(specificServiceCfg.getSpecServiceCode()); + cfg.setSpecServiceId(specificServiceCfg.getSpecServiceId()); + if(StringUtils.isNotBlank(behaviorId)) + cfg.setBehavCode(Integer.parseInt(behaviorId)); + } + if (serviceDict.getServiceId().intValue() == 33 + || serviceDict.getServiceId().intValue() == 145 + || serviceDict.getServiceId().intValue() == 35 + || serviceDict.getServiceId().intValue() == 147 + || serviceDict.getServiceId().intValue() == 36 + || serviceDict.getServiceId().intValue() == 148) { + if (appRegion != null) { + AppPolicyCfg appPolicyCfg = new AppPolicyCfg(); + BeanUtils.copyProperties(cfg, appPolicyCfg,new String[] {"cfgId"}); + appPolicyCfg.setMatchMethod(0); + appPolicyCfg.setIsHexbin(0); + appPolicyCfg.setCfgType(appRegion.getConfigRegionValue()); + appPolicyCfg.setCfgRegionCode(appRegion.getConfigRegionCode()); + if (StringUtils.isNotBlank(behaviorId)) { + appPolicyCfg.setExprType(1); + } else { + appPolicyCfg.setExprType(0); + } + appPolicyCfgs.add(appPolicyCfg); + } + } else { + if(!regionDict.getFunctionId().equals(403)) { + CfgIndexInfo cfgIndexInfo = new CfgIndexInfo(); + BeanUtils.copyProperties(cfg, cfgIndexInfo, new String[] {"cfgId"}); + cfgIndexInfos.add(cfgIndexInfo); + } + + } + ind++; + } + this.saveAndSend(_stringCfgs, cfgIndexInfos, appPolicyCfgs); + cfgIndexInfos.clear(); + appPolicyCfgs.clear(); + _stringCfgs.clear(); + transactionManager.commit(status); + } + + }catch (Throwable e) { + transactionManager.rollback(status); + // TODO: handle exception + return e; + } + + } + + }catch (Throwable e) { + // TODO: handle exception + return e; + } + + return null; + } + + public String getBehaviorId() { + return behaviorId; + } + public void setBehaviorId(String behaviorId) { + this.behaviorId = behaviorId; + } + public String getAsnIpGroup() { + return asnIpGroup; + } + public void setAsnIpGroup(String asnIpGroup) { + this.asnIpGroup = asnIpGroup; + } + public SpecificServiceCfg getSpecificServiceCfg() { + return specificServiceCfg; + } + public void setSpecificServiceCfg(SpecificServiceCfg specificServiceCfg) { + this.specificServiceCfg = specificServiceCfg; + } + public FunctionServiceDict getServiceDict() { + return serviceDict; + } + public void setServiceDict(FunctionServiceDict serviceDict) { + this.serviceDict = serviceDict; + } + public Integer getRequestId() { + return requestId; + } + public void setRequestId(Integer requestId) { + this.requestId = requestId; + } + public String getSpecServiceId() { + return specServiceId; + } + public void setSpecServiceId(String specServiceId) { + this.specServiceId = specServiceId; + } + public void saveAndSend(List _stringCfgs,List cfgIndexInfos, List appPolicyCfgs) { + logger.warn("saveAndSend start"); + long start=System.currentTimeMillis(); + if(_stringCfgs.size()>0) { + SqlSession batchSqlSession = null; + List configCompileList = new ArrayList(); + try{ + batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); + for(int index = 0; index < _stringCfgs.size();index++){ + if (regionDict.getDictId().intValue() == 167) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("intercept_pkt_bin"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // http url + if (regionDict.getDictId().intValue() == 9||regionDict.getDictId().intValue() == 15 || regionDict.getDictId().intValue() == 596) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("http_url_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // FTP url/content + if (regionDict.getDictId().intValue() == 36||regionDict.getDictId().intValue() == 37) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("ftp_keyword_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // P2P eMule Keyword + if(regionDict.getDictId().intValue() == 158){ + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("p2p_keyword_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // P2P File Marking + if(regionDict.getDictId().intValue() == 159){ + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("p2p_hash_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // BGP AS + if (regionDict.getFunctionId().equals(61)) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("ntc_bgp_as_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // SSL SNI/SAN/CN + if (regionDict.getFunctionId().intValue() == 34) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("ssl_keyword_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // HTTP 请求/应答内容 + if(regionDict.getDictId().intValue()==12||regionDict.getDictId().intValue()==13||regionDict.getDictId().intValue()==601||regionDict.getDictId().intValue()==602) { + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("http_body_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // 流媒体协议 + if(regionDict.getDictId().intValue()==25){ + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("av_cont_url_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // Voip Account + if(regionDict.getDictId().intValue()==16){ + BaseStringCfg cfg = _stringCfgs.get(index); + cfg.setTableName("av_voip_account_cfg"); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); + }else + // APP域名特征 + if(regionDict.getDictId().intValue()==64){ + AppDomainCfg cfg=new AppDomainCfg(); + BeanUtils.copyProperties(_stringCfgs.get(index), cfg); + ((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppDomainCfgBatch(cfg); + } + if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) { + CfgIndexInfo cfgIndexInfo = cfgIndexInfos.get(index); + ((IpCfgDao) batchSqlSession.getMapper(IpCfgDao.class)).saveCfgIndexForBatch(cfgIndexInfo); + } + if (appPolicyCfgs != null && appPolicyCfgs.size() > 0) { + SpringContextHolder.getBean(AppCfgDao.class).insertAppPolicyCfgForBatch(appPolicyCfgs.get(index)); + } + if(audit) { + List groupRelationList = new ArrayList(); + List ipRegionList = new ArrayList(); + List strRegionList = new ArrayList(); + List numRegionList = new ArrayList(); + List digestRegionList = new ArrayList(); + List areaIpRegionList = new ArrayList(); + GroupCfg group = new GroupCfg(); + StringCfg cfg = new StringCfg(); + BeanUtils.copyProperties(_stringCfgs.get(index), cfg); + group.setGroupId(_stringCfgs.get(index).getGroupId()); + group.setCompileId(_stringCfgs.get(index).getCompileId()); + group.setAuditTime(_stringCfgs.get(index).getAuditTime()); + group.setIsValid(_stringCfgs.get(index).getIsValid()); + groupRelationList.add(group); + cfg.setGroupId(group.getGroupId()); + //处理配置关键字转译 + cfg.setCfgKeywords(BaseService.keywordsEscape(cfg.getCfgKeywords())); + //增强字符串转换 + cfg.setDistrict(BaseService.keywordsEscape(cfg.getDistrict())); + strRegionList.add(cfg); + MaatCfg maatCfg = new MaatCfg(); + maatCfg.initDefaultValue(); + BeanUtils.copyProperties(_stringCfgs.get(index), maatCfg); + maatCfg.setAction(_stringCfgs.get(index).getAction()); + maatCfg.setAuditTime(_stringCfgs.get(index).getAuditTime()); + maatCfg.setIpRegionList(ipRegionList); + maatCfg.setStrRegionList(strRegionList); + maatCfg.setNumRegionList(numRegionList); + maatCfg.setDigestRegionList(digestRegionList); + maatCfg.setGroupRelationList(groupRelationList); + maatCfg.setGroupNum(groupRelationList.size()); + maatCfg.setAreaIpRegionList(areaIpRegionList); + maatCfg.setIsValid(_stringCfgs.get(index).getIsValid()); + configCompileList.add(maatCfg); + } + + } + batchSqlSession.commit(); + }finally { + if(batchSqlSession != null){ + batchSqlSession.close(); + } + } + + if(audit&&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); + //调用服务接口下发配置数据 + String json=BaseService.gsonToJson(maatBean); + logger.info("http配置下发配置参数："+json); + //调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("http配置下发响应信息："+result.getMsg()); + + } + } + long end=System.currentTimeMillis(); + logger.warn("saveAndSend finish,cost:"+(end-start)); + } +} diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 01d30f918..348331f01 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -91,7 +91,6 @@ import com.nis.util.excel.thread.CheckComplexStringFormatThread; import com.nis.util.excel.thread.CheckDnsResStrategyFormatThread; import com.nis.util.excel.thread.CheckIpFormatThread; import com.nis.util.excel.thread.CheckStringFormatThread; -import com.nis.web.dao.configuration.IpCfgDao; import com.nis.web.security.UserUtils; import com.nis.web.service.ArchiveServcie; import com.nis.web.service.AreaService; @@ -1249,6 +1248,7 @@ public class BaseController { String specServiceId = request.getParameter("appId"); String behaviorId = request.getParameter("behaviorId"); String asnIpGroup = request.getParameter("asnGroupId"); + String isSend = request.getParameter("isSend"); SpecificServiceCfg specificServiceCfg = null; if (serviceDict!=null&&(serviceDict.getServiceId().intValue() == 33 || serviceDict.getServiceId().intValue() == 145 || serviceDict.getServiceId().intValue() == 35 @@ -1403,7 +1403,7 @@ public class BaseController { asnIpCfgs.add(_cfg); ind++; } - this.splitAndSave(regionDict, serviceDict, specificServiceCfg, asnIpCfgs, cfgIndexInfos, appPolicyCfgs); + this.splitAndSave(regionDict, serviceDict, specificServiceCfg, asnIpCfgs, cfgIndexInfos, appPolicyCfgs,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _ipPortCfgs.clear(); @@ -1415,9 +1415,21 @@ public class BaseController { ipPortCfgs.drainTo(_ipPortCfgs, Constants.MAAT_JSON_SEND_SIZE); List compileIds=Lists.newArrayList(); List regionIds=Lists.newArrayList(); + List groupIds=Lists.newArrayList(); + List numRegionGroupIds=Lists.newArrayList(); + List numRegionRegionIds=Lists.newArrayList(); if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 try { compileIds = ConfigServiceUtil.getId(1,_ipPortCfgs.size()); + if(isSend.equals("1")) { + groupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); + regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); + } + //需要获取数值域的id + if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { + numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); + numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); + } } catch (Exception e) { e.printStackTrace(); logger.info("获取编译ID出错"); @@ -1443,8 +1455,29 @@ public class BaseController { cfg.setCreatorId(UserUtils.getUser().getId()); cfg.setDoLog(1); cfg.setFunctionId(regionDict.getFunctionId()); - cfg.setIsAudit(0); - cfg.setIsValid(0); + 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()==_ipPortCfgs.size()) { + cfg.setGroupId(groupIds.get(ind)); + } + if(regionIds!=null&®ionIds.size()==_ipPortCfgs.size()) { + cfg.setRegionId(regionIds.get(ind)); + } + if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { + if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { + cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); + } + if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { + cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); + } + } + }else { + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setIsValid(Constants.VALID_NO); + } cfg.setIsAreaEffective(0); cfg.setAttribute("0"); cfg.setClassify("0"); @@ -1499,7 +1532,7 @@ public class BaseController { } ind++; } - this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _ipPortCfgs, cfgIndexInfos, appPolicyCfgs); + this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _ipPortCfgs, cfgIndexInfos, appPolicyCfgs,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _ipPortCfgs.clear(); @@ -1507,12 +1540,42 @@ public class BaseController { } } else if (regionDict.getRegionType().equals(2)) { +// List> list=Lists.newArrayList(); +// ExecutorService service=Executors.newFixedThreadPool(Constants.SAVE_AND_DEL_THREAD_SIZE); +// for(int j=0;j e:list) { +// if(e.get()!=null) { +// try { +// throw e.get(); +// } catch (Throwable e1) { +// // TODO Auto-generated catch block +// e1.printStackTrace(); +// } +// } +// } List _stringCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); while(!stringCfgs.isEmpty()) { stringCfgs.drainTo(_stringCfgs, Constants.MAAT_JSON_SEND_SIZE); List compileIds=Lists.newArrayList(); + List groupIds=Lists.newArrayList(); + List 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出错"); @@ -1521,16 +1584,27 @@ public class BaseController { int ind=0; for (BaseStringCfg cfg : _stringCfgs) { cfg.setAction(serviceDict.getAction()); - /*cfg.setAuditorId(UserUtils.getUser().getId()); - cfg.setAuditTime(date);*/ cfg.setCfgRegionCode(regionDict.getConfigRegionCode()); cfg.setCfgType(regionDict.getConfigRegionValue()); cfg.setCreateTime(date); cfg.setCreatorId(UserUtils.getUser().getId()); cfg.setDoLog(1); cfg.setFunctionId(regionDict.getFunctionId()); - cfg.setIsAudit(0); - cfg.setIsValid(0); + 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&®ionIds.size()==_stringCfgs.size()) { + cfg.setRegionId(regionIds.get(ind)); + } + }else { + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setIsValid(Constants.VALID_NO); + } cfg.setIsAreaEffective(0); cfg.setAttribute("0"); cfg.setClassify("0"); @@ -1579,7 +1653,7 @@ public class BaseController { } ind++; } - this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _stringCfgs, cfgIndexInfos, appPolicyCfgs); + this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _stringCfgs, cfgIndexInfos, appPolicyCfgs,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _stringCfgs.clear(); @@ -1657,7 +1731,7 @@ public class BaseController { } ind++; } - this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs); + this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _complexkeywordCfgs.clear(); @@ -1697,7 +1771,7 @@ public class BaseController { cfg.setCompileId(compileIds.get(ind)); ind++; } - this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _dnsResStrategies, cfgIndexInfos, appPolicyCfgs); + this.splitAndSave(regionDict, serviceDict, specificServiceCfg, _dnsResStrategies, cfgIndexInfos, appPolicyCfgs,isSend.equals("1")); _dnsResStrategies.clear(); cfgIndexInfos.clear(); appPolicyCfgs.clear(); @@ -1789,7 +1863,7 @@ public class BaseController { public void splitAndSave(FunctionRegionDict regionDict,FunctionServiceDict serviceDict, SpecificServiceCfg specificServiceCfg, List list,List cfgIndexInfos, - List appPolicyCfgs){ + List appPolicyCfgs,boolean send){ if(list!=null&&list.size()>0) { String type=null; if (list.get(0) instanceof BaseIpCfg) { @@ -1803,6 +1877,12 @@ public class BaseController { }else if(list.get(0) instanceof AsnIpCfg) { type="AsnIpCfg"; } + if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) { + ipCfgService.saveCfgIndexOf(cfgIndexInfos); + } + if (appPolicyCfgs != null && appPolicyCfgs.size() > 0) { + appCfgService.savePolicyList(appPolicyCfgs); + } if("BaseIpCfg".equals(type)) { List listPage = (List) list; if (regionDict.getFunctionId().equals(301)) { @@ -1812,7 +1892,7 @@ public class BaseController { }else if (specificServiceCfg!=null&®ionDict.getFunctionId().equals(405)) { appCfgService.saveAppIpCfg((List)listPage,specificServiceCfg); }else { - ipCfgService.saveBatch((List)listPage, IpCfgDao.class); + ipCfgService.saveIpBatch(regionDict,serviceDict,(List)listPage,send); } }else if("AsnIpCfg".equals(type)) { List listPage = (List) list; @@ -1823,51 +1903,51 @@ public class BaseController { // ip_payload if (regionDict.getDictId().intValue() == 167) { // interceptCfgService.saveInterceptCfg(listPage); - interceptCfgService.saveStringCfgBatch(listPage, "intercept_pkt_bin"); + interceptCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "intercept_pkt_bin",send); } // http url if (regionDict.getDictId().intValue() == 9||regionDict.getDictId().intValue() == 15 || regionDict.getDictId().intValue() == 596) { // websiteCfgService.saveHttpUrlCfg(listPage); - websiteCfgService.saveStringCfgBatch(listPage, "http_url_cfg"); + websiteCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "http_url_cfg",send); } // FTP url/content if (regionDict.getDictId().intValue() == 36||regionDict.getDictId().intValue() == 37) { // fileTransferCfgService.saveFtpCfg(listPage); - fileTransferCfgService.saveStringCfgBatch(listPage, "ftp_keyword_cfg"); + fileTransferCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "ftp_keyword_cfg",send); } // P2P eMule Keyword if(regionDict.getDictId().intValue() == 158){ - fileTransferCfgService.saveStringCfgBatch(listPage, "p2p_keyword_cfg"); + fileTransferCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "p2p_keyword_cfg",send); } // P2P File Marking if(regionDict.getDictId().intValue() == 159){ // fileTransferCfgService.saveP2pCfg(listPage); - fileTransferCfgService.saveStringCfgBatch(listPage, "p2p_hash_cfg"); + fileTransferCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "p2p_hash_cfg",send); } // BGP AS if (regionDict.getFunctionId().equals(61)) { // bgpCfgService.saveBgpAsCfg(listPage); - bgpCfgService.saveStringCfgBatch(listPage, "ntc_bgp_as_cfg"); + bgpCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "ntc_bgp_as_cfg",send); } // SSL SNI/SAN/CN if (regionDict.getFunctionId().intValue() == 34) { // websiteCfgService.saveSslCfg(listPage); - websiteCfgService.saveStringCfgBatch(listPage, "ssl_keyword_cfg"); + websiteCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "ssl_keyword_cfg",send); } // HTTP 请求/应答内容 if(regionDict.getDictId().intValue()==12||regionDict.getDictId().intValue()==13||regionDict.getDictId().intValue()==601||regionDict.getDictId().intValue()==602) { // websiteCfgService.saveHttpBodyCfg(listPage); - websiteCfgService.saveStringCfgBatch(listPage, "http_body_cfg"); + websiteCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "http_body_cfg",send); } // 流媒体协议 if(regionDict.getDictId().intValue()==25){ // avContentCfgService.saveContUrlCfg(listPage); - avContentCfgService.saveStringCfgBatch(listPage, "av_cont_url_cfg"); + avContentCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "av_cont_url_cfg",send); } // Voip Account if(regionDict.getDictId().intValue()==16){ // avContentCfgService.saveVoIpAccountCfg(listPage); - avContentCfgService.saveStringCfgBatch(listPage, "av_voip_account_cfg"); + avContentCfgService.saveStringCfgBatch(regionDict,serviceDict,listPage, "av_voip_account_cfg",send); } // APP域名特征 if(regionDict.getDictId().intValue()==64){ @@ -1907,12 +1987,6 @@ public class BaseController { dnsResStrategyService.saveDnsResStrategyCfgBatch(listPage); } } - if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) { - ipCfgService.saveCfgIndexOf(cfgIndexInfos); - } - if (appPolicyCfgs != null && appPolicyCfgs.size() > 0) { - appCfgService.savePolicyList(appPolicyCfgs); - } } /** * 多域配置导出 diff --git a/src/main/java/com/nis/web/controller/SystemController.java b/src/main/java/com/nis/web/controller/SystemController.java index a9c46db59..c7ffd18eb 100644 --- a/src/main/java/com/nis/web/controller/SystemController.java +++ b/src/main/java/com/nis/web/controller/SystemController.java @@ -32,26 +32,32 @@ public class SystemController extends BaseController{ boolean topShow = false; for(SysMenu second:menu.getChildren()){ boolean secondShow = false; - if(!StringUtil.isEmpty(second.getChildren())&&second.getIsShow()==1){ - for(SysMenu third:second.getChildren()){ - boolean thirdShow = false; - if(!StringUtil.isEmpty(third.getChildren())&&third.getIsShow()==1){ - for(SysMenu fourth:third.getChildren()){ - if(!StringUtil.isEmpty(fourth.getMenuBg())&&fourth.getIsShow()==1){ - newList.add(fourth); + if(second.getIsShow()==1){ + if(!StringUtil.isEmpty(second.getMenuBg())){ + secondShow = true; + } + if(!StringUtil.isEmpty(second.getChildren())){ + for(SysMenu third:second.getChildren()){ + boolean thirdShow = false; + if(third.getIsShow()==1){ + if(!StringUtil.isEmpty(third.getMenuBg())){ thirdShow = true; secondShow = true; } + if(!StringUtil.isEmpty(third.getChildren())){ + for(SysMenu fourth:third.getChildren()){ + if(!StringUtil.isEmpty(fourth.getMenuBg())&&fourth.getIsShow()==1){ + newList.add(fourth); + thirdShow = true; + secondShow = true; + } + } + } } - }else{ - if(!StringUtil.isEmpty(third.getMenuBg())&&third.getIsShow()==1){ - thirdShow = true; - secondShow = true; + if(thirdShow){ + newList.add(third); } } - if(thirdShow){ - newList.add(third); - } } if(secondShow){ @@ -59,10 +65,6 @@ public class SystemController extends BaseController{ topShow = true; } - }else{ - if(!StringUtil.isEmpty(second.getMenuBg())&&second.getIsShow()==1){ - topShow = true; - } } } if(topShow){ diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java index c9ba4e4aa..a3c383848 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java @@ -41,6 +41,7 @@ public interface AppCfgDao { public IpPortCfg getAppPolicyIpCfg(AppPolicyCfg entity) ; public List getAppPolicyIpList(AppPolicyCfg entity); public int insertAppPolicyCfg(AppPolicyCfg entity); + public int insertAppPolicyCfgForBatch(AppPolicyCfg entity); public int updateAppPolicyCfg(AppPolicyCfg entity); public int insertAppPolicyIpCfg(IpPortCfg entity); public int deleteAppPolicyIpCfg(AppPolicyCfg entity); @@ -49,6 +50,7 @@ public interface AppCfgDao { public List findAppIpList(AppIpCfg entity) ; public AppIpCfg getAppIpCfg(Long cfgId) ; public int insertAppIpCfg(AppIpCfg entity); + public int insertAppIpCfgForBatch(AppIpCfg entity); public int insertAppIpCfgBatch(List list); public int updateAppIpCfg(AppIpCfg entity); //app http特征增删改查 diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 7e9d83d08..7cfcfb034 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -1690,6 +1690,21 @@ ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} ,#{doLog,jdbcType=INTEGER} ) + + insert into app_policy_cfg ( + APP_CODE,BEHAV_CODE,SPEC_SERVICE_ID,CFG_DESC,ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID, + CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,USER_REGION1 + ,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5,DO_LOG + )values ( + , + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER} + ,#{userRegion1,jdbcType=VARCHAR} ,#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR} + ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} ,#{doLog,jdbcType=INTEGER} + ) + SELECT LAST_INSERT_ID() @@ -1709,6 +1724,22 @@ ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} ) + + insert into app_ip_cfg ( + APP_CODE,BEHAV_CODE,SPEC_SERVICE_ID, CFG_DESC,ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE, + IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, + DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5 + )values ( + , + #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR}, + #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, + #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR} + ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR} + ) + insert into app_ip_cfg ( APP_CODE,BEHAV_CODE,SPEC_SERVICE_ID, CFG_DESC,ACTION,IS_VALID,IS_AUDIT, diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 5bc7e6ec0..7cd36e97d 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -862,8 +862,8 @@ )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, - 0, - 0, + #{isValid,jdbcType=INTEGER}, + #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{editorId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 1b3970622..1e20ab466 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -1,6 +1,7 @@ package com.nis.web.service; import java.io.IOException; +import java.lang.reflect.Field; import java.lang.reflect.Type; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; +import com.beust.jcommander.internal.Maps; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -35,6 +37,8 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.googlecode.ipv6.IPv6Address; import com.googlecode.ipv6.IPv6Network; +import com.nis.domain.FunctionRegionDict; +import com.nis.domain.FunctionServiceDict; import com.nis.domain.SysRole; import com.nis.domain.SysUser; import com.nis.domain.basics.AsnIpCfg; @@ -53,6 +57,10 @@ import com.nis.domain.configuration.DnsResStrategy; 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.ToMaatBean; +import com.nis.domain.maat.ToMaatResult; +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; @@ -61,78 +69,81 @@ import com.nis.util.ConfigServiceUtil; import com.nis.util.Configurations; import com.nis.util.Constants; import com.nis.util.IpUtil; +import com.nis.util.Reflections; import com.nis.util.StringUtil; import com.nis.util.StringUtils; +import com.nis.web.dao.CrudDao; +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.security.UserUtils; /** * Service基类 + * * @author ThinkGem * @version 2014-05-16 */ public abstract class BaseService { - - - + /** * 日志对象 */ protected Logger logger = LoggerFactory.getLogger(getClass()); - - - + /** * 数据范围过滤 - * @param user 当前用户对象，通过“entity.getCurrentUser()”获取 - * @param officeAlias 机构表别名，多个用“,”逗号隔开。 - * @param userAlias 用户表别名，多个用“,”逗号隔开，传递空，忽略此参数 + * + * @param user + * 当前用户对象，通过“entity.getCurrentUser()”获取 + * @param officeAlias + * 机构表别名，多个用“,”逗号隔开。 + * @param userAlias + * 用户表别名，多个用“,”逗号隔开，传递空，忽略此参数 * @return 标准连接条件对象 */ public static String dataScopeFilter(SysUser user, String officeAlias, String userAlias) { - StringBuilder sqlString = new StringBuilder(); - + // 进行权限过滤，多个角色权限范围之间为或者关系。 List dataScope = Lists.newArrayList(); - - if (StringUtils.isBlank(user.getLoginId())){ + + if (StringUtils.isBlank(user.getLoginId())) { return ""; } - + // 超级管理员，跳过权限过滤 - if (user.isAdmin()){ + if (user.isAdmin()) { boolean isDataScopeAll = isContainsDataScopeAll(user.getUserRoleList()); - - - + for (SysRole r : user.getUserRoleList()) { - for (String oa : StringUtils.split(officeAlias, ",")){ - if (!dataScope.contains(r.getDataScope()) && StringUtils.isNotBlank(oa)){ - - sqlString.append(createScopeSql(r.getDataScope(),oa,user,null)); + for (String oa : StringUtils.split(officeAlias, ",")) { + if (!dataScope.contains(r.getDataScope()) && StringUtils.isNotBlank(oa)) { + + sqlString.append(createScopeSql(r.getDataScope(), oa, user, null)); dataScope.add(r.getDataScope()); } } } // 如果没有全部数据权限，并设置了用户别名，则当前权限为本人；如果未设置别名，当前无权限为已植入权限 - if (!isDataScopeAll){ - if (StringUtils.isNotBlank(userAlias)){ - for (String ua : StringUtils.split(userAlias, ",")){ + if (!isDataScopeAll) { + if (StringUtils.isNotBlank(userAlias)) { + for (String ua : StringUtils.split(userAlias, ",")) { sqlString.append(" OR " + ua + ".id = '" + user.getId() + "'"); } - }else { - for (String oa : StringUtils.split(officeAlias, ",")){ - //sqlString.append(" OR " + oa + ".id = " + user.getOffice().getId()); + } else { + for (String oa : StringUtils.split(officeAlias, ",")) { + // sqlString.append(" OR " + oa + ".id = " + user.getOffice().getId()); sqlString.append(" OR " + oa + ".id IS NULL"); } } - }else{ + } else { // 如果包含全部权限，则去掉之前添加的所有条件，并跳出循环。 sqlString = new StringBuilder(); } } - if (StringUtils.isNotBlank(sqlString.toString())){ + if (StringUtils.isNotBlank(sqlString.toString())) { return " AND (" + sqlString.substring(4) + ")"; } return ""; @@ -140,129 +151,131 @@ public abstract class BaseService { /** * 数据范围过滤 - * @param user 当前用户对象，通过“entity.getCurrentUser()”获取 - * @param configAlias 配置表别名，多个用","逗号隔开，传递空，忽略此参数 + * + * @param user + * 当前用户对象，通过“entity.getCurrentUser()”获取 + * @param configAlias + * 配置表别名，多个用","逗号隔开，传递空，忽略此参数 * @return 标准连接条件对象 */ public static String configScopeFilter(SysUser user, String configAlias) { - StringBuilder sqlString = new StringBuilder(); - + // 进行权限过滤，多个角色权限范围之间为或者关系。 List dataScope = Lists.newArrayList(); - - if (StringUtils.isBlank(user.getLoginId())){ + + if (StringUtils.isBlank(user.getLoginId())) { return ""; } - + // 超级管理员，跳过权限过滤 - if (!user.isAdmin()){ + if (!user.isAdmin()) { boolean isDataScopeAll = isContainsDataScopeAll(user.getUserRoleList()); // 如果没有全部数据权限 - if (!isDataScopeAll){ + if (!isDataScopeAll) { for (SysRole r : user.getUserRoleList()) { - for (String c : StringUtils.split(configAlias, ",")){ - if (!dataScope.contains(r.getDataScope()) && StringUtils.isNotBlank(c)){ - sqlString.append(createScopeSql(r.getDataScope(),"",user,c)); + for (String c : StringUtils.split(configAlias, ",")) { + if (!dataScope.contains(r.getDataScope()) && StringUtils.isNotBlank(c)) { + sqlString.append(createScopeSql(r.getDataScope(), "", user, c)); dataScope.add(r.getDataScope()); } } } - - }else{ + + } else { // 如果包含全部权限，则去掉之前添加的所有条件但增加配置审核取消以及删除的配置，并跳出循环。 sqlString = new StringBuilder(); sqlString.append(" OR " + configAlias + ".is_audit !=3"); } } - if (StringUtils.isNotBlank(sqlString.toString())){ + if (StringUtils.isNotBlank(sqlString.toString())) { return " AND (" + sqlString.substring(4) + ")"; } return ""; } - - + /** * 测试数据是否包含全集 + * * @return */ private static boolean isContainsDataScopeAll(List roleList) { boolean isDataScopeAll = false; - - for(SysRole role : roleList) { - if(SysRole.DATA_SCOPE_ALL.equals(role.getDataScope())){ + + for (SysRole role : roleList) { + if (SysRole.DATA_SCOPE_ALL.equals(role.getDataScope())) { isDataScopeAll = true; break; } } - + return isDataScopeAll; - + } - - + /** * 过滤机构信息 - * @param dataScope 数据范围（1：所有数据；2：所在公司及以下数据；3：所在公司数据； - * 4：所在部门及以下数据；5：所在部门数据；6：所在单位及以下数据；7：所在单位数据; - * 8:操作员数据；9：审核员数据，10：审计员数据） + * + * @param dataScope + * 数据范围（1：所有数据；2：所在公司及以下数据；3：所在公司数据； + * 4：所在部门及以下数据；5：所在部门数据；6：所在单位及以下数据；7：所在单位数据; + * 8:操作员数据；9：审核员数据，10：审计员数据） * @return */ - private static String createScopeSql(int dataScope,String officeAlias,SysUser user,String configAlias) { + private static String createScopeSql(int dataScope, String officeAlias, SysUser user, String configAlias) { StringBuilder scopeSql = new StringBuilder(1024); - - if (SysRole.DATA_SCOPE_COMPANY_AND_CHILD.equals(dataScope)){ + + if (SysRole.DATA_SCOPE_COMPANY_AND_CHILD.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getCompany().getId()); - scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getCompany().getParentIds() + user.getCompany().getId() + ",%'"); - } - else if (SysRole.DATA_SCOPE_COMPANY.equals(dataScope)){ + scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getCompany().getParentIds() + + user.getCompany().getId() + ",%'"); + } else if (SysRole.DATA_SCOPE_COMPANY.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getCompany().getId()); // 包括本公司下的部门 （type=1:公司；type=2：单位 3.部门） - scopeSql.append(" OR (" + officeAlias + ".parent_id = '" + user.getCompany().getId() + "' AND " + officeAlias + ".type>1)"); - } - else if (SysRole.DATA_SCOPE_OFFICE_AND_CHILD.equals(dataScope)){ + scopeSql.append(" OR (" + officeAlias + ".parent_id = '" + user.getCompany().getId() + "' AND " + + officeAlias + ".type>1)"); + } else if (SysRole.DATA_SCOPE_OFFICE_AND_CHILD.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getOffice().getId()); - scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getOffice().getParentIds() + user.getOffice().getId() + ",%'"); - } - else if (SysRole.DATA_SCOPE_OFFICE.equals(dataScope)){ + scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getOffice().getParentIds() + + user.getOffice().getId() + ",%'"); + } else if (SysRole.DATA_SCOPE_OFFICE.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getOffice().getId()); - } - else if (SysRole.DATA_SCOPE_ENTITY_AND_CHILD.equals(dataScope)){ + } else if (SysRole.DATA_SCOPE_ENTITY_AND_CHILD.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getEntity().getId()); - scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getEntity().getParentIds() + user.getEntity().getId() + ",%'"); - - } else if (SysRole.DATA_SCOPE_ENTITY.equals(dataScope)){ + scopeSql.append(" OR " + officeAlias + ".parent_ids LIKE '" + user.getEntity().getParentIds() + + user.getEntity().getId() + ",%'"); + + } else if (SysRole.DATA_SCOPE_ENTITY.equals(dataScope)) { scopeSql.append(" OR " + officeAlias + ".id = " + user.getEntity().getId()); // 包括本公司下的部门 （type=1:公司；type=2：单位 3.部门） - scopeSql.append(" OR (" + officeAlias + ".parent_id = '" + user.getEntity().getId() + "' AND " + officeAlias + ".type>1)"); - - }else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)){ + scopeSql.append(" OR (" + officeAlias + ".parent_id = '" + user.getEntity().getId() + "' AND " + officeAlias + + ".type>1)"); + + } else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) { scopeSql.append(" OR " + configAlias + ".is_audit !=3"); - } - else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)){ + } else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) { scopeSql.append(" OR " + configAlias + ".is_audit = 0 or " + configAlias + ".is_audit = 1"); + } else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) { + scopeSql.append(" OR " + configAlias + ".is_audit = 1"); } - else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)){ - scopeSql.append(" OR " + configAlias + ".is_audit = 1"); - } - + return scopeSql.toString(); } + /** * - * getTableName(获取表名对应的Class) - * (这里描述这个方法适用条件 – 可选) + * getTableName(获取表名对应的Class) (这里描述这个方法适用条件 – 可选) + * * @param clazz - * @return - *String - * @exception - * @since 1.0.0 + * @return String + * @exception @since + * 1.0.0 */ - public String getClassName(String tableName){ + public String getClassName(String tableName) { return Configurations.getStringProperty(tableName, null); } - + public static class MapTypeAdapter extends TypeAdapter { @Override public Object read(JsonReader in) throws IOException { @@ -295,12 +308,12 @@ public abstract class BaseService { BigDecimal maxLong = new BigDecimal(Long.MAX_VALUE); BigDecimal maxInteger = new BigDecimal(Integer.MAX_VALUE); // 数字超过long的最大值，返回BigDecimal类型 - if (dbNum.compareTo(maxLong)==1) { + if (dbNum.compareTo(maxLong) == 1) { return dbNum; - }else if(dbNum.compareTo(maxInteger)==1){ + } else if (dbNum.compareTo(maxInteger) == 1) { long lngNum = Long.parseLong(temp); return lngNum; - }else{ + } else { int lngNum = Integer.parseInt(temp); return lngNum; } @@ -323,66 +336,71 @@ public abstract class BaseService { } } + /** * 转换成字符串 + * * @param obj * @return */ - public static String gsonToJson(T obj){ - Gson gson = new GsonBuilder().disableHtmlEscaping(). - excludeFieldsWithoutExposeAnnotation(). - registerTypeAdapter(Date.class, new JsonSerializer() { + public static String gsonToJson(T obj) { + Gson gson = new GsonBuilder().disableHtmlEscaping().excludeFieldsWithoutExposeAnnotation() + .registerTypeAdapter(Date.class, new JsonSerializer() { @Override - public JsonElement serialize(Date src, Type type, - JsonSerializationContext context) { + public JsonElement serialize(Date src, Type type, JsonSerializationContext context) { String format = "yyyy-MM-dd HH:mm:ss"; - long time= ((Date) src).getTime(); + long time = ((Date) src).getTime(); SimpleDateFormat sdf = new SimpleDateFormat(format); return new JsonPrimitive(sdf.format(time)); } }).create(); return gson.toJson(obj); } + /** * 字符串转成对象 + * * @param jsonString * @param cls * @return */ - public static T gsonFromJson(String jsonString,Class cls){ - Gson gson = new GsonBuilder() - .registerTypeAdapter(new TypeToken() {}.getType(), new MapTypeAdapter()) - .registerTypeAdapter(new TypeToken() {}.getType(), new MapTypeAdapter()) - .create(); + public static T gsonFromJson(String jsonString, Class cls) { + Gson gson = new GsonBuilder().registerTypeAdapter(new TypeToken() { + }.getType(), new MapTypeAdapter()).registerTypeAdapter(new TypeToken() { + }.getType(), new MapTypeAdapter()).create(); return gson.fromJson(jsonString, cls); } + /** * 界面配置list转换为服务接口端的list + * * @param * @param * @param dstList * @param srcList * @param cfgType，1为IP类型，2为字符串类型，3为增强字符串，4数值类型，5摘要类,6回调类[但字符串类域配置和增强字符串域配置在接口参数中同属于strRegionList] * @param baseCfg，配置基本信息 - * @param groupRelationList 配置分组列表 + * @param groupRelationList + * 配置分组列表 * @return */ - public static Map cfgConvert(List dstList,List srcList,Integer cfgType,BaseCfg baseCfg,List groupRelationList){ - Map map = new HashMap(); - if(cfgType==1){ + public static Map cfgConvert(List dstList, List srcList, Integer cfgType, BaseCfg baseCfg, + List groupRelationList) { + Map map = new HashMap(); + if (cfgType == 1) { List numRegionList = new ArrayList(); Integer groupId = 0; Integer numGroupId = 0; List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); - for(int i=0;i cfgs = ipConvert(cfg,baseIpCfg); - if(cfgs.size()>1){ - List ids=ConfigServiceUtil.getId(3, cfgs.size()-1); + List cfgs = ipConvert(cfg, baseIpCfg); + if (cfgs.size() > 1) { + List ids = ConfigServiceUtil.getId(3, cfgs.size() - 1); regionIdList.addAll(ids); } - for(int j=i;j groupIdList = ConfigServiceUtil.getId(2, srcList.size()); List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); - for(int i=0;i groupIdList = ConfigServiceUtil.getId(2, srcList.size()); List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); - for(int i=0;i groupIdList = ConfigServiceUtil.getId(2, srcList.size()); List regionIdList = ConfigServiceUtil.getId(3, srcList.size()); - for(int i=0;i + * @throws IllegalAccessException + * @throws IllegalArgumentException */ - /*public static IpCfg ipConvert(IpCfg dstIp,BaseIpCfg srcIp){ - if(srcIp.getSrcIpAddress()!=null){ - if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4 || srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - if(srcMaskNum==0){ - dstIp.setSrcIpMask("0.0.0.0"); - }else{ - dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); - } - - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }else { - Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); - Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); - Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); - Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); - if(matchernV4Subnet.matches()) { - Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - if(srcMaskNum==0){ - dstIp.setSrcIpMask("0.0.0.0"); - }else{ - dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); - } - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - }else if(matcherV6Subnet.matches()){ - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }else { - throw new RuntimeException("Invalid IP/subnet mask format"); - } - } - - }else if(srcIp.getSrcIpAddress().indexOf("-")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); - dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], srcIp.getSrcIpAddress().split("-")[1])); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); - IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); - dstIp.setSrcIp(address1.toString()); - dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); - }else { - Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); - Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); - Matcher matcherV4Range=patternV4Range.matcher(srcIp.getSrcIpAddress()); - Matcher matcherV6Range=patternV6Range.matcher(srcIp.getSrcIpAddress()); - if(matcherV4Range.matches()) { - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); - dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], srcIp.getSrcIpAddress().split("-")[1])); - }else if(matcherV6Range.matches()) { - IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); - IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); - dstIp.setSrcIp(address1.toString()); - dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); - }else { - throw new RuntimeException("Invalid IP range format"); - } - } - - }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else {//all - Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); - Matcher matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); - Matcher matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); - if(matcherV4.matches()) { - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - }else if(matcherV6.matches()) { - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else { - throw new RuntimeException("Invalid IP format"); - } - } - + public static Map cfgConvert(BaseCfg src, Integer cfgType) { + Map map=Maps.newHashMap(); + List groupRelationList=Lists.newArrayList(); + Field compileIdF= Reflections.getAccessibleField(src, "compileId"); + Field groupIdF= Reflections.getAccessibleField(src, "groupId"); + Field regionIdF= Reflections.getAccessibleField(src, "regionId"); + try { + if(compileIdF==null||compileIdF.get(src)==null) { + throw new RuntimeException("Please set compileId first"); } - }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else {//all - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); + if(groupIdF==null||groupIdF.get(src)==null) { + throw new RuntimeException("Please set groupId first"); } + if(regionIdF==null||regionIdF.get(src)==null) { + throw new RuntimeException("Please set regionId first"); + } + } catch (IllegalArgumentException | IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - if(srcIp.getDestIpAddress()!=null){ - if(srcIp.getDestIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - if(dstMaskNum==0){ - dstIp.setDstIpMask("0.0.0.0"); - }else{ - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; - } - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }else { - Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); - Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); - Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); - Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); - if(matchernV4Subnet.matches()) { - Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - if(dstMaskNum==0){ - dstIp.setDstIpMask("0.0.0.0"); - }else{ - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; - } - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - }else if(matcherV6Subnet.matches()){ - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); + + if (cfgType == 1) { + List ipcfgs=Lists.newArrayList(); + List numRegionList = new ArrayList(); + BaseIpCfg baseIpCfg = new BaseIpCfg(); + BeanUtils.copyProperties(src, baseIpCfg); + Integer groupId = baseIpCfg.getGroupId(); + Integer numGroupId = 0; + IpCfg cfg = new IpCfg(); + BeanUtils.copyProperties(baseIpCfg, cfg); + // 区域IP配置，多条IP配置属于同一个分组，其他业务配置IP，一条配置一个分组 + // if(groupId==0 || !cfg.getCfgType().equals(Constants.AREA_REGION)){ + GroupCfg group = new GroupCfg(); + if (groupId == 0) { + groupId = ConfigServiceUtil.getId(2, 1).get(0); + } + group.setGroupId(groupId); + group.setCompileId(baseIpCfg.getCompileId()); + group.setAuditTime(baseIpCfg.getAuditTime()); + group.setIsValid(baseIpCfg.getIsValid()); + groupRelationList.add(group); + cfg.setGroupId(groupId); + cfg.setAuditTime(baseIpCfg.getAuditTime()); + cfg.setIsValid(baseIpCfg.getIsValid()); + List cfgs = ipConvert(cfg, baseIpCfg); + List regionIdList=Lists.newArrayListWithCapacity(cfgs.size() - 1); + if (cfgs.size() > 1) { + List ids = ConfigServiceUtil.getId(3, cfgs.size() - 1); + regionIdList.addAll(ids); + } + for (int i = 1; i < cfgs.size(); i++) { + cfgs.get(i).setRegionId(regionIdList.get(i-1)); + } + ipcfgs.addAll(cfgs); + map.put("ipRegionList", ipcfgs); + // 如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况） + if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) { + if (numGroupId == 0) { + GroupCfg group1 = new GroupCfg(); + if(baseIpCfg.getNumberRegionGroupId()!=null) { + group1.setGroupId(baseIpCfg.getNumberRegionGroupId()); }else { - throw new RuntimeException("Invalid IP/subnet mask format"); + group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); } - } - - }else if(srcIp.getDestIpAddress().indexOf("-")!=-1){ - if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); - dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], srcIp.getDestIpAddress().split("-")[1])); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); - IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); - dstIp.setDstIp(address1.toString()); - dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); - }else { - Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); - Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); - Matcher matcherV4Range=patternV4Range.matcher(srcIp.getDestIpAddress()); - Matcher matcherV6Range=patternV6Range.matcher(srcIp.getDestIpAddress()); - if(matcherV4Range.matches()) { - dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); - dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], srcIp.getDestIpAddress().split("-")[1])); - }else if(matcherV6Range.matches()) { - IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); - IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); - dstIp.setDstIp(address1.toString()); - dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); + group1.setCompileId(baseIpCfg.getCompileId()); + group1.setAuditTime(baseIpCfg.getAuditTime()); + group1.setIsValid(baseIpCfg.getIsValid()); + groupRelationList.add(group1); + NumBoundaryCfg numCfg = new NumBoundaryCfg(); + numCfg.initDefaultValue(); + numCfg.setLowBoundary(baseIpCfg.getProtocolId()); + numCfg.setUpBoundary(baseIpCfg.getProtocolId()); + if(baseIpCfg.getNumberRegionRegionId()!=null) { + numCfg.setRegionId(baseIpCfg.getNumberRegionRegionId()); }else { - throw new RuntimeException("Invalid IP range format"); + numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0)); } + numCfg.setAuditTime(baseIpCfg.getAuditTime()); + numCfg.setGroupId(group1.getGroupId()); + numCfg.setIsValid(baseIpCfg.getIsValid()); + numRegionList.add(numCfg); + map.put("numRegionList", numRegionList); + numGroupId++; } - - }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else {//all - Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); - Matcher matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); - Matcher matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); - if(matcherV4.matches()) { - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - }else if(matcherV6.matches()) { - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else { - throw new RuntimeException("invalid ip format"); - } - } - } - }else{ - if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else {//all - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - } - } - if(srcIp.getSrcPort()!=null){ - if(srcIp.getSrcPort().indexOf("/")!=-1){ - String srcMaskNum = srcIp.getSrcPort().split("/")[1]; - dstIp.setSrcPortMask(srcMaskNum); - dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); - }else{ - dstIp.setSrcPort(srcIp.getSrcPort()); - dstIp.setSrcPortMask("65535"); - } - }else{ - dstIp.setSrcPort("0"); - dstIp.setSrcPortMask("65535"); - } - if(srcIp.getDestPort()!=null){ - if(srcIp.getDestPort().indexOf("/")!=-1){ - String dstMaskNum = srcIp.getDestPort().split("/")[1]; - dstIp.setDstPortMask(dstMaskNum); - dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); - }else{ - dstIp.setDstPort(srcIp.getDestPort()); - dstIp.setDstPortMask("65535"); - } - }else{ - dstIp.setDstPort("0"); - dstIp.setDstPortMask("65535"); - } - return dstIp; - }*/ + } else if (cfgType == 2 || cfgType == 3) { + List stringcfgs=Lists.newArrayList(); + // 一条业务配置创建一个分组 + BaseCfg baseCfg=(BaseCfg)src; + GroupCfg group = new GroupCfg(); + StringCfg cfg = new StringCfg(); + BeanUtils.copyProperties(src, cfg); + group.setGroupId(baseCfg.getGroupId()); + group.setCompileId(baseCfg.getCompileId()); + group.setAuditTime(baseCfg.getAuditTime()); + group.setIsValid(baseCfg.getIsValid()); + groupRelationList.add(group); + cfg.setGroupId(group.getGroupId()); + cfg.setRegionId(baseCfg.getRegionId()); + cfg.setAuditTime(baseCfg.getAuditTime()); + cfg.setIsValid(baseCfg.getIsValid()); + // 处理配置关键字转译 + cfg.setCfgKeywords(keywordsEscape(cfg.getCfgKeywords())); + // 增强字符串转换 + cfg.setDistrict(keywordsEscape(cfg.getDistrict())); + stringcfgs.add(cfg); + map.put("strRegionList", stringcfgs); + } else if (cfgType == 4) { + List numCfgs=Lists.newArrayList(); + // 一条业务配置创建一个分组 + BaseCfg baseCfg=(BaseCfg)src; + com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg(); + BeanUtils.copyProperties(src, cfg); + GroupCfg group = new GroupCfg(); + group.setGroupId(baseCfg.getGroupId()); + group.setCompileId(baseCfg.getCompileId()); + group.setAuditTime(baseCfg.getAuditTime()); + group.setIsValid(baseCfg.getIsValid()); + groupRelationList.add(group); + cfg.setGroupId(group.getGroupId()); + cfg.setRegionId(baseCfg.getRegionId()); + cfg.setAuditTime(baseCfg.getAuditTime()); + cfg.setIsValid(baseCfg.getIsValid()); + numCfgs.add(cfg); + map.put("numRegionList", numCfgs); + } else if (cfgType == 5) { + List digestCfgs=Lists.newArrayList(); + BaseCfg baseCfg=(BaseCfg)src; + // 一条业务配置创建一个分组 + com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg(); + BeanUtils.copyProperties(src, cfg); + GroupCfg group = new GroupCfg(); + group.setGroupId(baseCfg.getGroupId()); + group.setCompileId(baseCfg.getCompileId()); + group.setAuditTime(baseCfg.getAuditTime()); + group.setIsValid(baseCfg.getIsValid()); + groupRelationList.add(group); + cfg.setGroupId(group.getGroupId()); + cfg.setRegionId(baseCfg.getRegionId()); + cfg.setAuditTime(baseCfg.getAuditTime()); + cfg.setIsValid(baseCfg.getIsValid()); + digestCfgs.add(cfg); + map.put("digestRegionList", digestCfgs); + } else { + throw new RuntimeException("unknown cfgType "+cfgType); + } + map.put("groupRelationList", groupRelationList); + return map; + } + /** * 界面IP配置转换为MAAT类或者回调类IP配置 + * * @param dstIp * @param srcIp * @return */ - public static List ipConvert(IpCfg dstIp,BaseIpCfg srcIp){ - List ipConvertList=Lists.newArrayList(); - boolean isRange=((srcIp.getIpPattern()!=null&&srcIp.getIpPattern()==2) - ||(srcIp.getSrcIpAddress()!=null&&srcIp.getSrcIpAddress().indexOf("-")>-1) - ||(srcIp.getDestIpAddress()!=null&&srcIp.getDestIpAddress().indexOf("-")>-1)); - if(isRange) { - List tempList=Lists.newArrayList(); - List tempList1=Lists.newArrayList(); - if(srcIp.getIpType().intValue()==4) { - if(srcIp.getSrcIpAddress()!=null){ - String startIpPart=srcIp.getSrcIpAddress().split("-")[0]; - String endIpPart=srcIp.getSrcIpAddress().split("-")[1]; - Integer startNum=Integer.parseInt(startIpPart.split("\\.")[3]); - Integer endNum=Integer.parseInt(endIpPart.split("\\.")[3]); - for(int i=startNum;i<=endNum;i++) { - IpCfg tempIp=new IpCfg(); + /* + * public static IpCfg ipConvert(IpCfg dstIp,BaseIpCfg srcIp){ + * if(srcIp.getSrcIpAddress()!=null){ + * if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ if(srcIp.getIpType()==4 || + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 Integer srcMaskNum = + * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){ + * dstIp.setSrcIpMask("0.0.0.0"); }else{ + * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } + * + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else + * if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); + * Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); + * Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); + * Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); + * if(matchernV4Subnet.matches()) { Integer srcMaskNum = + * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){ + * dstIp.setSrcIpMask("0.0.0.0"); }else{ + * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else + * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = + * IPv6Network.fromString(srcIp.getSrcIpAddress()); + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { throw new RuntimeException("Invalid IP/subnet mask format"); } } + * + * }else if(srcIp.getSrcIpAddress().indexOf("-")!=-1){ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); + * dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], + * srcIp.getSrcIpAddress().split("-")[1])); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 IPv6Address address1 = + * IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); IPv6Address + * address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); + * IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + * dstIp.setSrcIp(address1.toString()); + * dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); }else { + * Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); + * Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); + * Matcher matcherV4Range=patternV4Range.matcher(srcIp.getSrcIpAddress()); + * Matcher matcherV6Range=patternV6Range.matcher(srcIp.getSrcIpAddress()); + * if(matcherV4Range.matches()) { + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("-")[0]); + * dstIp.setSrcIpMask(IpUtil.getMask(srcIp.getSrcIpAddress().split("-")[0], + * srcIp.getSrcIpAddress().split("-")[1])); }else if(matcherV6Range.matches()) { + * IPv6Address address1 = + * IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); IPv6Address + * address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); + * IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + * dstIp.setSrcIp(address1.toString()); + * dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); }else { + * throw new RuntimeException("Invalid IP range format"); } } + * + * }else{ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else {//all + * Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); Pattern + * patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher + * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher + * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches()) + * { dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) { + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw + * new RuntimeException("Invalid IP format"); } } + * + * } }else{ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else {//all + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); } } + * if(srcIp.getDestIpAddress()!=null){ + * if(srcIp.getDestIpAddress().indexOf("/")!=-1){ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 Integer dstMaskNum = + * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){ + * dstIp.setDstIpMask("0.0.0.0"); }else{ + * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; } + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else + * if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * IPv6Network strangeNetwork = + * IPv6Network.fromString(srcIp.getDestIpAddress()); + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); + * Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); + * Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); + * Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); + * if(matchernV4Subnet.matches()) { Integer dstMaskNum = + * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){ + * dstIp.setDstIpMask("0.0.0.0"); }else{ + * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; } + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else + * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = + * IPv6Network.fromString(srcIp.getDestIpAddress()); + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { throw new RuntimeException("Invalid IP/subnet mask format"); } } + * + * }else if(srcIp.getDestIpAddress().indexOf("-")!=-1){ + * if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); + * dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], + * srcIp.getDestIpAddress().split("-")[1])); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 IPv6Address address1 = + * IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); IPv6Address + * address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); + * IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + * dstIp.setDstIp(address1.toString()); + * dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); }else { + * Pattern patternV4Range=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP); + * Pattern patternV6Range=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP); + * Matcher matcherV4Range=patternV4Range.matcher(srcIp.getDestIpAddress()); + * Matcher matcherV6Range=patternV6Range.matcher(srcIp.getDestIpAddress()); + * if(matcherV4Range.matches()) { + * dstIp.setDstIp(srcIp.getDestIpAddress().split("-")[0]); + * dstIp.setDstIpMask(IpUtil.getMask(srcIp.getDestIpAddress().split("-")[0], + * srcIp.getDestIpAddress().split("-")[1])); }else if(matcherV6Range.matches()) + * { IPv6Address address1 = + * IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); IPv6Address + * address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); + * IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + * dstIp.setDstIp(address1.toString()); + * dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); }else { + * throw new RuntimeException("Invalid IP range format"); } } + * + * }else{ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else {//all + * Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); Pattern + * patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher + * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher + * matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); + * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) { + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw + * new RuntimeException("invalid ip format"); } } + * + * } }else{ if(srcIp.getIpType()==4|| + * srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| + * srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else {//all + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); } } if(srcIp.getSrcPort()!=null){ + * if(srcIp.getSrcPort().indexOf("/")!=-1){ String srcMaskNum = + * srcIp.getSrcPort().split("/")[1]; dstIp.setSrcPortMask(srcMaskNum); + * dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); }else{ + * dstIp.setSrcPort(srcIp.getSrcPort()); dstIp.setSrcPortMask("65535"); } }else{ + * dstIp.setSrcPort("0"); dstIp.setSrcPortMask("65535"); } + * if(srcIp.getDestPort()!=null){ if(srcIp.getDestPort().indexOf("/")!=-1){ + * String dstMaskNum = srcIp.getDestPort().split("/")[1]; + * dstIp.setDstPortMask(dstMaskNum); + * dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); }else{ + * dstIp.setDstPort(srcIp.getDestPort()); dstIp.setDstPortMask("65535"); } + * }else{ dstIp.setDstPort("0"); dstIp.setDstPortMask("65535"); } return dstIp; + * } + */ + /** + * 界面IP配置转换为MAAT类或者回调类IP配置 + * + * @param dstIp + * @param srcIp + * @return + */ + public static List ipConvert(IpCfg dstIp, BaseIpCfg srcIp) { + List ipConvertList = Lists.newArrayList(); + boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2) + || (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1) + || (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1)); + if (isRange) { + List tempList = Lists.newArrayList(); + List tempList1 = Lists.newArrayList(); + if (srcIp.getIpType().intValue() == 4) { + if (srcIp.getSrcIpAddress() != null) { + String startIpPart = srcIp.getSrcIpAddress().split("-")[0]; + String endIpPart = srcIp.getSrcIpAddress().split("-")[1]; + Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]); + Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]); + for (int i = startNum; i <= endNum; i++) { + IpCfg tempIp = new IpCfg(); BeanUtils.copyProperties(dstIp, tempIp); - tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".")+1)+i); + tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i); tempIp.setSrcIpMask("255.255.255.255"); tempList.add(tempIp); } - }else { + } else { dstIp.setSrcIp("0.0.0.0"); dstIp.setSrcIpMask("255.255.255.255"); tempList.add(dstIp); } - if(srcIp.getDestIpAddress()!=null){ - String startIpPart=srcIp.getDestIpAddress().split("-")[0]; - String endIpPart=srcIp.getDestIpAddress().split("-")[1]; - Integer startNum=Integer.parseInt(startIpPart.split("\\.")[3]); - Integer endNum=Integer.parseInt(endIpPart.split("\\.")[3]); - for(IpCfg _cfg:tempList) { - for(int i=startNum;i<=endNum;i++) { - IpCfg tempIp=new IpCfg(); + if (srcIp.getDestIpAddress() != null) { + String startIpPart = srcIp.getDestIpAddress().split("-")[0]; + String endIpPart = srcIp.getDestIpAddress().split("-")[1]; + Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]); + Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]); + for (IpCfg _cfg : tempList) { + for (int i = startNum; i <= endNum; i++) { + IpCfg tempIp = new IpCfg(); BeanUtils.copyProperties(_cfg, tempIp); - tempIp.setDstIp(startIpPart.substring(0, startIpPart.lastIndexOf(".")+1)+i); + tempIp.setDstIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i); tempIp.setDstIpMask("255.255.255.255"); - //处理 - convertPortValues(tempIp,srcIp); - if(!tempIp.getSrcIp().equals(tempIp.getDstIp())) { + // 处理 + convertPortValues(tempIp, srcIp); + if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) { tempList1.add(tempIp); } - + } } tempList.clear(); - }else { - for(IpCfg _cfg:tempList) { + } else { + for (IpCfg _cfg : tempList) { _cfg.setDstIp("0.0.0.0"); _cfg.setSrcIpMask("255.255.255.255"); - convertPortValues(_cfg,srcIp); + convertPortValues(_cfg, srcIp); } } - if(tempList1.size()>0) { + if (tempList1.size() > 0) { ipConvertList.addAll(tempList1); - }else { + } else { ipConvertList.addAll(tempList); } - }else if(srcIp.getIpType().intValue()==6){ - if(srcIp.getSrcIpAddress()!=null){ + } else if (srcIp.getIpType().intValue() == 6) { + if (srcIp.getSrcIpAddress() != null) { IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2); dstIp.setSrcIp(address1.toString()); dstIp.setSrcIpMask(network.getNetmask().asAddress().toString()); - }else { + } else { dstIp.setSrcIp("::"); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } - if(srcIp.getDestIpAddress()!=null) { + if (srcIp.getDestIpAddress() != null) { IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]); IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]); - IPv6Network network = IPv6Network.fromTwoAddresses(address1,address2); + IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2); dstIp.setDstIp(address1.toString()); dstIp.setDstIpMask(network.getNetmask().asAddress().toString()); - }else { + } else { dstIp.setDstIp("::"); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } - + ipConvertList.add(dstIp); - }else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + } else { + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } - }else { - if(srcIp.getSrcIpAddress()!=null){ - if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4 /*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else { + if (srcIp.getSrcIpAddress() != null) { + if (srcIp.getSrcIpAddress().indexOf("/") != -1) { + if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - if(srcMaskNum==0){ + if (srcMaskNum == 0) { dstIp.setSrcIpMask("0.0.0.0"); - }else{ + } else { dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } - + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }/*else { - Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); - Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); - Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); - Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); - if(matchernV4Subnet.matches()) { - Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - if(srcMaskNum==0){ - dstIp.setSrcIpMask("0.0.0.0"); - }else{ - dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); - } - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - }else if(matcherV6Subnet.matches()){ - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); - dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); - dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }else { - throw new RuntimeException("Invalid IP/subnet mask format"); - } - }*/ + } /* + * else { Pattern + * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern + * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher + * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher + * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress()); + * if(matchernV4Subnet.matches()) { Integer srcMaskNum = + * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){ + * dstIp.setSrcIpMask("0.0.0.0"); }else{ + * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); } + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else + * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = + * IPv6Network.fromString(srcIp.getSrcIpAddress()); + * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); + * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { throw new RuntimeException("Invalid IP/subnet mask format"); } } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } - }else{ - if(srcIp.getIpType()==4/*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else { + if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }/*else {//all - Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); - Matcher matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); - Matcher matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); - if(matcherV4.matches()) { - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - }else if(matcherV6.matches()) { - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else { - throw new RuntimeException("Invalid IP format"); - } - }*/ + } /* + * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); + * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher + * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher + * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches()) + * { dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) { + * dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw + * new RuntimeException("Invalid IP format"); } } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } } - }else{ - if(srcIp.getIpType()==4/*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else { + if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }/*else {//all - dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("255.255.255.255"); - }*/ + } /* + * else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress()); + * dstIp.setSrcIpMask("255.255.255.255"); } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } } - if(srcIp.getDestIpAddress()!=null){ - if(srcIp.getDestIpAddress().indexOf("/")!=-1){ - if(srcIp.getIpType()==4/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + if (srcIp.getDestIpAddress() != null) { + if (srcIp.getDestIpAddress().indexOf("/") != -1) { + if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - if(dstMaskNum==0){ + if (dstMaskNum == 0) { dstIp.setDstIpMask("0.0.0.0"); - }else{ - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; + } else { + dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum)); + ; } dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }/*else { - Pattern patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); - Pattern patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); - Matcher matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); - Matcher matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); - if(matchernV4Subnet.matches()) { - Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - if(dstMaskNum==0){ - dstIp.setDstIpMask("0.0.0.0"); - }else{ - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; - } - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - }else if(matcherV6Subnet.matches()){ - IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); - dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); - dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); - }else { - throw new RuntimeException("Invalid IP/subnet mask format"); - } - }*/ + } /* + * else { Pattern + * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern + * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher + * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher + * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress()); + * if(matchernV4Subnet.matches()) { Integer dstMaskNum = + * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){ + * dstIp.setDstIpMask("0.0.0.0"); }else{ + * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; } + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else + * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork = + * IPv6Network.fromString(srcIp.getDestIpAddress()); + * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); + * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else + * { throw new RuntimeException("Invalid IP/subnet mask format"); } } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } - - }else{ - if(srcIp.getIpType()==4/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + + } else { + if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }/*else {//all - Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); - Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); - Matcher matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); - Matcher matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); - if(matcherV4.matches()) { - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - }else if(matcherV6.matches()) { - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }else { - throw new RuntimeException("invalid ip format"); - } - }*/ + } /* + * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP); + * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher + * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher + * matcherV6=patternV6.matcher(srcIp.getDestIpAddress()); + * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) { + * dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw + * new RuntimeException("invalid ip format"); } } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } } - }else{ - if(srcIp.getIpType()==4/*|| srcIp.getIpType()==64*/){//64表示源ip为ipv6，目的ip为ipv4 + } else { + if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("255.255.255.255"); - }else if(srcIp.getIpType()==6/*|| srcIp.getIpType()==46*/){//46表示源ip为ipv4，目的ip为ipv6 + } else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - }/*else {//all - dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("255.255.255.255"); - }*/ + } /* + * else {//all dstIp.setDstIp(srcIp.getDestIpAddress()); + * dstIp.setDstIpMask("255.255.255.255"); } + */ else { - throw new RuntimeException("Unsupported IP type "+srcIp.getIpType()); + throw new RuntimeException("Unsupported IP type " + srcIp.getIpType()); } } - if(srcIp.getSrcPort()!=null){ - if(srcIp.getSrcPort().indexOf("/")!=-1){ + if (srcIp.getSrcPort() != null) { + if (srcIp.getSrcPort().indexOf("/") != -1) { String srcMaskNum = srcIp.getSrcPort().split("/")[1]; dstIp.setSrcPortMask(srcMaskNum); dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); - }else{ + } else { dstIp.setSrcPort(srcIp.getSrcPort()); dstIp.setSrcPortMask("65535"); } - }else{ + } else { dstIp.setSrcPort("0"); dstIp.setSrcPortMask("65535"); } - if(srcIp.getDestPort()!=null){ - if(srcIp.getDestPort().indexOf("/")!=-1){ + if (srcIp.getDestPort() != null) { + if (srcIp.getDestPort().indexOf("/") != -1) { String dstMaskNum = srcIp.getDestPort().split("/")[1]; dstIp.setDstPortMask(dstMaskNum); dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); - }else{ + } else { dstIp.setDstPort(srcIp.getDestPort()); dstIp.setDstPortMask("65535"); } - }else{ + } else { dstIp.setDstPort("0"); dstIp.setDstPortMask("65535"); } @@ -1015,42 +1122,45 @@ public abstract class BaseService { } return ipConvertList; } + /** * 设置端口值 + * * @param dstIp * @param srcIp */ - public static void convertPortValues(IpCfg dstIp,BaseIpCfg srcIp) { - if(srcIp.getSrcPort()!=null){ - if(srcIp.getSrcPort().indexOf("/")!=-1){ + public static void convertPortValues(IpCfg dstIp, BaseIpCfg srcIp) { + if (srcIp.getSrcPort() != null) { + if (srcIp.getSrcPort().indexOf("/") != -1) { String srcMaskNum = srcIp.getSrcPort().split("/")[1]; dstIp.setSrcPortMask(srcMaskNum); dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); - }else{ + } else { dstIp.setSrcPort(srcIp.getSrcPort()); dstIp.setSrcPortMask("65535"); } - }else{ + } else { dstIp.setSrcPort("0"); dstIp.setSrcPortMask("65535"); } - if(srcIp.getDestPort()!=null){ - if(srcIp.getDestPort().indexOf("/")!=-1){ + if (srcIp.getDestPort() != null) { + if (srcIp.getDestPort().indexOf("/") != -1) { String dstMaskNum = srcIp.getDestPort().split("/")[1]; dstIp.setDstPortMask(dstMaskNum); dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); - }else{ + } else { dstIp.setDstPort(srcIp.getDestPort()); dstIp.setDstPortMask("65535"); } - }else{ + } else { dstIp.setDstPort("0"); dstIp.setDstPortMask("65535"); } } - //拦截策略 - public ProxyObjKeyring convertCallBackProxyObjKeyring(PxyObjKeyring cfg){ - ProxyObjKeyring proxyObjKeyring=new ProxyObjKeyring(); + + // 拦截策略 + public ProxyObjKeyring convertCallBackProxyObjKeyring(PxyObjKeyring cfg) { + ProxyObjKeyring proxyObjKeyring = new ProxyObjKeyring(); proxyObjKeyring.setId(Long.valueOf(cfg.getCompileId())); proxyObjKeyring.setCfgId(cfg.getCompileId()); proxyObjKeyring.setCrl(cfg.getCrl()); @@ -1066,11 +1176,13 @@ public abstract class BaseService { proxyObjKeyring.setOpTime(cfg.getAuditTime()); return proxyObjKeyring; } - //可信证书 - public List convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){ - List proxyObjTrustedCas=new ArrayList<>(); - if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){ - ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa(); + + // 可信证书 + public List convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert, + PxyObjTrustedCaCrl cfgCrl) { + List proxyObjTrustedCas = new ArrayList<>(); + if (cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())) { + ProxyObjTrustedCa proxyObjTrustedCaCert = new ProxyObjTrustedCa(); proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId())); proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId()); proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId()); @@ -1081,8 +1193,8 @@ public abstract class BaseService { proxyObjTrustedCaCert.setOpTime(cfgCert.getAuditTime()); proxyObjTrustedCas.add(proxyObjTrustedCaCert); } - if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){ - ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa(); + if (cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())) { + ProxyObjTrustedCa proxyObjTrustedCaCert = new ProxyObjTrustedCa(); proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId())); proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId()); proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId()); @@ -1093,13 +1205,14 @@ public abstract class BaseService { proxyObjTrustedCaCert.setCrlFile(cfgCrl.getCrlFile()); proxyObjTrustedCas.add(proxyObjTrustedCaCert); } - + return proxyObjTrustedCas; } - //ip转换为callback用ip - public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){ - NtcDnsResStrategy resStrategy=new NtcDnsResStrategy(); - resStrategy.init(); + + // ip转换为callback用ip + public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg) { + NtcDnsResStrategy resStrategy = new NtcDnsResStrategy(); + resStrategy.init(); resStrategy.setId(Long.valueOf(cfg.getCompileId())); resStrategy.setCfgId(cfg.getCompileId()); resStrategy.setReqStrateId(cfg.getCfgId()); @@ -1114,14 +1227,15 @@ public abstract class BaseService { resStrategy.setOpTime(cfg.getAuditTime()); return resStrategy; } - //ip转换为callback用ip - public InlineIp convertCallBackIp(BaseIpCfg cfg,Integer policyGroup){ - List cfgs = ipConvert(new IpCfg(),cfg); - if(cfgs.size()>1) { + + // ip转换为callback用ip + public static InlineIp convertCallBackIp(BaseIpCfg cfg, Integer policyGroup) { + List cfgs = ipConvert(new IpCfg(), cfg); + if (cfgs.size() > 1) { throw new RuntimeException("CallBack IP did not support IP range!"); } - IpCfg c=cfgs.get(0); - InlineIp ip=new InlineIp(); + IpCfg c = cfgs.get(0); + InlineIp ip = new InlineIp(); ip.setId(cfg.getCompileId()); ip.setCfgId(cfg.getCompileId()); ip.setAction(cfg.getAction()); @@ -1142,69 +1256,76 @@ public abstract class BaseService { ip.setPolicyGroup(policyGroup); return ip; } - //区域IPsetAreaEffectiveIds设置 - public void setAreaEffectiveIds(BaseCfg entity){ - List areaCfg=entity.getAreaCfg(); - List areaIsps=entity.getAreaIsp(); - if(Constants.IS_AREA_EFFECTIVE_NO==entity.getIsAreaEffective()){ - entity.setAreaEffectiveIds(""); - entity.setAreaType(null); - }else if(Constants.IS_AREA_EFFECTIVE_YES==entity.getIsAreaEffective()){ - if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){ - StringBuffer areaEffectiveIds=new StringBuffer(); - for(int i=0;i0){ - entity.setAreaEffectiveIds(""); + + // 区域IPsetAreaEffectiveIds设置 + public void setAreaEffectiveIds(BaseCfg entity) { + List areaCfg = entity.getAreaCfg(); + List areaIsps = entity.getAreaIsp(); + if (Constants.IS_AREA_EFFECTIVE_NO == entity.getIsAreaEffective()) { + entity.setAreaEffectiveIds(""); + entity.setAreaType(null); + } else if (Constants.IS_AREA_EFFECTIVE_YES == entity.getIsAreaEffective()) { + if (Constants.AREA_EFFECTIVE_TYPE_AREA_ISP == entity.getAreaType() && areaIsps != null + && areaIsps.size() > 0) { + StringBuffer areaEffectiveIds = new StringBuffer(); + for (int i = 0; i < areaIsps.size(); i++) { + if (StringUtils.isBlank(areaIsps.get(i).getArea())) { + areaEffectiveIds.append(areaIsps.get(i).getIsp()); + } else if (StringUtils.isBlank(areaIsps.get(i).getIsp())) { + areaEffectiveIds.append(areaIsps.get(i).getArea()); + } else { + areaEffectiveIds.append(areaIsps.get(i).getArea() + ":" + areaIsps.get(i).getIsp()); + } + if (i != areaIsps.size() - 1) { + areaEffectiveIds.append(","); } } + entity.setAreaEffectiveIds(areaEffectiveIds.toString()); + } else if (Constants.AREA_EFFECTIVE_TYPE_AREA_IP == entity.getAreaType() && areaCfg != null + && areaCfg.size() > 0) { + entity.setAreaEffectiveIds(""); + } + } } - public static String keywordsEscape(String cfgKeywords){ - if(StringUtils.isNotEmpty(cfgKeywords)){ - //不转译特殊字符 - cfgKeywords = cfgKeywords.trim();//首先去掉首尾空格 + + public static String keywordsEscape(String cfgKeywords) { + if (StringUtils.isNotEmpty(cfgKeywords)) { + // 不转译特殊字符 + cfgKeywords = cfgKeywords.trim();// 首先去掉首尾空格 cfgKeywords = StringEscapeUtils.unescapeHtml4(cfgKeywords); - cfgKeywords=cfgKeywords.replace("\\", "\\\\"); - cfgKeywords=cfgKeywords.replace("&", "\\&"); - cfgKeywords=cfgKeywords.replace(" ", "\\b"); - //***and***在界面表示多个关键字的与表达式，此特殊字符串在common.js中使用定义，maat端以&表示 - cfgKeywords=cfgKeywords.replace(Constants.KEYWORD_EXPR, "&"); - + cfgKeywords = cfgKeywords.replace("\\", "\\\\"); + cfgKeywords = cfgKeywords.replace("&", "\\&"); + cfgKeywords = cfgKeywords.replace(" ", "\\b"); + // ***and***在界面表示多个关键字的与表达式，此特殊字符串在common.js中使用定义，maat端以&表示 + cfgKeywords = cfgKeywords.replace(Constants.KEYWORD_EXPR, "&"); + } return cfgKeywords; } - public static String replaceContentEscape(String replaceContent){ - if(StringUtils.isNotEmpty(replaceContent)){ - //不转译特殊字符 - replaceContent = replaceContent.trim();//首先去掉首尾空格 - replaceContent=replaceContent.replace("/", "\\/");//首先转意斜杠“/” + + public static String replaceContentEscape(String replaceContent) { + if (StringUtils.isNotEmpty(replaceContent)) { + // 不转译特殊字符 + replaceContent = replaceContent.trim();// 首先去掉首尾空格 + replaceContent = replaceContent.replace("/", "\\/");// 首先转意斜杠“/” } return replaceContent; } - //asn IP 复用转换 - public List groupReuseCfgAddRemoveConvert(List> ipCfgList,Integer isValid,Integer groupId) { + + // asn IP 复用转换 + public List groupReuseCfgAddRemoveConvert(List> ipCfgList, Integer isValid, + Integer groupId) { logger.warn("convert data start"); - long start=System.currentTimeMillis(); - Date opTime=new Date(); - List maatIpList=new ArrayList<>(); - if(ipCfgList.size()>0) { - //只用一次instanceof,取代循环中每次都用一次instanceof - if(ipCfgList.get(0) instanceof AsnIpCfg) { - for(BaseCfg _cfg:ipCfgList) { + long start = System.currentTimeMillis(); + Date opTime = new Date(); + List maatIpList = new ArrayList<>(); + if (ipCfgList.size() > 0) { + // 只用一次instanceof,取代循环中每次都用一次instanceof + if (ipCfgList.get(0) instanceof AsnIpCfg) { + for (BaseCfg _cfg : ipCfgList) { IpCfg cfg = new IpCfg(); BaseIpCfg baseIpCfg = new BaseIpCfg(); - AsnIpCfg asnIpCfg=(AsnIpCfg)_cfg; + AsnIpCfg asnIpCfg = (AsnIpCfg) _cfg; BeanUtils.copyProperties(asnIpCfg, baseIpCfg); BeanUtils.copyProperties(baseIpCfg, cfg); cfg.setGroupId(asnIpCfg.getAsnIpGroup()); @@ -1213,14 +1334,14 @@ public abstract class BaseService { cfg.setUserRegion(userRegion); cfg.setIsValid(isValid); cfg.setAuditTime(opTime); - List cfgs = ipConvert(cfg,baseIpCfg); + List cfgs = ipConvert(cfg, baseIpCfg); maatIpList.addAll(cfgs); } - }else if(ipCfgList.get(0) instanceof AppIpCfg) { - for(BaseCfg _cfg:ipCfgList) { + } else if (ipCfgList.get(0) instanceof AppIpCfg) { + for (BaseCfg _cfg : ipCfgList) { IpCfg cfg = new IpCfg(); BaseIpCfg baseIpCfg = new BaseIpCfg(); - AppIpCfg appIpCfg=(AppIpCfg)_cfg; + AppIpCfg appIpCfg = (AppIpCfg) _cfg; BeanUtils.copyProperties(appIpCfg, baseIpCfg); BeanUtils.copyProperties(baseIpCfg, cfg); cfg.setGroupId(groupId); @@ -1229,38 +1350,196 @@ public abstract class BaseService { cfg.setUserRegion(userRegion); cfg.setIsValid(isValid); cfg.setAuditTime(opTime); - List cfgs = ipConvert(cfg,baseIpCfg); + List cfgs = ipConvert(cfg, baseIpCfg); maatIpList.addAll(cfgs); } } } - long end=System.currentTimeMillis(); - logger.warn("convert data finish,cost:"+(end-start)); + long end = System.currentTimeMillis(); + logger.warn("convert data finish,cost:" + (end - start)); return maatIpList; } - + public MaatCfg convertMaatCfg(BaseCfg _cfg,Integer cfgType) { + MaatCfg maatCfg = new MaatCfg(); + maatCfg.initDefaultValue(); + BeanUtils.copyProperties(_cfg, maatCfg); + maatCfg.setAction(_cfg.getAction()); + maatCfg.setAuditTime(_cfg.getAuditTime()); + Map regions=cfgConvert(_cfg, cfgType); + if(regions.get("ipRegionList")!=null) { + maatCfg.setIpRegionList(regions.get("ipRegionList")); + }else { + maatCfg.setIpRegionList(new ArrayList()); + } + if(regions.get("strRegionList")!=null) { + maatCfg.setStrRegionList(regions.get("strRegionList")); + }else { + maatCfg.setStrRegionList(new ArrayList()); + } + if(regions.get("numRegionList")!=null) { + maatCfg.setNumRegionList(regions.get("numRegionList")); + }else { + maatCfg.setNumRegionList(new ArrayList()); + } + if(regions.get("digestRegionList")!=null) { + maatCfg.setDigestRegionList(regions.get("digestRegionList")); + }else { + maatCfg.setDigestRegionList(new ArrayList()); + } + if(regions.get("groupRelationList")!=null) { + maatCfg.setGroupRelationList(regions.get("groupRelationList")); + maatCfg.setGroupNum(regions.get("groupRelationList").size()); + }else { + maatCfg.setGroupRelationList(new ArrayList()); + maatCfg.setGroupNum(0); + } + + maatCfg.setAreaIpRegionList(new ArrayList()); + maatCfg.setIsValid(_cfg.getIsValid()); + return maatCfg; + } /** - * 导入配置时数据批量入库（字符串配置） + * 导入配置时数据批量入库（IP配置） + * * @param data * @param tableName */ - @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void saveStringCfgBatch(List> data, String tableName) { - SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - SqlSession batchSqlSession = null; - try{ - batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); - for(int index = 0; index < data.size();index++){ - BaseStringCfg cfg = data.get(index); - cfg.setTableName(tableName); - ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(cfg); - } - batchSqlSession.commit(); - }finally { - if(batchSqlSession != null){ - batchSqlSession.close(); + @Transactional(readOnly = false, rollbackFor = RuntimeException.class) + public void saveIpBatch(FunctionRegionDict regionDict, FunctionServiceDict serviceDict,List cfgs, boolean send) { + if (regionDict != null) { + Integer regionType = regionDict.getRegionType(); + if (1 == regionType.intValue()) { + SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); + SqlSession batchSqlSession = null; + List configCompileList = new ArrayList(); + List callbackIpList = new ArrayList(); + try{ + batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); + for(int index = 0; index < cfgs.size();index++){ + BaseIpCfg _cfg = cfgs.get(index); + batchSqlSession.getMapper(IpCfgDao.class).insertForBatch(_cfg); + if(send) { + if(regionDict.getIsMaat().intValue()==1) { + MaatCfg maatCfg=convertMaatCfg(_cfg,1); + //userregion处理 + //限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps + if(_cfg.getAction().equals(Constants.RATELIMIT_ACTION)){ + if(_cfg.getUserRegion1().equals("0")){//丢包率 + _cfg.setUserRegion2(StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2()); + maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2()); + }else if(_cfg.getUserRegion1().equals("1")){//带宽 + _cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3()); + maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3()); + } + } + configCompileList.add(maatCfg); + }else { + //根据具体情况判断 + callbackIpList.add(this.convertCallBackIp(_cfg,_cfg.getDnsStrategyId())); + } + } + } + if (send) { + if(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); + // 调用服务接口下发配置数据 + String json = BaseService.gsonToJson(maatBean); + if(configCompileList.size()>100) { + logger.info("IP 配置下发配置条数：" + configCompileList.size()); + }else { + logger.info("IP 配置下发配置参数：" + json); + } + // 调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("IP 配置下发响应信息：" + result.getMsg()); + }else { + //调用服务接口下发配置数据 + String json=gsonToJson(callbackIpList); + logger.info("IP配置下发配置参数："+json); + //调用服务接口下发配置 + try { + ToMaatResult result = ConfigServiceUtil.put(json, 2); + if(result!=null){ + logger.info("IP配置配置下发响应信息："+result.getMsg()); + } + } catch (Exception e) { + logger.error("IP配置配置下发失败",e); + throw e; + } + } + } + batchSqlSession.commit(); + }finally { + if(batchSqlSession != null){ + batchSqlSession.close(); + } + } + } + } + + } + /** + * 导入配置时数据批量入库（字符串配置） + * + * @param data + * @param tableName + */ + @Transactional(readOnly = false, rollbackFor = RuntimeException.class) + public void saveStringCfgBatch(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, + List> data, String tableName, boolean send) { + if (regionDict != null) { + Integer regionType = regionDict.getRegionType(); + if (2 == regionType.intValue()) { + SqlSessionFactory sqlSessionFactory = SpringContextHolder.getBean(SqlSessionFactory.class); + List configCompileList = new ArrayList(); + SqlSession batchSqlSession = null; + try { + batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); + for (int index = 0; index < data.size(); index++) { + BaseStringCfg _cfg = data.get(index); + _cfg.setTableName(tableName); + ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(_cfg); + if (send) { + if(regionDict.getIsMaat().intValue()==1) { + configCompileList.add(convertMaatCfg(_cfg,2)); + //userregion处理 + } + + } + } + 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); + // 调用服务接口下发配置数据 + String json = BaseService.gsonToJson(maatBean); + if(configCompileList.size()>100) { + logger.info("字符串配置下发配置条数：" + configCompileList.size()); + }else { + logger.info("字符串配置下发配置参数：" + json); + } + // 调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("字符串配置下发响应信息：" + result.getMsg()); + + } + batchSqlSession.commit(); + } finally { + if (batchSqlSession != null) { + batchSqlSession.close(); + } + } + } else { + throw new RuntimeException("Region type must be 2!"); } } - } } diff --git a/src/main/resources/sql/20181120/update_menu_help_url b/src/main/resources/sql/20181120/update_menu_help_url new file mode 100644 index 000000000..cacf0b199 --- /dev/null +++ b/src/main/resources/sql/20181120/update_menu_help_url @@ -0,0 +1,12 @@ +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'http_block', `name` = 'HTTP管控', `sort` = 2, `href` = '/proxy/control/httpRedirect/httpBlockList', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'control:httpBlock:config', `create_by` = '1', `create_date` = '2018-07-24 11:06:03', `update_by` = '1', `update_date` = '2018-07-25 10:42:57', `remarks` = '', `del_flag` = 1, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 207 WHERE `id` = 911; +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'http_monit', `name` = 'HTTP监测', `sort` = 1, `href` = '/proxy/control/httpRedirect/httpMonitList', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'control:httpMonit:config', `create_by` = '1', `create_date` = '2018-07-24 11:08:59', `update_by` = '1', `update_date` = '2018-07-25 10:43:52', `remarks` = '', `del_flag` = 1, `menu_bg` =null, `quick_action` = 0, `is_top` = 0, `function_id` = 210 WHERE `id` = 914; +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'http_redirect', `name` = 'HTTP重定向', `sort` = 3, `href` = '/proxy/control/httpRedirect/httpRedirectList', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'control:httpRedirect:config', `create_by` = '1', `create_date` = '2018-07-24 11:06:49', `update_by` = '1', `update_date` = '2018-07-24 11:15:35', `remarks` = '', `del_flag` = 1, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 208 WHERE `id` = 912; +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'ip_redirect', `name` = 'IP控制', `sort` = 30, `href` = '/proxy/control/ip/list?cfgName=ip_control', `target` = '', `icon` = '', `is_show` = 0, `permission` = 'control:ip:config', `create_by` = '1', `create_date` = '2018-06-19 17:40:46', `update_by` = '1', `update_date` = '2018-07-24 11:11:32', `remarks` = '', `del_flag` = 0, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 202 WHERE `id` = 725; +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'http_replace', `name` = 'HTTP替换', `sort` = 4, `href` = '/proxy/control/httpRedirect/httpReplaceList', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'control:httpReplace:config', `create_by` = '1', `create_date` = '2018-07-24 11:08:34', `update_by` = '1', `update_date` = '2018-07-25 10:43:28', `remarks` = '', `del_flag` = 1, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 209 WHERE `id` = 913; +UPDATE `sys_menu` SET `parent_id` = 724, `parent_ids` = '0,1,86,719,724,', `code` = 'http_whitelist', `name` = 'HTTP白名单', `sort` = 300, `href` = '/proxy/control/httpRedirect/httpWhitelistList', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'control:httpWhitelist:config', `create_by` = '1', `create_date` = '2018-07-24 11:09:35', `update_by` = '1', `update_date` = '2018-07-25 10:44:13', `remarks` = '', `del_flag` = 1, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 211 WHERE `id` = 915; +UPDATE `sys_menu` SET `parent_id` = 1096, `parent_ids` = '0,1,86,1096,', `code` = 'ip_payload', `name` = 'IP Payload', `sort` = 2, `href` = '/proxy/intercept/ippayload/list', `target` = '', `icon` = '', `is_show` = 1, `permission` = 'intercept:ippayload:config', `create_by` = '1', `create_date` = '2018-09-26 14:23:23', `update_by` = '1', `update_date` = '2018-10-25 15:53:29', `remarks` = '', `del_flag` = 1, `menu_bg` = null, `quick_action` = 0, `is_top` = 0, `function_id` = 212 WHERE `id` = 1099; + +UPDATE `sys_menu` SET menu_bg='/online-help/proxy/control_policy' where id=719; +UPDATE `sys_menu` SET menu_bg='/online-help/proxy/intercept_policy' where id=724; +UPDATE `sys_menu` SET menu_bg='/online-help/proxy/cache_policy' where id=1161; +UPDATE `sys_menu` SET menu_bg='/online-help/proxy/proxy_policy_object' where id=1121; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp index 2ffed7570..1424d1955 100644 --- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp +++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp @@ -174,6 +174,20 @@
+ +
+ +
+ + +
+
+
+