From 7dc9e4ac434a96794d2deb4a8c21718dcfd04cbc Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 10 Jun 2019 18:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E4=BF=A1=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6Buil-In=E5=AD=97=E6=AE=B5=E7=9A=84=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/domain/configuration/PxyObjTrustedCaCert.java | 11 +++++++++--
 .../configuration/proxy/PxyObjKeyringController.java  |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

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<PxyObjTrustedCaCert> {
 	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<PxyObjTrustedCaCert> 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());