diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 835afd461..797c3f713 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -125,12 +125,14 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { response= header.get(); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ logger.info("get result success"); - result= response.readEntity(String.class); // result = "{\"status\":200,\"businessCode\":2000,\"reason\":\"数据获取操作成功\"," // + "\"msg\":\"配置ID获取成功\",\"fromuri\":\"/galaxy/service/cfg/v1/configPzIdSources\"," // + "\"traceCode\":\"2018052409232108368751\",\"data\":{\"sourceName\":\"CONFIG_COMPILE\",\"num\":1,\"pzIdList\":[22]}}"; @@ -140,13 +142,13 @@ public class ConfigServiceUtil { if(!StringUtil.isEmpty(bean.getData())){ list = bean.getData().getPzIdList(); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } long end=System.currentTimeMillis(); logger.warn("get ids finish,cost:"+(end-start)); @@ -178,18 +180,20 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ logger.info("get result success"); - result= response.readEntity(String.class); JsonConfig config=new JsonConfig(); config.setExcludes(new String[]{"configCompileList"}); JSONObject resObject = JSONObject.fromObject(result,config); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -220,15 +224,17 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -261,15 +267,17 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); try { response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(""); + throw new MaatConvertException(""+result); } } catch (Exception e) { throw e; @@ -305,15 +313,17 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { response= header.delete(); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response != null && response.getStatus() == 200){ - result= response.readEntity(String.class); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -351,15 +361,17 @@ public class ConfigServiceUtil { Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -423,17 +435,19 @@ public class ConfigServiceUtil { formDataMultiPart.bodyPart(bodyPart); Builder header = wt.request(MediaType.APPLICATION_JSON).header("File-Desc",fileDesc); try { - response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); logger.info("获取文件摘要响应结果"+result); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -464,18 +478,20 @@ public class ConfigServiceUtil { //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { - response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); + if(response != null) { + result=response.readEntity(String.class); + } } catch (Exception e) { throw new MaatConvertException(""); } if(response !=null && response.getStatus() == 200){ - result= response.readEntity(String.class); JsonConfig config=new JsonConfig(); config.setExcludes(new String[]{"configCompileList"}); JSONObject resObject = JSONObject.fromObject(result,config); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } long end=System.currentTimeMillis(); logger.warn("postGroupReuseSources end,cost:"+(end-start)); @@ -535,7 +551,7 @@ public class ConfigServiceUtil { if(response !=null && response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; @@ -597,7 +613,7 @@ public class ConfigServiceUtil { if(response !=null && response.getStatus() == 200){ result= response.readEntity(String.class); }else{ - throw new MaatConvertException(":"+response.readEntity(String.class)); + throw new MaatConvertException(":"+result); } } catch (Exception e) { throw e; diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 2d2ba69fb..63fa76e52 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -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(); 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 dd49a0c5f..61421538d 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 @@ -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){ diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8617bcd98..4990fbd35 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1310,4 +1310,5 @@ req_body=Request Body resp_body=Response Body dns_sub=DNS Security action_cache=Cache -action_cache_whitelist=Cache Bypass \ No newline at end of file +action_cache_whitelist=Cache Bypass +crl_issuer_null=Issuer of CRL file is empty \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 60d2c6e6b..2c8fe0e1d 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1310,4 +1310,5 @@ req_body=Request Body resp_body=Response Body\u3001 dns_sub=DNS Security action_cache=\u043A\u044D\u0448 -action_cache_whitelist=\u0431\u0430\u0439\u043F\u0430\u0441 \u043A\u044D\u0448\u0430 \ No newline at end of file +action_cache_whitelist=\u0431\u0430\u0439\u043F\u0430\u0441 \u043A\u044D\u0448\u0430 +crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 245dae93c..e198ffa23 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1306,4 +1306,5 @@ req_body=\u539F\u59CB\u8BF7\u6C42\u4F53 resp_body=\u539F\u59CB\u5E94\u7B54\u4F53 dns_sub=DNS\u5B89\u5168\u673A\u5236 action_cache=\u7F13\u5B58 -action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355 \ No newline at end of file +action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355 +crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A \ No newline at end of file