gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.6】【scanner】更新资源汇报问题

pull/26/head
fengshuonan 2022-01-30 09:55:55 +08:00
parent 9c423a5474
commit da629d3747
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/scanner/ResourceReportListener.java
View File

@ -84,7 +84,11 @@ public class ResourceReportListener extends ApplicationReadyListener implements
devOpsReportProperties.getProjectUniqueCode(), devOpsReportProperties.getProjectUniqueCode(),
devOpsReportProperties.getServerHost())) { devOpsReportProperties.getServerHost())) {
DevOpsReportApi devOpsReportApi = applicationContext.getBean(DevOpsReportApi.class); DevOpsReportApi devOpsReportApi = applicationContext.getBean(DevOpsReportApi.class);
devOpsReportApi.reportResources(devOpsReportProperties, persistencePojos); try {
devOpsReportApi.reportResources(devOpsReportProperties, persistencePojos);
} catch (Exception e) {
log.error("向DevOps平台汇报异常出现网络错误，如无法联通DevOps平台可关闭相关配置。", e);
}
} }
// 设置标识已经扫描过 // 设置标识已经扫描过

24
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
View File

@ -428,22 +428,18 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
HttpRequest httpRequest = HttpUtil.createPost(devopsReportUrl); HttpRequest httpRequest = HttpUtil.createPost(devopsReportUrl);
httpRequest.body(JSON.toJSONString(devOpsReportResourceParam)); httpRequest.body(JSON.toJSONString(devOpsReportResourceParam));
httpRequest.setConnectionTimeout(Convert.toInt(DEVOPS_REPORT_CONNECTION_TIMEOUT_SECONDS * 1000)); httpRequest.setConnectionTimeout(Convert.toInt(DEVOPS_REPORT_CONNECTION_TIMEOUT_SECONDS * 1000));
try { ResponseData<?> responseData = null;
HttpResponse execute = httpRequest.execute(); HttpResponse execute = httpRequest.execute();
String body = execute.body(); String body = execute.body();
ResponseData<?> responseData = JSON.parseObject(body, ResponseData.class); responseData = JSON.parseObject(body, ResponseData.class);
// 返回结果为空 // 返回结果为空
if (responseData == null) { if (responseData == null) {
throw new ScannerException(DevOpsExceptionEnum.HTTP_RESPONSE_EMPTY);
}
// 返回失败
if (!responseData.getSuccess()) {
throw new ScannerException(DevOpsExceptionEnum.HTTP_RESPONSE_ERROR, responseData.getMessage());
}
} catch (Exception e) {
log.error("向devops平台汇报资源异常，可以将devops相关配置删除", e);
throw new ScannerException(DevOpsExceptionEnum.HTTP_RESPONSE_EMPTY); throw new ScannerException(DevOpsExceptionEnum.HTTP_RESPONSE_EMPTY);
} }
// 返回失败
if (!responseData.getSuccess()) {
throw new ScannerException(DevOpsExceptionEnum.HTTP_RESPONSE_ERROR, responseData.getMessage());
}
} }
/** /**