From 56f08a1bfac5f0cd1e54c887738e3b9bfd2c0ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Thu, 6 Jun 2019 18:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=8F=AF=E4=BF=A1=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E5=85=A5=E5=BA=93=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/PxyObjKeyringController.java        | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

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 6fa831906..98499391d 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
@@ -899,12 +899,16 @@ public class PxyObjKeyringController extends BaseController {
 		}
 		
 		//文件上传minio-入库-下发
+		//记录异常项信息
 		if(validFlag && !StringUtil.isEmpty(resultDirPath)) {
 			File fileDir=new File(resultDirPath);
 			if(!StringUtil.isEmpty(fileDir.listFiles())) {
 				for (File file : fileDir.listFiles()) {
+					String filename ="";
 					try {
-						String filename = crlFileI.getOriginalFilename();
+						PxyObjTrustedCaCert cacertBuitIn=new PxyObjTrustedCaCert();
+						BeanUtils.copyProperties(cfg, cacertBuitIn);
+						filename = crlFileI.getOriginalFilename();
 						String prefix = FileUtils.getPrefix(filename, false);
 						String suffix = FileUtils.getSuffix(filename, false);
 						file = File.createTempFile("file_" + prefix, suffix);
@@ -923,12 +927,12 @@ public class PxyObjKeyringController extends BaseController {
 						if (!StringUtil.isEmpty(result)) {
 							ResponseData data = result.getData();
 							crlFileAccessUrl = data.getAccessUrl();
-							cfg.setCrlFile(crlFileAccessUrl);
+							cacertBuitIn.setCrlFile(crlFileAccessUrl);
 						}
-						/*pxyObjKeyringService.trustedCrlsaveOrUpdate(cfg);*/
+						pxyObjKeyringService.trustedCertsaveOrUpdate(cacertBuitIn);
 					} catch (Exception e) {
 						validFlag = false;
-						logger.error("证书文件校验失败", e);
+						logger.error("内置可信证书"+filename+"下发失败", e);
 						if (e instanceof MaatConvertException) {
 							addMessage(redirectAttributes, "error", "request_service_failed");
 							LogUtils.saveLog(request, null, e, null);
@@ -942,7 +946,14 @@ public class PxyObjKeyringController extends BaseController {
 			
 		}
 		
-		
+		/*if (e instanceof MaatConvertException) {
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		}else {
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
+		}
+		*/
 		//3、返回文件成功个数。