diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java index 40d76385..8f68ea1d 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SastController.java @@ -28,11 +28,17 @@ import java.util.List; public class SastController { @Resource private SastService sastService; + /** + * sast判断应用名称是否存在 + * */ @GetMapping("/applicationExist") public CommonResult applicationExist(@RequestParam String applicationName){ Boolean b = sastService.applicationExist(applicationName); return CommonResult.success(b); } + /** + * sast上传检测文件 + * */ @PostMapping("/uploadFile") public CommonResult uploadFile(MultipartFile multipartFile){ File tempFile = null; @@ -51,51 +57,85 @@ public class SastController { } } } + /** + * sast创建语言检测任务 + * */ @PostMapping("/createIdentifiedLanguageTask") public CommonResult createIdentifiedLanguageTask(@RequestBody SastIdentifiedLanguageTaskReq req){ SastIdentifiedLanguageTaskResp identifiedLanguageTask = sastService.createIdentifiedLanguageTask(req); return CommonResult.success(identifiedLanguageTask); } + /** + * sast 获取检测任务状态 + * */ @GetMapping("/getIdentifiedLanguageTaskStatus/{taskId}") public CommonResult getIdentifiedLanguageTaskStatus(@PathVariable String taskId){ SastIdentifiedLanguageTaskResp identifiedLanguageTaskStatus = sastService.getIdentifiedLanguageTaskStatus(taskId); return CommonResult.success(identifiedLanguageTaskStatus); } + /** + * sast 获取引擎配置 + * */ @PostMapping("/engineConfig") public CommonResult> engineConfig(@RequestBody SastEngineConfigReq req){ return CommonResult.success(sastService.engineConfig(req.getLanguageIdList())); } + /** + * sast 获取语言模板等信息 + * */ @GetMapping("/detectionConfig/{languageId}") public CommonResult detectionConfig(@PathVariable String languageId){ SastDetectionConfigResp sastDetectionConfigResp = sastService.detectionConfig(languageId); return CommonResult.success(sastDetectionConfigResp); } + /** + * sast上传 应用创建或者更新 + * */ @PostMapping("/applicationCreateOrUpdate") public CommonResult applicationCreateOrUpdate(@RequestBody SastApplicationCreateReq req){ SastApplicationCreateResp sastApplicationCreateResp = sastService.applicationCreate(req); return CommonResult.success(sastApplicationCreateResp); } + /** + * sast 应用信息回显 + * */ @GetMapping("/getApplicationEcho/{applicationId}") public CommonResult getApplicationEcho(@PathVariable String applicationId){ SastApplicationEchoResp applicationEcho = sastService.getApplicationEcho(applicationId); return CommonResult.success(applicationEcho); } + /** + * sast 导出报告 + * */ @PostMapping("/reportIndex") public CommonResult reportIndex(@RequestBody SastReportCreateReq req){ String reportId = sastService.reportIndex(req); return CommonResult.success(reportId); } + /** + * sast 下载报告 + * */ @GetMapping("/reportDownload") - public CommonResult reportDownLoad(String reportId){ + public CommonResult reportDownLoad(@RequestParam String reportId){ return CommonResult.success(sastService.reportDownload(reportId)); } - + /** + * sast 获取全部语言信息 + * */ @GetMapping("/language") public CommonResult> language(){ return CommonResult.success(sastService.language()); } - @GetMapping("/reportList") + /** + * sast报告列表 + * */ + @PostMapping("/reportList") public CommonResult> reportList(@RequestBody PageParam pageParam){ return CommonResult.success(sastService.reportList(pageParam)); } + @DeleteMapping("/reportDelete") + public CommonResult reportDelete(@RequestParam String reportId){ + sastService.reportDelete(reportId); + return CommonResult.success(); + } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java index 78f3ab9e..04219b28 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/SastUrlConstant.java @@ -15,4 +15,5 @@ public class SastUrlConstant { public static final String reportDownload = "/api/report/index/download"; public static final String language = "/invoke/language"; public static final String reportList = "/api/report/index/pageList"; + public static final String reportDelete = "/api/report/index"; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java index f719a4a1..2dc09b17 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/SastService.java @@ -27,4 +27,6 @@ public interface SastService { public String reportDownload(String reportId); public List language(); public PageResult reportList(PageParam pageParam); + + public void reportDelete(String reportId); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java index 7d8f6ee8..b70b2d9f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/sast/impl/SastServiceImpl.java @@ -76,7 +76,7 @@ public class SastServiceImpl implements SastService { if (StringUtils.isEmpty(token)) { SastTokenResp tokenRemote = getTokenRemote(); String accessToken = tokenRemote.getAccessToken(); - redisTemplateUtils.set(REDIS_SAST_TOKEN_KEY,accessToken,tokenRemote.getExpiresIn()*10); + redisTemplateUtils.set(REDIS_SAST_TOKEN_KEY,accessToken,tokenRemote.getExpiresIn()); token = accessToken; } } @@ -223,6 +223,16 @@ public class SastServiceImpl implements SastService { return pageResult; } + @Override + public void reportDelete(String reportId){ + HttpHeaders httpHeaders = getHeaders(); + Map entityMap = new HashMap<>(); + HttpEntity> entity = new HttpEntity<>(entityMap,httpHeaders); + String uriString = UriComponentsBuilder.fromHttpUrl(sastProperties.getBaseUrl() + reportDelete).queryParam("id", reportId).toUriString(); + System.out.println(uriString); + ResponseEntity exchange = restTemplate.exchange(uriString, HttpMethod.DELETE,entity, Void.class,new HashMap<>()); + } + private HttpHeaders getHeaders(){ HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.set(TOKEN_HEADER_KEY,TOKEN_PREFIX+getToken()); diff --git a/ops-server/src/test/java/cd/casic/server/SastTest.java b/ops-server/src/test/java/cd/casic/server/SastTest.java index 43dd9154..482d31a8 100644 --- a/ops-server/src/test/java/cd/casic/server/SastTest.java +++ b/ops-server/src/test/java/cd/casic/server/SastTest.java @@ -133,4 +133,8 @@ public class SastTest { SastApplicationCreateResp sastApplicationCreateResp = sastService.applicationCreate(sastApplicationCreateReq); System.out.println(JSON.toJSONString(sastApplicationCreateResp)); } + @Test + public void reportDelete(){ + sastService.reportDelete("4af3380a-de08-476b-b1bc-b86f8d2e1339"); + } }