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

文件摘要保存出错国际化修改

Browse Source 
非report和log的请求方法，返回result信息打印
国际化增加crl_issuer_null
This commit is contained in:
DuanDongmei
2018-11-23 14:08:24 +08:00
parent 21d4ee0f62
commit a5f45a949a
6 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -257,11 +257,11 @@ public class FileTransferCfgController extends BaseController{
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
addMessage(redirectAttributes,"success","save_success");
} catch ( Exception e) {
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","audit_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId();

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

@@ -580,8 +580,8 @@ public class PxyObjKeyringController extends BaseController {
}
}else{
logger.error("cert 和 crl的issuser不符合");
throw new MultiPartNewException(this.getMsgProp().getProperty("crl_issuer_error"));
logger.error("crl的issuser为空");
throw new MultiPartNewException(this.getMsgProp().getProperty("crl_issuer_null"));
}
}
}
@@ -616,7 +616,7 @@ public class PxyObjKeyringController extends BaseController {
if(!StringUtil.isEmpty(result)){
ResponseData data = result.getData();
crlFileAccessUrl=data.getAccessUrl();
cfg.setCrlFile(crlFileAccessUrl);;
cfg.setCrlFile(crlFileAccessUrl);
}
}
pxyObjKeyringService.trustedCrlsaveOrUpdate(cfg);
@@ -626,7 +626,6 @@ public class PxyObjKeyringController extends BaseController {
}catch(Exception e){
logger.error("crl上传失败",e);
logger.error("证书文件校验失败",e);
if(e instanceof MaatConvertException){
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof MultiPartNewException){