From 47dadcd9aa73976b4d372af22435aa65dcb15d4e Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 26 Nov 2018 17:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BF=A1=E8=AF=81=E4=B9=A6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/PxyObjTrustedCaCert.java | 12 +++++ .../proxy/PxyObjKeyringController.java | 47 +++++++++++++++++++ .../resources/messages/message_en.properties | 4 +- .../messages/message_zh_CN.properties | 4 +- .../intercept/strateagy/trustedCertList.jsp | 2 +- 5 files changed, 66 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java b/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java index 7d4235b9b..cc07d5ca7 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java @@ -1,5 +1,6 @@ package com.nis.domain.configuration; +import com.nis.util.excel.ExcelField; /** * 可信证书 @@ -13,8 +14,19 @@ public class PxyObjTrustedCaCert extends BaseCfg { */ private static final long serialVersionUID = -2720862431960415564L; private String indexTable="pxy_obj_trusted_ca_cert"; + @ExcelField(title="issuer",sort=3) private String issuer; //颁发者 + @ExcelField(title="certificate_file",sort=2) private String certFile; + @ExcelField(title="crl_file",sort=4) + private String crlFile; + + public String getCrlFile() { + return crlFile; + } + public void setCrlFile(String crlFile) { + this.crlFile = crlFile; + } public String getIssuer() { return issuer; } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 61421538d..6b8506318 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -48,6 +48,7 @@ import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.exceptions.CallExternalProceduresException; import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MultiPartNewException; +import com.nis.util.ConfigDictUtils; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.FileUtils; @@ -414,6 +415,52 @@ public class PxyObjKeyringController extends BaseController { //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } + //pxyObjTrustedCert配置导出 + @RequestMapping(value = "exportCert") + public void exportCert(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")PxyObjTrustedCaCert 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"); + pageInfo.setPageNo(1); + pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE); + Page page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity); + for (PxyObjTrustedCaCert cert:page.getList()) { + if(!StringUtil.isEmpty(cert.getCompileId())){ + cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId())); + } + } + model.addAttribute("page", page); + titleList.add(entity.getMenuNameCode()); + classMap.put(entity.getMenuNameCode(), PxyObjTrustedCaCert.class); + String cfgIndexInfoNoExport=",whether_area_block,block_type,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:cert_name-"; + 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("pxyObjKeyring export failed",e); + addMessage(redirectAttributes, "error","export_failed"); + } + //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); + } + + @RequestMapping(value = {"/trustedCertList"}) public String trustedCertList(Model model,HttpServletRequest request,HttpServletResponse response ,@ModelAttribute("cfg")PxyObjTrustedCaCert entity diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 3c1285322..b1aa635a7 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1312,4 +1312,6 @@ dns_sub=DNS Security action_cache=Cache action_cache_whitelist=Cache Bypass crl_issuer_null=Issuer of CRL file is empty -block_by_app_server_ip=Block by application server ip \ No newline at end of file +block_by_app_server_ip=Block by application server ip +certificate_file=Certificate File +crl_file=Crl File \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index af833ec07..366de7c02 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1308,4 +1308,6 @@ dns_sub=DNS\u5B89\u5168\u673A\u5236 action_cache=\u7F13\u5B58 action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355 crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A -block_by_app_server_ip=Block by application server ip \ No newline at end of file +block_by_app_server_ip=Block by application server ip +certificate_file=\u8BC1\u4E66\u6587\u4EF6 +crl_file=Crl\u6587\u4EF6 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp index c4c47f112..d0474ffa0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp @@ -202,7 +202,7 @@ - <%-- --%> +