From 070dcb911ceddddeb9d8c773d099cd98df7a78d1 Mon Sep 17 00:00:00 2001 From: leijun Date: Fri, 19 Oct 2018 19:41:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E3=80=81ddos=20Exce?= =?UTF-8?q?l=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AvFileSampleCfg.java | 4 + .../nis/domain/configuration/BaseIpCfg.java | 24 +-- .../domain/configuration/FileDigestCfg.java | 6 + .../manipulation/DdosCfgController.java | 50 +++++ .../ntc/AvContentController.java | 178 ++++++++++++++++++ .../configuration/ntc/AvController.java | 48 +++++ .../configuration/ntc/BgpCfgController.java | 16 +- .../ntc/FileTransferCfgController.java | 146 +++++++++++++- .../configuration/ntc/WebsiteController.java | 98 +++++++++- .../configuration/AvContentCfgService.java | 27 +++ .../service/configuration/BgpCfgService.java | 15 ++ .../configuration/FileTransferCfgService.java | 18 ++ .../configuration/WebsiteCfgService.java | 21 +++ .../views/cfg/av/contUrl/contUrlList.jsp | 1 + .../WEB-INF/views/cfg/av/fileSampleList.jsp | 1 + .../WEB-INF/views/cfg/av/voip/voipList.jsp | 1 + .../WEB-INF/views/cfg/ddosIpCfgList.jsp | 1 + .../views/cfg/fileTransfer/fileDigestList.jsp | 1 + .../views/cfg/fileTransfer/p2pList.jsp | 1 + .../WEB-INF/views/cfg/other/bgpList.jsp | 1 + .../WEB-INF/views/cfg/website/sslList.jsp | 1 + 21 files changed, 633 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index 7e6a9fccc..1ea7c126c 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -2,6 +2,7 @@ package com.nis.domain.configuration; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import com.nis.util.excel.ExcelField; public class AvFileSampleCfg extends BaseCfg { /** @@ -10,9 +11,11 @@ public class AvFileSampleCfg extends BaseCfg { private static final long serialVersionUID = -2356472662189941874L; @Expose @SerializedName("srcFile") + @ExcelField(title="src_file",sort=2) private String srcUrl; @Expose @SerializedName("dstFile") + @ExcelField(title="sample_file",sort=3) private String sampleUrl; @Expose @SerializedName("srcFileMd5") @@ -21,6 +24,7 @@ public class AvFileSampleCfg extends BaseCfg { @SerializedName("dstFileMd5") private String sampleMd5; @Expose + @ExcelField(title="harm_level",sort=21) private Integer level; @Expose @SerializedName("cfgId") diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index b92e82418..3767cae4b 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -42,24 +42,24 @@ public class BaseIpCfg extends BaseCfg { */ @Expose @SerializedName("ipType") - @ExcelField(title="ip_type",dictType="IP_TYPE",sort=101) + @ExcelField(title="ip_type",dictType="IP_TYPE",sort=2) protected Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=102) + @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=3) protected Integer ipPattern; - @ExcelField(title="client_ip",sort=103) + @ExcelField(title="client_ip",sort=4) protected String srcIpAddress; - @ExcelField(title="server_ip",sort=104) + @ExcelField(title="server_ip",sort=5) protected String destIpAddress; - @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=105) + @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=6) protected Integer portPattern; - @ExcelField(title="client_port",sort=106) + @ExcelField(title="client_port",sort=7) protected String srcPort; - @ExcelField(title="server_port",sort=107) + @ExcelField(title="server_port",sort=8) protected String destPort; protected Integer dnsStrategyId; - @ExcelField(title="ir_type",dictType="IR_TYPE",sort=108) + @ExcelField(title="ir_type",dictType="IR_TYPE",sort=9) protected Integer irType; - @ExcelField(title="group_name",sort=109) + @ExcelField(title="group_name",sort=10) protected String groupName; private List ntcSubscribeIdCfgList; @@ -97,14 +97,14 @@ public class BaseIpCfg extends BaseCfg { */ @Expose @SerializedName("direction") - @ExcelField(title="direction",dictType="DIRECTION",sort=110) + @ExcelField(title="direction",dictType="DIRECTION",sort=11) protected Integer direction ; /** - * 方向 + * 协议 */ @Expose @SerializedName("protocol") - @ExcelField(title="protocol",dictType="PROTOCOL",sort=111) + @ExcelField(title="protocol",dictType="PROTOCOL",sort=12) protected Integer protocol ; /** * 协议ID diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index bc7c7eab3..4b9905b63 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -10,6 +10,8 @@ package com.nis.domain.configuration; import java.util.List; +import com.nis.util.excel.ExcelField; + /** * 文件摘要配置 @@ -26,9 +28,13 @@ public class FileDigestCfg extends BaseCfg { */ private static final long serialVersionUID = 2796500715438264119L; private static final String tableName="file_digest_cfg"; + @ExcelField(title="raw_len",sort=3) private Long rawLen; + @ExcelField(title="digest",sort=2) private String digest; + @ExcelField(title="cfds_level",sort=4) private Integer cfdsLevel; + @ExcelField(title="file_url",sort=5) private String fileUrl; private NtcSubscribeIdCfg ntcSubscribeIdCfg; diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index ade797550..1347f31ba 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -1,7 +1,10 @@ package com.nis.web.controller.configuration.manipulation; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -16,12 +19,15 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.ServiceDictInfo; +import com.nis.domain.configuration.AvFileSampleCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.DnsResStrategy; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.RequestInfo; import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -93,4 +99,48 @@ public class DdosCfgController extends BaseController { return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+functionId; } + //ddos配置导出 + @RequestMapping(value = "exportDdos") + public void exportddos(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")DdosIpCfg entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = ddosCfgService.findPage(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), DdosIpCfg.class); + String cfgIndexInfoNoExport=",client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), page.getList()); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("ddos export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index cec0d658d..9a3ffccc3 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -872,4 +872,182 @@ public class AvContentController extends BaseController { return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+entity.getFunctionId(); } + + //stream配置导出 + @RequestMapping(value = "exportStream") + public void exportsteam(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); + } + if(entity.getAvContUrlCfgList()== null){ + entity.setAvContUrlCfg(new AvContUrlCfg());; + } + if(entity.getNtcSubscribeIdCfg()==null){ + entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); + } + Page page = avContentCfgService.findPage(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); + titleList.add("NTC_UNIVERSAL_IP"); + titleList.add("NTC_STREAMING_MEDIA_URL"); + titleList.add("NTC_SUBSCRIBE_ID"); + classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); + classMap.put("NTC_STREAMING_MEDIA_URL", BaseStringCfg.class); + classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); + + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + String regionCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("NTC_UNIVERSAL_IP", ipPortInfoNoExport); + noExportMap.put("NTC_STREAMING_MEDIA_URL", regionCfgNoExport); + noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); + List ipList=new ArrayList(); + List subscribeInfoList=new ArrayList(); + List streamurlList=new ArrayList(); + for (CfgIndexInfo cfg : page.getList()) { + Map maps=avContentCfgService.exportstream(cfg); + ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); + streamurlList.addAll(maps.get("NTC_STREAMING_MEDIA_URL")); + subscribeInfoList.addAll(maps.get("NTC_SUBSCRIBE_ID")); + } + streamurlList=BaseStringCfg.replaceBaseKeyList(streamurlList); + dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put("NTC_UNIVERSAL_IP", ipList); + dataMap.put("NTC_STREAMING_MEDIA_URL", streamurlList); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("stream export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + + //voip配置导出 + @RequestMapping(value = "exportVoip") + public void exportvoip(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"r"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); + } + if(entity.getVoipAccount()== null){ + entity.setVoipAccount(new AvVoipAccountCfg()); + } + if(entity.getNtcSubscribeIdCfg()==null){ + entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); + } + Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); + titleList.add(entity.getMenuNameCode()); + titleList.add("NTC_UNIVERSAL_IP"); + titleList.add("NTC_VOIP_ACCOUNT"); + titleList.add("NTC_SUBSCRIBE_ID"); + classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); + classMap.put("NTC_VOIP_ACCOUNT", BaseStringCfg.class); + classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); + + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + String regionCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("NTC_UNIVERSAL_IP", ipPortInfoNoExport); + noExportMap.put("NTC_VOIP_ACCOUNT", regionCfgNoExport); + noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); + List ipList=new ArrayList(); + List subscribeInfoList=new ArrayList(); + List countlList=new ArrayList(); + for (CfgIndexInfo cfg : page.getList()) { + Map maps=avContentCfgService.exportvoip(cfg); + ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); + countlList.addAll(maps.get("NTC_VOIP_ACCOUNT")); + subscribeInfoList.addAll(maps.get("NTC_SUBSCRIBE_ID")); + } + countlList=BaseStringCfg.replaceBaseKeyList(countlList); + dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put("NTC_UNIVERSAL_IP", ipList); + dataMap.put("NTC_VOIP_ACCOUNT", countlList); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("voip export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index c672e6ccd..4c8b531b2 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -1,6 +1,7 @@ package com.nis.web.controller.configuration.ntc; import java.io.File; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -25,6 +26,8 @@ import com.nis.domain.Page; import com.nis.domain.configuration.AvFileSampleCfg; import com.nis.domain.configuration.AvSignSampleCfg; import com.nis.domain.configuration.AvSignSampleCfgModel; +import com.nis.domain.configuration.FileDigestCfg; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.exceptions.CallExternalProceduresException; @@ -418,4 +421,49 @@ public class AvController extends BaseController { } return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId; } + + //ysp配置导出 + @RequestMapping(value = "exportYsp") + public void exportysp(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")AvFileSampleCfg entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = avCfgService.getAvFileSampleList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class); + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), page.getList()); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("ysp export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index a589969a3..d0fbf7cca 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; +import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; @@ -182,11 +183,11 @@ public class BgpCfgController extends BaseController{ Page page = bgpCfgService.getBgpList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); - titleList.add("NTC_DNS_REGION"); + titleList.add("NTC_BGP_AS"); titleList.add("NTC_SUBSCRIBE_ID"); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); classMap.put("NTC_IP", IpPortCfg.class); - classMap.put("NTC_DNS_REGION", ComplexkeywordCfg.class); + classMap.put("NTC_BGP_AS", BaseStringCfg.class); classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" @@ -203,20 +204,21 @@ public class BgpCfgController extends BaseController{ +",userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); noExportMap.put("NTC_IP", ipPortInfoNoExport); - noExportMap.put("NTC_DNS_REGION", regionCfgNoExport); + noExportMap.put("NTC_BGP_AS", regionCfgNoExport); noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); List ipList=new ArrayList(); List subscribeInfoList=new ArrayList(); - List regionInfoList=new ArrayList(); + List asInfoList=new ArrayList(); for (CfgIndexInfo cfg : page.getList()) { - CfgIndexInfo cfgIndexInfo=websiteCfgService.exportdns(cfg); + CfgIndexInfo cfgIndexInfo=bgpCfgService.exportbgp(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList()); - regionInfoList.addAll(cfgIndexInfo.getDomainList()); + asInfoList.addAll(cfgIndexInfo.getNtcBgpAsCfgList()); } + asInfoList=BaseStringCfg.replaceBaseKeyList(asInfoList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("NTC_IP", ipList); - dataMap.put("NTC_DNS_REGION", regionInfoList); + dataMap.put("NTC_BGP_AS", asInfoList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); /*}*/ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 68c07ab21..86f7f2d74 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; +import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.FileDigestCfg; @@ -489,12 +490,12 @@ public class FileTransferCfgController extends BaseController{ } Page page = fileTransferCfgService.getFtpList(pageInfo, entity); titleList.add(entity.getMenuNameCode()); - titleList.add("NTC_IP"); + titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_FTP_URL"); titleList.add("NTC_FTP_CONTENT"); titleList.add("NTC_SUBSCRIBE_ID"); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); - classMap.put("NTC_IP", IpPortCfg.class); + classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); classMap.put("NTC_FTP_URL", BaseStringCfg.class); classMap.put("NTC_FTP_CONTENT", BaseStringCfg.class); classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); @@ -514,7 +515,7 @@ public class FileTransferCfgController extends BaseController{ +",userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); - noExportMap.put("NTC_IP", ipPortInfoNoExport); + noExportMap.put("NTC_UNIVERSAL_IP", ipPortInfoNoExport); noExportMap.put("NTC_FTP_URL", regionCfgNoExport); noExportMap.put("NTC_FTP_CONTENT", regionCfgNoExport); noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); @@ -532,7 +533,7 @@ public class FileTransferCfgController extends BaseController{ ftpkeyList=BaseStringCfg.replaceBaseKeyList(ftpkeyList); ftpurlList=BaseStringCfg.replaceBaseKeyList(ftpurlList); dataMap.put(entity.getMenuNameCode(), page.getList()); - dataMap.put("NTC_IP", ipList); + dataMap.put("NTC_UNIVERSAL_IP", ipList); dataMap.put("NTC_FTP_URL", ftpurlList); dataMap.put("NTC_FTP_CONTENT", ftpkeyList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); @@ -545,5 +546,140 @@ public class FileTransferCfgController extends BaseController{ //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } - + //p2p配置导出 + @RequestMapping(value = "exportP2p") + public void exportp2p(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = fileTransferCfgService.getP2pList(pageInfo, entity); + + titleList.add(entity.getMenuNameCode()); + titleList.add("NTC_UNIVERSAL_IP"); + titleList.add("NTC_P2P_KEYWORDS"); + titleList.add("NTC_P2P_HASH_BIN"); + titleList.add("NTC_SUBSCRIBE_ID"); + classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); + classMap.put("NTC_P2P_KEYWORDS", BaseStringCfg.class); + classMap.put("NTC_P2P_HASH_BIN", BaseStringCfg.class); + classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); + + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,ir_type,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion2,userregion3,userregion4,userregion5,group_name,"; + String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + String hashCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion2,userregion3,userregion4,userregion5,"; + String keyCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("NTC_UNIVERSAL_IP", ipPortInfoNoExport); + noExportMap.put("NTC_P2P_KEYWORDS", keyCfgNoExport); + noExportMap.put("NTC_P2P_HASH_BIN", hashCfgNoExport); + noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); + List ipList=new ArrayList(); + List subscribeInfoList=new ArrayList(); + List hashList=new ArrayList(); + List keywordList=new ArrayList(); + for (CfgIndexInfo cfg : page.getList()) { + Map maps=fileTransferCfgService.exportp2p(cfg); + keywordList.addAll(maps.get("NTC_P2P_KEYWORDS")); + hashList.addAll(maps.get("NTC_P2P_HASH_BIN")); + ipList.addAll(maps.get("NTC_UNIVERSAL_IP")); + subscribeInfoList.addAll(maps.get("NTC_SUBSCRIBE_ID")); + } + keywordList=BaseStringCfg.replaceBaseKeyList(keywordList); + hashList=BaseStringCfg.replaceBaseKeyList(hashList); + dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put("NTC_UNIVERSAL_IP", ipList); + dataMap.put("NTC_P2P_KEYWORDS", keywordList); + dataMap.put("NTC_P2P_HASH_BIN", hashList); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("p2p export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + + + //file配置导出 + @RequestMapping(value = "exportFile") + public void exportfile(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")FileDigestCfg entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + + /*//导出选中记录 + * if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + entity.setTableName(IpPortCfg.getTablename()); + Page pageInfo=new Page(request, response,"a"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = fileTransferCfgService.getFileDigestList(pageInfo, entity); + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + dataMap.put(entity.getMenuNameCode(), page.getList()); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("file export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 7e9962f82..218a248e9 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -521,9 +521,9 @@ public class WebsiteController extends BaseController{ - //ip配置导出 + //http配置导出 @RequestMapping(value = "exportHttp") - public String exportIp(Model model,HttpServletRequest request,HttpServletResponse response, + public String exportHttp(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -723,5 +723,99 @@ public class WebsiteController extends BaseController{ } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } + + //ssl配置导出 + @RequestMapping(value = "exportSsl") + public String exportssl(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ + try { + //export data info + List titleList=new ArrayList(); + Map> classMap=new HashMap>(); + Map dataMap=new HashMap(); + Map noExportMap=new HashMap(); + + List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); + + /*//导出选中记录 + if(!StringUtil.isEmpty(ids)){ + for(String id:ids.split(",")){ + Long.parseLong(id); + } + //List list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids); + }else{*/ + //条件导出数据大于最大导出数，只导出最大导出条数 + Page pageInfo=new Page(request, response,"a"); + if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){ + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + }else{ + pageInfo.setPageNo(1); + pageInfo.setPageSize(-1); + } + Page page = websiteCfgService.getWebsiteList(pageInfo, entity); + + titleList.add(entity.getMenuNameCode()); + titleList.add("NTC_UNIVERSAL_IP"); + titleList.add("NTC_SSL_SNI"); + titleList.add("NTC_SSL_SAN"); + titleList.add("NTC_SSL_CN"); + titleList.add("NTC_SUBSCRIBE_ID"); + classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class); + classMap.put("NTC_SSL_SNI", BaseStringCfg.class); + classMap.put("NTC_SSL_SAN", BaseStringCfg.class); + classMap.put("NTC_SSL_CN", BaseStringCfg.class); + classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); + String cfgIndexInfoNoExport=",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String sslNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + String ipPortCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + + ",config_time,editor,edit_time,auditor,audit_time" + +",letter,whether_area_block,classification,attribute,label" + +",userregion1,userregion2,userregion3,userregion4,userregion5,"; + noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); + noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport); + noExportMap.put("NTC_SSL_SNI", sslNoExport); + noExportMap.put("NTC_SSL_SAN", sslNoExport); + noExportMap.put("NTC_SSL_CN", sslNoExport); + noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport); + + List sslSniList = new ArrayList<>(); + List sslSnaList = new ArrayList<>(); + List sslCnList = new ArrayList<>(); + List ipPortList = new ArrayList<>(); + List subscribeIdList = new ArrayList<>(); + for (CfgIndexInfo cfg : page.getList()) { + Map maps=websiteCfgService.exportssl(cfg); + sslSniList.addAll(maps.get("NTC_SSL_SNI")); + sslSnaList.addAll(maps.get("NTC_SSL_SAN")); + sslCnList.addAll(maps.get("NTC_SSL_CN")); + ipPortList.addAll(maps.get("NTC_UNIVERSAL_IP")); + subscribeIdList.addAll(maps.get("NTC_SUBSCRIBE_ID")); + } + sslSniList=BaseStringCfg.replaceBaseKeyList(sslSniList); + sslSnaList=BaseStringCfg.replaceBaseKeyList(sslSnaList); + sslCnList=BaseStringCfg.replaceBaseKeyList(sslCnList); + dataMap.put(entity.getMenuNameCode(), page.getList()); + dataMap.put("NTC_UNIVERSAL_IP", ipPortList); + dataMap.put("NTC_SSL_SNI", sslSniList); + dataMap.put("NTC_SSL_SAN", sslSnaList); + dataMap.put("NTC_SSL_CN", sslCnList); + dataMap.put("NTC_SUBSCRIBE_ID",subscribeIdList); + /*}*/ + this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + } catch (Exception e) { + logger.error("http export failed",e); + addMessage(redirectAttributes, "export_failed"); + } + return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); + } } diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index f688ab6e8..183ead19c 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -3,6 +3,7 @@ package com.nis.web.service.configuration; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -24,6 +25,8 @@ import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; +import com.nis.domain.configuration.P2pHashCfg; +import com.nis.domain.configuration.P2pKeywordCfg; import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.ToMaatBean; import com.nis.domain.maat.ToMaatResult; @@ -35,6 +38,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg; 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.util.StringUtils; import com.nis.web.dao.configuration.AreaIpCfgDao; @@ -127,6 +131,18 @@ public class AvContentCfgService extends BaseService{ return cfg; } + + public Map exportvoip(CfgIndexInfo entity){ + Map dataMap=new HashMap(); + List ntcSubscribeList=getSubscribeIdCfgList(entity); + List ipPortList = avContentCfgDao.getIpPortList(entity); + List voipAccounts=getVoipAccountCfgList(entity); + dataMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeList); + dataMap.put("NTC_VOIP_ACCOUNT", voipAccounts); + dataMap.put("NTC_UNIVERSAL_IP", ipPortList); + return dataMap; + } + public CfgIndexInfo getUrlCfgIndexInfo(CfgIndexInfo entity) { CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity); List ntcSubscribeList=getSubscribeIdCfgList(cfg); @@ -138,6 +154,17 @@ public class AvContentCfgService extends BaseService{ return cfg; } + public Map exportstream(CfgIndexInfo entity){ + Map dataMap=new HashMap(); + List ntcSubscribeList=getSubscribeIdCfgList(entity); + List avContUrlList=avContentCfgDao.getAvContUrlList(entity); + List ipPortList = avContentCfgDao.getIpPortList(entity); + dataMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeList); + dataMap.put("NTC_STREAMING_MEDIA_URL", avContUrlList); + dataMap.put("NTC_UNIVERSAL_IP", ipPortList); + return dataMap; + } + /* public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) { CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity); diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java index 5cc472225..c0d768634 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import com.nis.domain.Page; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcBgpAsCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; @@ -72,6 +73,20 @@ public class BgpCfgService extends CrudService { return page; } + public CfgIndexInfo exportbgp(CfgIndexInfo entity){ + List ipPortList = bgpCfgDao.getIpPortList(entity); + NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg(); + subscribeId.setCompileId(entity.getCompileId()); + subscribeId.setIsValid(entity.getIsValid()); + List ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId); + List ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity); + entity.setIpPortList(ipPortList); + entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList); + entity.setNtcBgpAsCfgList(ntcBgpAsCfgList); + return entity; + } + + /** * 保存配置 * @param entity diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index b6c639291..6af0b2d27 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.nis.domain.Page; +import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; @@ -37,6 +38,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; +import com.nis.util.DictUtils; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; import com.nis.util.StringUtil; @@ -674,6 +676,22 @@ public class FileTransferCfgService extends CrudService exportp2p(CfgIndexInfo entity){ + Map dataMap=new HashMap(); + List ipPortList = fileTransferCfgDao.getIpPortList(entity); + for (int i = 0; i < ipPortList.size(); i++) { + ipPortList.get(i).setUserRegion1(DictUtils.getDictLabel("P2P_IP_TYPE",ipPortList.get(i).getUserRegion1())); + } + List hashList = fileTransferCfgDao.getP2pHashList(entity); + List keywordList = fileTransferCfgDao.getP2pKeywordList(entity); + List subscribeIdList = fileTransferCfgDao.getP2pSubscribeidList(entity); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeIdList); + dataMap.put("NTC_P2P_KEYWORDS", keywordList); + dataMap.put("NTC_P2P_HASH_BIN", hashList); + dataMap.put("NTC_UNIVERSAL_IP", ipPortList); + return dataMap; + } + /** * 保存p2p配置 * @param entity diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index 4739fc293..fc88040d4 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -113,6 +113,27 @@ public class WebsiteCfgService extends CrudService { } + + public Map exportssl(CfgIndexInfo entity){ + Map dataMap=new HashMap(); + List ipPortList = websiteCfgDao.getIpPortList(entity); + List subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity); + entity.setCfgType("NTC_SSL_SNI"); + List sslSniList = websiteCfgDao.getSslKewordList(entity); + entity.setCfgType("NTC_SSL_SAN"); + List sslSanList = websiteCfgDao.getSslKewordList(entity); + entity.setCfgType("NTC_SSL_CN"); + List sslCnList = websiteCfgDao.getSslKewordList(entity); + dataMap.put("NTC_UNIVERSAL_IP", ipPortList); + dataMap.put("NTC_SSL_SNI", sslSniList); + dataMap.put("NTC_SSL_SAN", sslSanList); + dataMap.put("NTC_SSL_CN", sslCnList); + dataMap.put("NTC_SUBSCRIBE_ID", subscribeIdList); + return dataMap; + } + + + public CfgIndexInfo getSslCfg(Long cfgId){ CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId); List ipPortList = websiteCfgDao.getIpPortList(entity); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 129250bb1..fa8fbc4ea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -189,6 +189,7 @@ + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index b327db315..aa09e0cfa 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -129,6 +129,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 98bc98001..895ef17be 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -189,6 +189,7 @@ + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 61e8d98bf..922925417 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -140,6 +140,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 0c2cd9f55..29a367c92 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -166,6 +166,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 2fccc4e25..04d0156d4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -163,6 +163,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 8de6113a9..79eb45c29 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -170,6 +170,7 @@ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 6097bdc1a..479679950 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -167,6 +167,7 @@ +