gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
段冬梅
2019-06-06 18:54:25 +08:00
parent d0554f0f2b
commit 56f08a1bfa
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

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