diff --git a/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java b/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java index edad68960..cb8f5e7d8 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java @@ -20,9 +20,16 @@ public class PxyObjTrustedCaCert extends BaseCfg { private String certFile; @ExcelField(title="crl_file",sort=4) private String crlFile; - @ExcelField(title="built_in",sort=4)//是否内置证书 - private Integer builtIn; + private Integer builtIn;//是否内置证书 + @ExcelField(title="built_in",sort=5)//是否内置证书(导出用) + private String builtInExp; + public String getBuiltInExp() { + return builtInExp; + } + public void setBuiltInExp(String builtInExp) { + this.builtInExp = builtInExp; + } public String getCrlFile() { return crlFile; } 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 bb6ebd244..0c4079e03 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 @@ -550,9 +550,12 @@ public class PxyObjKeyringController extends BaseController { Page page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity); ipLists = page.getList(); } + + Properties prop = getMsgProp(); for (PxyObjTrustedCaCert cert : ipLists) { if (!StringUtil.isEmpty(cert.getCompileId())) { cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId())); + cert.setBuiltInExp(prop.getProperty(cert.getBuiltIn()==0?"no":"yes")); } } titleList.add(entity.getMenuNameCode());