内置可信证书入库代码提交

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、返回文件成功个数。