From 47b75d91d05300ec8e99c660f23c568abb51ec13 Mon Sep 17 00:00:00 2001 From: liuliaozhong Date: Mon, 15 Jul 2024 21:07:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=BB=84=E4=BB=B6=E5=AE=89=E5=85=A8=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E=20#2865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/build.gradle | 26 ++++++ .../boot-job-analysis/build.gradle | 1 + .../job-backup/boot-job-backup/build.gradle | 1 + .../api/inner/ServiceCronJobResource.java | 11 ++- .../api/inner/ServiceCronMetricsResource.java | 3 +- .../inner/ServiceInnerCronJobResource.java | 9 +- .../job-crontab/boot-job-crontab/build.gradle | 1 + .../api/inner/ServiceExecuteTaskResource.java | 5 +- .../api/inner/ServiceMetricsResource.java | 17 ++-- .../ServiceTaskExecuteResultResource.java | 5 +- .../job-execute/boot-job-execute/build.gradle | 1 + .../api/inner/ServiceFileSourceResource.java | 3 +- .../inner/ServiceFileSourceTaskResource.java | 17 ++-- .../boot-job-file-gateway/build.gradle | 1 + .../bk/job/logsvr/api/ServiceLogResource.java | 29 ++++--- .../job-logsvr/boot-job-logsvr/build.gradle | 1 + .../api/inner/ServiceAccountResource.java | 13 ++- .../api/inner/ServiceApplicationResource.java | 13 ++- .../api/inner/ServiceBackupTmpResource.java | 7 +- .../api/inner/ServiceCheckScriptResource.java | 3 +- .../api/inner/ServiceCredentialResource.java | 7 +- .../inner/ServiceGlobalSettingsResource.java | 5 +- .../manage/api/inner/ServiceHostResource.java | 11 ++- .../api/inner/ServiceMetricsResource.java | 23 +++-- .../inner/ServiceNotificationResource.java | 13 ++- .../api/inner/ServiceScriptResource.java | 11 ++- .../manage/api/inner/ServiceSyncResource.java | 27 +++--- .../manage/api/inner/ServiceTagResource.java | 5 +- .../api/inner/ServiceTaskPlanResource.java | 29 +++---- .../inner/ServiceTaskTemplateResource.java | 17 ++-- .../manage/api/inner/ServiceUserResource.java | 3 +- .../api/inner/ServiceWhiteIPResource.java | 7 +- .../manage/api/web/WebAppAccountResource.java | 13 ++- .../job/manage/api/web/WebScriptResource.java | 49 ++++++----- .../manage/api/web/WebTaskPlanResource.java | 31 ++++--- .../api/web/WebTaskTemplateResource.java | 23 +++-- .../job-manage/boot-job-manage/build.gradle | 1 + support-files/dependJarInfo/versionList.txt | 86 +++++++++---------- 38 files changed, 269 insertions(+), 259 deletions(-) diff --git a/src/backend/build.gradle b/src/backend/build.gradle index 9b2ca46f55..a34cf60f4c 100644 --- a/src/backend/build.gradle +++ b/src/backend/build.gradle @@ -127,6 +127,30 @@ ext { // Fix Spring Cloud Function Spel表达式注入漏洞(CVE-2022-22963) // Fix Spring Cloud Function 拒绝服务漏洞(CVE-2022-22979) set('spring-cloud-function.version', "3.2.8") + + // Fix CVE-2021-3711,CVE-2023-22102 + set('mysql.version', "8.0.28") + // Fix CVE-2022-22978,CVE-2022-22976,CVE-2021-22119 + set('spring-security.version', "5.5.7") + // Fix CVE-2022-42004,CVE-2022-42003,CVE-2021-46877,CVE-2020-36518 + set('jackson-bom.version', "2.12.7.20221012") + // Fix CVE-2021-37137,CVE-2021-37136 + set('netty.version', "4.1.68.Final") + // Fix CVE-2022-25647 + set('gson.version', "2.8.9") + // Fix CVE-2023-44487 + set('tomcat.version', "9.0.90") + // Fix CVE-2022-22965 + set('spring-framework.version', "5.3.23") + + // Fix CVE-2022-22980 + set('springDataMongodbVersion', "3.3.5") + // Fix CVE-2022-3510,CVE-2022-3509,CVE-2022-3171 + set('protobufJavaVersion', "3.16.3") + // Fix CVE-2019-10086,CVE-2014-0114 + set('commonsBeanutilsVersion', "1.9.4") + // Fix CVE-2021-22044 + set('openfeignCoreVersion', "3.0.5") } group "com.tencent.bk.job" @@ -280,6 +304,8 @@ subprojects { entry "hibernate-validator" } dependency "com.beust:jcommander:$jcommanderVersion" + dependency "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion" + dependency "org.springframework.cloud:spring-cloud-openfeign-core:$openfeignCoreVersion" } } dependencies { diff --git a/src/backend/job-analysis/boot-job-analysis/build.gradle b/src/backend/job-analysis/boot-job-analysis/build.gradle index 6e99aed05e..e2fb52c7f6 100644 --- a/src/backend/job-analysis/boot-job-analysis/build.gradle +++ b/src/backend/job-analysis/boot-job-analysis/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'org.springframework:spring-webmvc' implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis') runtimeOnly('mysql:mysql-connector-java') + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") testImplementation("com.h2database:h2") } diff --git a/src/backend/job-backup/boot-job-backup/build.gradle b/src/backend/job-backup/boot-job-backup/build.gradle index e237392639..d59c9caa54 100644 --- a/src/backend/job-backup/boot-job-backup/build.gradle +++ b/src/backend/job-backup/boot-job-backup/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation 'org.springframework:spring-webmvc' implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis') runtimeOnly('mysql:mysql-connector-java') + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") testImplementation("com.h2database:h2") } diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java index 597094a53e..b1c44a3b35 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java @@ -49,7 +49,6 @@ * @since 20/2/2020 19:54 */ @Api(tags = {"Cron_Job"}) -@RequestMapping("/service/app/{appId}/cron/job") @RestController @InternalAPI public interface ServiceCronJobResource { @@ -61,7 +60,7 @@ public interface ServiceCronJobResource { * @param enable 定时任务状态 * @return 定时任务列表 */ - @GetMapping("/") + @GetMapping("/service/app/{appId}/cron/job") InternalResponse> listCronJobs( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "是否开启", required = false, example = "true") @RequestParam("enable") Boolean enable @@ -76,7 +75,7 @@ InternalResponse> listCronJobs( * @param cronJobCreateUpdateReq 定时任务新建、更新请求 * @return 定时任务 ID */ - @PutMapping("/{cronJobId}") + @PutMapping("/service/app/{appId}/cron/job/{cronJobId}") InternalResponse saveCronJob( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @@ -93,7 +92,7 @@ InternalResponse saveCronJob( * @param status 定时任务状态 * @return 是否更新成功 */ - @PostMapping("/{cronJobId}/status") + @PostMapping("/service/app/{appId}/cron/job/{cronJobId}/status") InternalResponse updateCronJobStatus( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") @@ -113,7 +112,7 @@ InternalResponse updateCronJobStatus( * @param planIdList 执行方案 ID 列表 * @return 执行方案与定时任务列表对应表 */ - @GetMapping("/plan") + @GetMapping("/service/app/{appId}/cron/job/plan") InternalResponse>> batchListCronJobByPlanIds( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "执行方案 ID 列表", required = true) @RequestParam(value = "planId") List planIdList @@ -131,7 +130,7 @@ InternalResponse>> batchListCronJobByPlanIds( * @param cronJobCreateUpdateReq 定时任务创建请求 * @return 定时任务 ID */ - @PutMapping("/{cronJobId}/saveCronJobWithId") + @PutMapping("/service/app/{appId}/cron/job/{cronJobId}/saveCronJobWithId") InternalResponse saveCronJobWithId( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java index 28a1b1ab93..70d9bdc3dd 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java @@ -35,13 +35,12 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-crontab:Service:Metrics"}) -@RequestMapping("/service/metrics") @RestController @EsbAPI public interface ServiceCronMetricsResource { @ApiOperation(value = "定时任务总量", produces = "application/json") - @GetMapping("/count") + @GetMapping("/service/metrics/count") InternalResponse countCronJob( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java index 5c63c98c58..e2c1614b53 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java @@ -43,7 +43,6 @@ * @since 18/2/2020 15:11 */ @Api(tags = {"Inner_Cron_Job"}) -@RequestMapping("/service/inner/cron/job") @RestController @EsbAPI public interface ServiceInnerCronJobResource { @@ -56,7 +55,7 @@ public interface ServiceInnerCronJobResource { * @param request 作业详情 * @return 是否创建成功 */ - @PutMapping("/{systemId}/{jobKey}") + @PutMapping("/service/inner/cron/job/{systemId}/{jobKey}") InternalResponse addNewCronJob( @PathVariable("systemId") String systemId, @PathVariable("jobKey") String jobKey, @RequestBody ServiceAddInnerCronJobRequestDTO request @@ -69,7 +68,7 @@ InternalResponse addNewCronJob( * @param jobKey 任务 Key * @return 定时任务详情 */ - @GetMapping("/{systemId}/{jobKey}") + @GetMapping("/service/inner/cron/job/{systemId}/{jobKey}") InternalResponse getCronJobInfoByKey( @PathVariable("systemId") String systemId, @PathVariable("jobKey") String jobKey @@ -82,7 +81,7 @@ InternalResponse getCronJobInfoByKey( * @param jobKey 任务 Key * @return 删除是否成功 */ - @DeleteMapping("/{systemId}/{jobKey}") + @DeleteMapping("/service/inner/cron/job/{systemId}/{jobKey}") InternalResponse deleteCronJob( @PathVariable("systemId") String systemId, @PathVariable("jobKey") String jobKey @@ -94,7 +93,7 @@ InternalResponse deleteCronJob( * @param systemId 系统 ID * @return 定时任务列表 */ - @GetMapping("/{systemId}") + @GetMapping("/service/inner/cron/job/{systemId}") InternalResponse> listCronJobs(@PathVariable("systemId") String systemId); } diff --git a/src/backend/job-crontab/boot-job-crontab/build.gradle b/src/backend/job-crontab/boot-job-crontab/build.gradle index e7e295bd34..619d2af376 100644 --- a/src/backend/job-crontab/boot-job-crontab/build.gradle +++ b/src/backend/job-crontab/boot-job-crontab/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' implementation 'org.springframework:spring-webmvc' runtimeOnly 'mysql:mysql-connector-java' + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") testImplementation("com.h2database:h2") } diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java index 6380c6791a..0fdb49fda0 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java @@ -41,13 +41,12 @@ * @date 2019/09/18 */ @Api(tags = {"Task_Execute"}) -@RequestMapping("/service/execution") @RestController @InternalAPI public interface ServiceExecuteTaskResource { - @PostMapping("/task-execution/task") + @PostMapping("/service/execution/task-execution/task") InternalResponse executeTask(@RequestBody ServiceTaskExecuteRequest request); - @PostMapping("/task-execution/task/auth") + @PostMapping("/service/execution/task-execution/task/auth") InternalResponse authExecuteTask(@RequestBody ServiceTaskExecuteRequest request); } diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java index 5ddc965c77..31df08859f 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java @@ -45,17 +45,16 @@ import java.util.List; @Api(tags = {"job-execute:service:Metrics"}) -@RequestMapping("/service/metrics") @RestController @InternalAPI public interface ServiceMetricsResource { @ApiOperation(value = "接入（执行过一次任务）的业务Id列表", produces = "application/json") - @GetMapping("/app/joined") + @GetMapping("/service/metrics/app/joined") InternalResponse> getJoinedAppIdList(); @ApiOperation(value = "是否有执行记录", produces = "application/json") - @GetMapping("/app/hasExecuteHistory") + @GetMapping("/service/metrics/app/hasExecuteHistory") InternalResponse hasExecuteHistory( @ApiParam(value = "业务Id", required = false) @RequestParam(value = "appId", required = false) Long appId, @@ -72,7 +71,7 @@ InternalResponse hasExecuteHistory( */ @Deprecated @ApiOperation(value = "快速文件分发统计", produces = "application/json") - @GetMapping("/fastPushFile/count") + @GetMapping("/service/metrics/fastPushFile/count") InternalResponse countFastPushFile( @ApiParam(value = "业务Id", required = false) @RequestParam(value = "appId", required = false) Long appId, @@ -93,7 +92,7 @@ InternalResponse countFastPushFile( */ @Deprecated @ApiOperation(value = "步骤执行统计", produces = "application/json") - @GetMapping("/stepInstances/count") + @GetMapping("/service/metrics/stepInstances/count") InternalResponse countStepInstances( @ApiParam(value = "业务Id", required = false) @RequestParam(value = "appId", required = false) Long appId, @@ -116,7 +115,7 @@ InternalResponse countStepInstances( */ @Deprecated @ApiOperation(value = "任务（含快速/作业）执行统计", produces = "application/json") - @GetMapping("/taskInstances/count") + @GetMapping("/service/metrics/taskInstances/count") InternalResponse countTaskInstances( @ApiParam(value = "业务Id", required = false) @RequestParam(value = "appId", required = false) Long appId, @@ -137,7 +136,7 @@ InternalResponse countTaskInstances( ); @ApiOperation(value = "获取统计数据", produces = "application/json") - @GetMapping("/statistics") + @GetMapping("/service/metrics/statistics") InternalResponse getStatistics( @ApiParam(value = "业务Id", required = true) @RequestParam(value = "appId", required = true) Long appId, @@ -152,7 +151,7 @@ InternalResponse getStatistics( ); @ApiOperation(value = "获取统计数据", produces = "application/json") - @GetMapping("/statistics/list") + @GetMapping("/service/metrics/statistics/list") InternalResponse> listStatistics( @ApiParam(value = "业务Id", required = false) @RequestParam(value = "appId", required = false) Long appId, @@ -167,7 +166,7 @@ InternalResponse> listStatistics( ); @ApiOperation(value = "触发指定时间的数据统计", produces = "application/json") - @PostMapping("/statistics/trigger") + @PostMapping("/service/metrics/statistics/trigger") InternalResponse triggerStatistics( @ApiParam(value = "统计日期(yyyy-MM-dd)", required = false) @RequestBody ServiceTriggerStatisticsRequest request diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java index 9c048b5a0c..118da7273d 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java @@ -47,7 +47,6 @@ * 作业执行结果API-服务内部调用 */ @Api(tags = {"job-execute:service:Task_Execution_Result"}) -@RequestMapping("/service/execution") @RestController @InternalAPI public interface ServiceTaskExecuteResultResource { @@ -56,12 +55,12 @@ public interface ServiceTaskExecuteResultResource { * @return Map<定时任务ID, 统计信息> */ @ApiOperation(value = "获取定时作业执行结果统计", produces = "application/json") - @PostMapping("/task-execution-history/execute-result-statistics/cron") + @PostMapping("/service/execution/task-execution-history/execute-result-statistics/cron") InternalResponse> getCronTaskExecuteResultStatistics( @ApiParam("获取定时作业执行结果统计") @RequestBody ServiceGetCronTaskExecuteStatisticsRequest request); @ApiOperation(value = "获取作业执行历史列表", produces = "application/json") - @GetMapping("/app/{appId}/task-execution-history/list") + @GetMapping("/service/execution/app/{appId}/task-execution-history/list") InternalResponse> getTaskExecuteResult( @ApiParam(value = "业务ID", required = true, example = "1") @PathVariable("appId") Long appId, @ApiParam(value = "任务名称", name = "taskName", required = false) @RequestParam(value = "taskName", diff --git a/src/backend/job-execute/boot-job-execute/build.gradle b/src/backend/job-execute/boot-job-execute/build.gradle index b5b9c42ec0..c61f810841 100644 --- a/src/backend/job-execute/boot-job-execute/build.gradle +++ b/src/backend/job-execute/boot-job-execute/build.gradle @@ -31,6 +31,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' implementation 'org.springframework.cloud:spring-cloud-starter-stream-rabbit' runtimeOnly 'mysql:mysql-connector-java' + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") testImplementation("com.h2database:h2") } diff --git a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java index 52f6c27c29..7a41abfe1d 100644 --- a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java +++ b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java @@ -35,13 +35,12 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-file-gateway:service:FileSource"}) -@RequestMapping("/service/fileSource/") @RestController @InternalAPI public interface ServiceFileSourceResource { @ApiOperation(value = "获取文件源ID", produces = "application/json") - @GetMapping("getFileSourceIdByCode/codes/{code}") + @GetMapping("/service/fileSource/getFileSourceIdByCode/codes/{code}") InternalResponse getFileSourceIdByCode( @ApiParam(value = "文件源标识", required = true) @PathVariable("code") String code); } diff --git a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java index baca063393..ec048bfb28 100644 --- a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java +++ b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java @@ -50,14 +50,13 @@ @Api(tags = {"job-file-gateway:service:FileSourceTask"}) -@RequestMapping("/service/fileSource/filetask") @RestController @InternalAPI public interface ServiceFileSourceTaskResource { // 直接转发至FileWorker的请求，URL子路径保持一致 @ApiOperation(value = "创建并启动文件下载任务", produces = "application/json") - @PostMapping("/downloadFiles/start") + @PostMapping("/service/fileSource/filetask/downloadFiles/start") InternalResponse startFileSourceDownloadTask( @ApiParam("用户名") @RequestHeader("username") @@ -67,14 +66,14 @@ InternalResponse startFileSourceDownloadTask( ); @ApiOperation(value = "清理任务已下载的文件", produces = "application/json") - @PostMapping("/downloadFiles/stop") + @PostMapping("/service/fileSource/filetask/downloadFiles/stop") InternalResponse stopTasks( @ApiParam("文件源下载任务请求") @RequestBody StopTaskReq req ); @ApiOperation(value = "清理任务已下载的文件", produces = "application/json") - @PostMapping("/clearFiles") + @PostMapping("/service/fileSource/filetask/clearFiles") InternalResponse clearTaskFiles( @ApiParam("文件源下载任务请求") @RequestBody ClearTaskFilesReq req @@ -82,7 +81,7 @@ InternalResponse clearTaskFiles( // 文件网关自有资源请求 @ApiOperation(value = "获取文件任务状态", produces = "application/json") - @GetMapping("/taskIds/{taskId}/status") + @GetMapping("/service/fileSource/filetask/taskIds/{taskId}/status") InternalResponse getFileSourceTaskStatusAndLogs( @ApiParam("任务Id") @PathVariable("taskId") @@ -96,7 +95,7 @@ InternalResponse getFileSourceTaskStatusAndLogs( ); @ApiOperation(value = "创建并启动批量文件下载任务", produces = "application/json") - @PostMapping("/batch/downloadFiles/start") + @PostMapping("/service/fileSource/filetask/batch/downloadFiles/start") InternalResponse startFileSourceBatchDownloadTask( @ApiParam("用户名") @RequestHeader("username") @@ -106,14 +105,14 @@ InternalResponse startFileSourceBatchDownloadTask( ); @ApiOperation(value = "清理批量任务已下载的文件", produces = "application/json") - @PostMapping("/batch/downloadFiles/stop") + @PostMapping("/service/fileSource/filetask/batch/downloadFiles/stop") InternalResponse stopBatchTasks( @ApiParam("文件源下载任务请求") @RequestBody StopBatchTaskReq req ); @ApiOperation(value = "清理批量任务已下载的文件", produces = "application/json") - @PostMapping("/batch/clearFiles") + @PostMapping("/service/fileSource/filetask/batch/clearFiles") InternalResponse clearBatchTaskFiles( @ApiParam("文件源下载任务请求") @RequestBody ClearBatchTaskFilesReq req @@ -121,7 +120,7 @@ InternalResponse clearBatchTaskFiles( // 文件网关自有资源请求 @ApiOperation(value = "获取文件批量任务状态", produces = "application/json") - @GetMapping("/batch/batchTaskIds/{batchTaskId}/status") + @GetMapping("/service/fileSource/filetask/batch/batchTaskIds/{batchTaskId}/status") InternalResponse getBatchTaskStatusAndLogs( @ApiParam("任务Id") @PathVariable("batchTaskId") diff --git a/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle b/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle index 9708e91c0d..6b03be96be 100644 --- a/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle +++ b/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'org.springframework:spring-webmvc' implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis') runtimeOnly('mysql:mysql-connector-java') + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") } springBoot { getMainClass().set("com.tencent.bk.job.file_gateway.JobFileGatewayBootApplication") diff --git a/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java b/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java index e5c2eb128c..e566e6643f 100644 --- a/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java +++ b/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java @@ -52,7 +52,6 @@ * 执行日志服务 */ @Api(tags = {"Log"}) -@RequestMapping("/service/log") @RestController @InternalAPI public interface ServiceLogResource { @@ -63,7 +62,7 @@ public interface ServiceLogResource { * @param request 保存日志请求 */ @ApiOperation("保存执行日志") - @PostMapping + @PostMapping("/service/log") InternalResponse saveLog( @ApiParam("保存日志请求报文") @RequestBody ServiceSaveLogRequest request @@ -75,7 +74,7 @@ InternalResponse saveLog( * @param request 保存日志请求 */ @ApiOperation("批量保存执行日志") - @PostMapping("/batch") + @PostMapping("/service/log/batch") InternalResponse saveLogs( @ApiParam("批量保存日志请求报文") @RequestBody ServiceBatchSaveLogRequest request @@ -83,7 +82,8 @@ InternalResponse saveLogs( @CompatibleImplementation(name = "rolling_execute", explain = "兼容API,后续使用hostId查询", version = "3.7.x") @ApiOperation("根据目标服务器IP获取脚本任务对应的执行日志") - @GetMapping(value = {"/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/ip/{ip}"}) + @GetMapping(value = {"/service/log/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/" + + "{executeCount}/ip/{ip}"}) InternalResponse getScriptHostLogByIp( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, @@ -98,7 +98,8 @@ InternalResponse getScriptHostLogByIp( @ApiOperation("根据目标主机ID获取脚本任务对应的执行日志") @GetMapping(value = { - "/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/hostId/{hostId}" + "/service/log/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}" + + "/hostId/{hostId}" }) InternalResponse getScriptHostLogByHostId( @ApiParam("作业创建时间") @@ -113,7 +114,8 @@ InternalResponse getScriptHostLogByHostId( @RequestParam(value = "batch", required = false) Integer batch); @ApiOperation("批量获取脚本任务对应的执行日志") - @PostMapping(value = {"/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}"}) + @PostMapping(value = {"/service/log/script/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}" + + "/retry/{executeCount}"}) InternalResponse> listScriptLogs( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, @@ -127,7 +129,8 @@ InternalResponse> listScriptLogs( @CompatibleImplementation(name = "rolling_execute", explain = "兼容API,后续使用hostId查询", version = "3.7.x") @ApiOperation("按照IP获取文件任务对应的执行日志") - @GetMapping(value = {"/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/ip/{ip}"}) + @GetMapping(value = {"/service/log/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry" + + "/{executeCount}/ip/{ip}"}) InternalResponse getFileHostLogByIp( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, @@ -144,7 +147,7 @@ InternalResponse getFileHostLogByIp( @ApiOperation("按照hostId获取文件任务对应的执行日志") @GetMapping(value = { - "/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/hostId/{hostId}" + "/service/log/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/hostId/{hostId}" }) InternalResponse getFileHostLogByHostId( @ApiParam("作业创建时间") @@ -161,7 +164,7 @@ InternalResponse getFileHostLogByHostId( @RequestParam(value = "batch", required = false) Integer batch); @ApiOperation("获取文件任务对应的执行日志") - @GetMapping("/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}") + @GetMapping("/service/log/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}") InternalResponse> listFileHostLogs( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, @@ -180,7 +183,8 @@ InternalResponse> listFileHostLogs( ); @ApiOperation("获取文件任务agent对应的执行日志") - @PostMapping("/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}/queryByTaskIds") + @PostMapping("/service/log/file/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry" + + "/{executeCount}/queryByTaskIds") InternalResponse listFileHostLogsByTaskIds( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, @@ -195,7 +199,7 @@ InternalResponse listFileHostLogsByTaskIds( ); @ApiOperation("获取文件任务对应的执行日志") - @PostMapping("/file") + @PostMapping("/service/log/file") InternalResponse listFileHostLogs(@RequestBody ServiceFileLogQueryRequest request); /** @@ -208,7 +212,8 @@ InternalResponse listFileHostLogsByTaskIds( * @return ip */ @ApiOperation("根据脚本任务日志关键字获取对应的ip") - @GetMapping("/keywordMatch/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}/retry/{executeCount}") + @GetMapping("/service/log/keywordMatch/jobCreateDate/{jobCreateDate}/step/{stepInstanceId}" + + "/retry/{executeCount}") InternalResponse> getIpsByKeyword( @ApiParam("作业创建时间") @PathVariable("jobCreateDate") String jobCreateDate, diff --git a/src/backend/job-logsvr/boot-job-logsvr/build.gradle b/src/backend/job-logsvr/boot-job-logsvr/build.gradle index 9d53bc8833..3a006888c5 100644 --- a/src/backend/job-logsvr/boot-job-logsvr/build.gradle +++ b/src/backend/job-logsvr/boot-job-logsvr/build.gradle @@ -28,6 +28,7 @@ dependencies { api project(":job-logsvr:service-job-logsvr") api project(":commons:common-i18n") implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' + implementation "org.springframework.data:spring-data-mongodb:$springDataMongodbVersion" testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo' } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java index f6d3cb11fa..2df7fba620 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java @@ -46,7 +46,6 @@ /** * 账号服务 */ -@RequestMapping("/service/account") @Api(tags = {"job-manage:service:Account_Management"}) @RestController @InternalAPI @@ -57,7 +56,7 @@ public interface ServiceAccountResource { * @param accountId * @return */ - @GetMapping("/{accountId}") + @GetMapping("/service/account/{accountId}") @ApiOperation(value = "根据账号id获取账号信息", produces = "application/json") InternalResponse getAccountByAccountId(@ApiParam(value = "账号ID", required = true) @PathVariable("accountId") Long accountId); @@ -69,7 +68,7 @@ public interface ServiceAccountResource { * @param account * @return */ - @GetMapping("/app/{appId}/accounts/{account}") + @GetMapping("/service/account/app/{appId}/accounts/{account}") @ApiOperation(value = "根据账号名获取账号信息", produces = "application/json") InternalResponse getAccountByAccountName( @@ -85,14 +84,14 @@ public interface ServiceAccountResource { * @param alias * @return */ - @GetMapping("/app/{appId}/category/{category}/alias/{alias}") + @GetMapping("/service/account/app/{appId}/category/{category}/alias/{alias}") @ApiOperation(value = "根据账号别名获取业务下的账号信息", produces = "application/json") InternalResponse getAccountByCategoryAndAliasInApp( @ApiParam(value = "业务ID", required = true) @PathVariable("appId") Long appId, @ApiParam(value = "账号用途，1-系统账号，2-DB账号", required = true) @PathVariable("category") Integer category, @ApiParam(value = "账号名称", required = true) @PathVariable("alias") String alias); - @PostMapping("/app/{appId}/saveOrGetAccount") + @PostMapping("/service/account/app/{appId}/saveOrGetAccount") InternalResponse saveOrGetAccount( @ApiParam("用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam("创建时间") @RequestHeader(value = "X-Create-Time", required = false) Long createTime, @@ -101,7 +100,7 @@ InternalResponse saveOrGetAccount( @PathVariable("appId") Long appId, @RequestBody AccountCreateUpdateReq accountCreateUpdateReq); @ApiOperation(value = "新增账号", produces = "application/json") - @PostMapping(value = "/app/{appId}/account") + @PostMapping(value = "/service/account/app/{appId}/account") Response saveAccount( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -114,7 +113,7 @@ Response saveAccount( ); @ApiOperation(value = "获取业务下的账号列表，返回简单的账号信息", produces = "application/json") - @GetMapping("/account/app/{appId}/accounts") + @GetMapping("/service/account/account/app/{appId}/accounts") Response> listAccounts( @ApiParam(value = "业务ID", required = true) @PathVariable("appId") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceApplicationResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceApplicationResource.java index a44508eaf1..da24a33fe1 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceApplicationResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceApplicationResource.java @@ -39,7 +39,6 @@ import java.util.List; -@RequestMapping("/service") @Api(tags = {"job-manage:service:App_Management"}) @RestController @InternalAPI @@ -49,7 +48,7 @@ public interface ServiceApplicationResource { * * @return 业务列表 */ - @RequestMapping("/app/list/normal") + @RequestMapping("/service/app/list/normal") InternalResponse> listNormalApps(); /** @@ -57,7 +56,7 @@ public interface ServiceApplicationResource { * * @return 业务集、全业务列表 */ - @RequestMapping("/app/list/bizSet") + @RequestMapping("/service/app/list/bizSet") InternalResponse> listBizSetApps(); /** @@ -68,7 +67,7 @@ public interface ServiceApplicationResource { * @return 业务 */ @ApiOperation("根据Job业务id查询业务") - @RequestMapping("/app/{appId}") + @RequestMapping("/service/app/{appId}") ServiceApplicationDTO queryAppById(@ApiParam(value = "Job业务ID", required = true) @PathVariable("appId") Long appId); @@ -79,7 +78,7 @@ ServiceApplicationDTO queryAppById(@ApiParam(value = "Job业务ID", required = t * @return 业务列表 */ @ApiOperation("根据Job业务id批量查询业务") - @RequestMapping("/apps") + @RequestMapping("/service/apps") List listAppsByAppIds(@ApiParam(value = "业务ID列表，英文逗号分隔", required = true) @RequestParam("appIds") String appIds); @@ -91,14 +90,14 @@ List listAppsByAppIds(@ApiParam(value = "业务ID列表 * @return 业务 */ @ApiOperation("根据资源范围查询业务") - @RequestMapping("/app/scope/{scopeType}/{scopeId}") + @RequestMapping("/service/app/scope/{scopeType}/{scopeId}") ServiceApplicationDTO queryAppByScope(@ApiParam(value = "资源范围类型", allowableValues = "1-业务,2-业务集", required = true) @PathVariable("scopeType") String scopeType, @ApiParam(value = "资源范围ID", required = true) @PathVariable("scopeId") String scopeId); @ApiOperation(value = "获取业务列表", produces = "application/json") - @GetMapping("/app/list") + @GetMapping("/service/app/list") InternalResponse> listApps( @ApiParam(value = "资源范围类型", allowableValues = "1-业务,2-业务集") @RequestParam(value = "scopeType", required = false) String scopeType); diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java index 9032eb6108..54cb094551 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java @@ -43,13 +43,12 @@ * TODO 后续需要优化 * 临时提供给job-backup的API */ -@RequestMapping("/service/tmp") @Api(tags = {"job-manage:service:tmp_for_backup"}) @RestController @InternalAPI public interface ServiceBackupTmpResource { @ApiOperation(value = "根据模版 ID 获取模版信息", produces = "application/json") - @GetMapping("/app/{appId}/template/{templateId}") + @GetMapping("/service/tmp/app/{appId}/template/{templateId}") Response getTemplateById( @RequestHeader("username") String username, @@ -60,7 +59,7 @@ Response getTemplateById( ); @ApiOperation(value = "根据执行方案 ID 获取执行方案信息", produces = "application/json") - @GetMapping("/app/{appId}/task/plan/{templateId}/{planId}") + @GetMapping("/service/tmp/app/{appId}/task/plan/{templateId}/{planId}") Response getPlanById( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -76,7 +75,7 @@ Response getPlanById( ); @ApiOperation(value = "获取执行方案基本信息列表", produces = "application/json") - @GetMapping("/app/{appId}/task/plan/{templateId}") + @GetMapping("/service/tmp/app/{appId}/task/plan/{templateId}") Response> listPlans( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java index f376e7b3fe..8504da71cc 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java @@ -39,13 +39,12 @@ /** * 脚本检查服务 */ -@RequestMapping("/service/script/check") @Api(tags = {"job-manage:service:Script_Check"}) @RestController @InternalAPI public interface ServiceCheckScriptResource { - @PostMapping + @PostMapping("/service/script/check") InternalResponse> check( @RequestBody ServiceCheckScriptRequest checkScriptRequest); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java index 7d03ccaef7..edf659f888 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java @@ -42,13 +42,12 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:Credential"}) -@RequestMapping("/service/credentials/app/{appId}") @RestController @InternalAPI public interface ServiceCredentialResource { @ApiOperation(value = "获取凭据详情", produces = "application/json") - @GetMapping("/ids/{id}") + @GetMapping("/service/credentials/app/{appId}/ids/{id}") InternalResponse getCredentialById( @ApiParam(value = "业务ID", required = true) @PathVariable("appId") Long appId, @@ -58,7 +57,7 @@ InternalResponse getCredentialById( ); @ApiOperation(value = "新建凭据", produces = "application/json") - @PostMapping("/create") + @PostMapping("/service/credentials/app/{appId}/create") InternalResponse createCredential( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -71,7 +70,7 @@ InternalResponse createCredential( ); @ApiOperation(value = "更新凭据", produces = "application/json") - @PutMapping("/update") + @PutMapping("/service/credentials/app/{appId}/update") InternalResponse updateCredential( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java index 94fb128bf1..481c06ceab 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java @@ -34,16 +34,15 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:GlobalSettings"}) -@RequestMapping("/service/globalSettings") @RestController @InternalAPI public interface ServiceGlobalSettingsResource { @ApiOperation(value = "获取文档中心基础Url", produces = "application/json") - @GetMapping("/docCenterBaseUrl") + @GetMapping("/service/globalSettings/docCenterBaseUrl") InternalResponse getDocCenterBaseUrl(); @ApiOperation(value = "获取文件上传设置", produces = "application/json") - @GetMapping("/fileUploadSettings") + @GetMapping("/service/globalSettings/fileUploadSettings") InternalResponse getFileUploadSettings(); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java index eb527ba3e2..a88c722adb 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java @@ -44,28 +44,27 @@ import java.util.List; -@RequestMapping("/service") @Api(tags = {"job-manage:service:Host_Management"}) @RestController @InternalAPI public interface ServiceHostResource { @ApiOperation(value = "查询节点下的主机状态", produces = "application/json") - @PostMapping("/app/{appId}/host/status/nodes") + @PostMapping("/service/app/{appId}/host/status/nodes") InternalResponse> getHostStatusByNode( @PathVariable("appId") Long appId, @RequestBody ServiceGetHostStatusByNodeReq req ); @ApiOperation(value = "查询动态分组下的主机状态", produces = "application/json") - @PostMapping("/app/{appId}/host/status/dynamicGroups") + @PostMapping("/service/app/{appId}/host/status/dynamicGroups") InternalResponse> getHostStatusByDynamicGroup( @PathVariable("appId") Long appId, @RequestBody ServiceGetHostStatusByDynamicGroupReq req ); @ApiOperation(value = "查询IP对应的主机状态", produces = "application/json") - @PostMapping("/app/{appId}/host/status/ips") + @PostMapping("/service/app/{appId}/host/status/ips") InternalResponse> getHostStatusByIp( @PathVariable("appId") Long appId, @RequestBody ServiceGetHostStatusByIpReq req @@ -78,7 +77,7 @@ InternalResponse> getHostStatusByIp( * @param req 请求 */ @ApiOperation(value = "检查主机是否在业务下", produces = "application/json") - @PostMapping("/app/{appId}/host/batchGet") + @PostMapping("/service/app/{appId}/host/batchGet") InternalResponse batchGetAppHosts( @PathVariable("appId") Long appId, @RequestBody ServiceCheckAppHostsReq req @@ -91,7 +90,7 @@ InternalResponse batchGetAppHosts( * @return 主机信息 */ @ApiOperation(value = "检查主机是否在业务下", produces = "application/json") - @PostMapping("/hosts/batchGet") + @PostMapping("/service/hosts/batchGet") InternalResponse> batchGetHosts( @RequestBody ServiceBatchGetHostsReq req); diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java index 6e21f6dfff..df898ffa3d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java @@ -42,13 +42,12 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:Metrics"}) -@RequestMapping("/service/metrics") @RestController @InternalAPI public interface ServiceMetricsResource { @ApiOperation(value = "接入业务总量", produces = "application/json") - @GetMapping("/apps/count") + @GetMapping("/service/metrics/apps/count") InternalResponse countApps( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -56,7 +55,7 @@ InternalResponse countApps( ); @ApiOperation(value = "作业模板量", produces = "application/json") - @GetMapping("/templates/count") + @GetMapping("/service/metrics/templates/count") InternalResponse countTemplates( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -64,7 +63,7 @@ InternalResponse countTemplates( ); @ApiOperation(value = "执行方案量", produces = "application/json") - @GetMapping("/taskPlans/count") + @GetMapping("/service/metrics/taskPlans/count") InternalResponse countTaskPlans( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -72,7 +71,7 @@ InternalResponse countTaskPlans( ); @ApiOperation(value = "作业模板的步骤量", produces = "application/json") - @GetMapping("/templates/step/count") + @GetMapping("/service/metrics/templates/step/count") InternalResponse countTemplateSteps( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -89,7 +88,7 @@ InternalResponse countTemplateSteps( ); @ApiOperation(value = "脚本总量", produces = "application/json") - @GetMapping("/script/count") + @GetMapping("/service/metrics/script/count") InternalResponse countScripts( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -103,7 +102,7 @@ InternalResponse countScripts( ); @ApiOperation(value = "被引用的脚本总量", produces = "application/json") - @GetMapping("/script/cited/count") + @GetMapping("/service/metrics/script/cited/count") InternalResponse countCiteScripts( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -111,7 +110,7 @@ InternalResponse countCiteScripts( ); @ApiOperation(value = "引用脚本的步骤总量", produces = "application/json") - @GetMapping("/step/citeScript/count") + @GetMapping("/service/metrics/step/citeScript/count") InternalResponse countCiteScriptSteps( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -119,7 +118,7 @@ InternalResponse countCiteScriptSteps( ); @ApiOperation(value = "脚本版本总量", produces = "application/json") - @GetMapping("/scriptVersions/count") + @GetMapping("/service/metrics/scriptVersions/count") InternalResponse countScriptVersions( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -133,7 +132,7 @@ InternalResponse countScriptVersions( ); @ApiOperation(value = "账号总量", produces = "application/json") - @GetMapping("/accounts/count") + @GetMapping("/service/metrics/accounts/count") InternalResponse countAccounts( @ApiParam("账号类型") @RequestParam(value = "accountType", required = false) @@ -141,7 +140,7 @@ InternalResponse countAccounts( ); @ApiOperation(value = "主机总量", produces = "application/json") - @GetMapping("/hosts/count") + @GetMapping("/service/metrics/hosts/count") InternalResponse countHostsByOsType( @ApiParam("系统类型") @RequestParam(value = "osType", required = false) @@ -149,7 +148,7 @@ InternalResponse countHostsByOsType( ); @ApiOperation(value = "某个标签在某业务下的被引数量", produces = "application/json") - @GetMapping("/tags/citedCount") + @GetMapping("/service/metrics/tags/citedCount") InternalResponse tagCitedCount( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java index a19216e6c1..4dde32573c 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java @@ -45,47 +45,46 @@ import java.util.List; @Api(tags = {"job-manage:service:Notification"}) -@RequestMapping("/service/notification") @RestController @InternalAPI public interface ServiceNotificationResource { @ApiOperation(value = "发送通知给用户（渠道在配置文件中配置，默认所有渠道）", produces = "application/json") - @PostMapping("/sendNotificationsToUsers") + @PostMapping("/service/notification/sendNotificationsToUsers") InternalResponse sendNotificationsToUsers( @ApiParam("通知接受者与消息内容") @RequestBody ServiceUserNotificationDTO serviceUserNotificationDTO ); @ApiOperation(value = "发送通知给管理员（渠道在配置文件中配置，默认所有渠道）", produces = "application/json") - @PostMapping("/sendNotificationsToAdministrators") + @PostMapping("/service/notification/sendNotificationsToAdministrators") InternalResponse sendNotificationsToAdministrators( @ApiParam("消息内容") @RequestBody ServiceNotificationMessage serviceNotificationMessage ); @ApiOperation(value = "触发模板消息通知", produces = "application/json") - @PostMapping("/triggerTemplateNotification") + @PostMapping("/service/notification/triggerTemplateNotification") InternalResponse triggerTemplateNotification( @RequestBody ServiceTriggerTemplateNotificationDTO triggerTemplateNotification ); @ApiOperation(value = "根据模板发送消息通知", produces = "application/json") - @PostMapping("/sendTemplateNotification") + @PostMapping("/service/notification/sendTemplateNotification") InternalResponse sendTemplateNotification( @ApiParam("根据模板发送消息通知") @RequestBody ServiceTemplateNotificationDTO templateNotificationDTO ); @ApiOperation(value = "获取通知角色列表", produces = "application/json") - @GetMapping("/getNotifyRoles") + @GetMapping("/service/notification/getNotifyRoles") InternalResponse> getNotifyRoles( @ApiParam("语言") @RequestHeader("lang") String lang ); @ApiOperation(value = "获取通知渠道", produces = "application/json") - @GetMapping("/getNotifyChannels") + @GetMapping("/service/notification/getNotifyChannels") InternalResponse> getNotifyChannels( @ApiParam("语言") @RequestHeader("lang") String lang diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java index 1827b32c65..f8a7ac6df1 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java @@ -41,12 +41,11 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:Script_Management"}) -@RequestMapping("/service/script") @RestController @InternalAPI public interface ServiceScriptResource { @ApiOperation(value = "根据业务ID、脚本版本ID获取脚本", produces = "application/json") - @GetMapping("/app/{appId}/scriptVersion/{scriptVersionId}") + @GetMapping("/service/script/app/{appId}/scriptVersion/{scriptVersionId}") InternalResponse getScriptByAppIdAndScriptVersionId(@RequestHeader("username") String username, @PathVariable("appId") @@ -55,11 +54,11 @@ InternalResponse getScriptByAppIdAndScriptVersionId(@RequestHe Long scriptVersionId); @ApiOperation(value = "根据脚本版本ID获取脚本", produces = "application/json") - @GetMapping("/scriptVersion/{scriptVersionId}") + @GetMapping("/service/script/scriptVersion/{scriptVersionId}") InternalResponse getScriptByScriptVersionId(@PathVariable("scriptVersionId") Long scriptVersionId); @ApiOperation(value = "指定Id创建脚本版本", produces = "application/json") - @PostMapping("/app/{appId}/createScriptWithVersionId") + @PostMapping("/service/script/app/{appId}/createScriptWithVersionId") InternalResponse> createScriptWithVersionId( @ApiParam("用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam("创建时间") @RequestHeader(value = "X-Create-Time", required = false) Long createTime, @@ -71,10 +70,10 @@ InternalResponse> createScriptWithVersionId( required = true) @RequestBody ScriptCreateUpdateReq scriptCreateUpdateReq); @ApiOperation(value = "获取脚本基本信息", produces = "application/json") - @GetMapping("/{scriptId}") + @GetMapping("/service/script/{scriptId}") InternalResponse getBasicScriptInfo(@PathVariable("scriptId") String scriptId); @ApiOperation(value = "获取已上线版本", produces = "application/json") - @GetMapping("/scriptVersion/online/{scriptId}") + @GetMapping("/service/script/scriptVersion/online/{scriptId}") InternalResponse getOnlineScriptVersion(@PathVariable("scriptId") String scriptId); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceSyncResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceSyncResource.java index b0feb5f292..76f92f15f7 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceSyncResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceSyncResource.java @@ -42,7 +42,6 @@ /** * 同步业务、主机资源服务 */ -@RequestMapping("/service/sync") @Api(tags = {"job-manage:service:App_Management"}) @RestController @InternalAPI @@ -52,7 +51,7 @@ public interface ServiceSyncResource { * * @return */ - @RequestMapping("/app/list") + @RequestMapping("/service/sync/app/list") List listAllApps(); /** @@ -61,7 +60,7 @@ public interface ServiceSyncResource { * @param appId 业务ID * @return */ - @GetMapping("/host/app/{appId}") + @GetMapping("/service/sync/host/app/{appId}") @ApiOperation(value = "根据业务ID获取主机", produces = "application/json") InternalResponse> getHostByAppId( @ApiParam(value = "业务ID", required = true) @@ -73,7 +72,7 @@ InternalResponse> getHostByAppId( * @param bizId 业务ID * @return */ - @PutMapping("/syncHost/biz/{bizId}") + @PutMapping("/service/sync/syncHost/biz/{bizId}") @ApiOperation(value = "根据业务ID同步主机", produces = "application/json") InternalResponse syncHostByBizId( @ApiParam(value = "业务ID", required = true) @@ -84,7 +83,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/bizWatch/enable") + @PutMapping("/service/sync/bizWatch/enable") @ApiOperation(value = "开启业务事件监听", produces = "application/json") InternalResponse enableBizWatch(); @@ -93,7 +92,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/bizWatch/disable") + @PutMapping("/service/sync/bizWatch/disable") @ApiOperation(value = "关闭业务事件监听", produces = "application/json") InternalResponse disableBizWatch(); @@ -102,7 +101,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/hostWatch/enable") + @PutMapping("/service/sync/hostWatch/enable") @ApiOperation(value = "开启主机事件监听", produces = "application/json") InternalResponse enableHostWatch(); @@ -111,7 +110,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/hostWatch/disable") + @PutMapping("/service/sync/hostWatch/disable") @ApiOperation(value = "关闭主机事件监听", produces = "application/json") InternalResponse disableHostWatch(); @@ -120,7 +119,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncApp/enable") + @PutMapping("/service/sync/syncApp/enable") @ApiOperation(value = "开启业务同步", produces = "application/json") InternalResponse enableSyncApp(); @@ -129,7 +128,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncApp/disable") + @PutMapping("/service/sync/syncApp/disable") @ApiOperation(value = "关闭业务同步", produces = "application/json") InternalResponse disableSyncApp(); @@ -138,7 +137,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncHost/enable") + @PutMapping("/service/sync/syncHost/enable") @ApiOperation(value = "开启主机同步", produces = "application/json") InternalResponse enableSyncHost(); @@ -147,7 +146,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncHost/disable") + @PutMapping("/service/sync/syncHost/disable") @ApiOperation(value = "关闭主机同步", produces = "application/json") InternalResponse disableSyncHost(); @@ -156,7 +155,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncAgentStatus/enable") + @PutMapping("/service/sync/syncAgentStatus/enable") @ApiOperation(value = "开启主机状态同步", produces = "application/json") InternalResponse enableSyncAgentStatus(); @@ -165,7 +164,7 @@ InternalResponse syncHostByBizId( * * @return */ - @PutMapping("/syncAgentStatus/disable") + @PutMapping("/service/sync/syncAgentStatus/disable") @ApiOperation(value = "关闭主机状态同步", produces = "application/json") InternalResponse disableSyncAgentStatus(); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java index e846d3a36a..742ecced9b 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java @@ -38,13 +38,12 @@ import java.util.List; @Api(tags = {"job-manage:Service:Tag"}) -@RequestMapping("/service/tag") @RestController @InternalAPI public interface ServiceTagResource { @ApiOperation(value = "获取业务下的所有标签", produces = "application/json") - @GetMapping("/list") + @GetMapping("/service/tag/list") InternalResponse> listTags( @ApiParam(value = "业务Id") @RequestParam(value = "appId", required = false) @@ -52,7 +51,7 @@ InternalResponse> listTags( ); @ApiOperation(value = "获取所有公共标签", produces = "application/json") - @GetMapping("/list/public") + @GetMapping("/service/tag/list/public") InternalResponse> listPublicTags(); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java index 7b07662cda..6e8a0c8bd2 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java @@ -45,57 +45,56 @@ import java.util.List; @Api(tags = {"job-manage:service:Task_Plan_Management"}) -@RequestMapping("/service") @RestController @InternalAPI public interface ServiceTaskPlanResource { @ApiOperation(value = "根据执行方案ID获取执行方案信息", produces = "application/json") - @GetMapping("/app/{appId}/plan/planId/{planId}/basic") + @GetMapping("/service/app/{appId}/plan/planId/{planId}/basic") InternalResponse getPlanBasicInfoById( @ApiParam(value = "业务ID", required = true) @PathVariable("appId") Long appId, @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId); @ApiOperation(value = "根据执行方案ID获取执行方案信息", produces = "application/json") - @GetMapping("/plan/{planId}/planName") + @GetMapping("/service/plan/{planId}/planName") InternalResponse getPlanName( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId); @ApiOperation(value = "根据执行方案全局变量name获取id", produces = "application/json") - @GetMapping("/plan/{planId}/globalVar/getIdByName/{globalVarName}") + @GetMapping("/service/plan/{planId}/globalVar/getIdByName/{globalVarName}") InternalResponse getGlobalVarIdByName( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId, @ApiParam(value = "全局变量名称", required = true) @PathVariable("globalVarName") String globalVarName ); @ApiOperation(value = "根据执行方案全局变量name获取实例", produces = "application/json") - @GetMapping("/plan/{planId}/globalVar/name/{globalVarName}") + @GetMapping("/service/plan/{planId}/globalVar/name/{globalVarName}") InternalResponse getGlobalVarByName( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId, @ApiParam(value = "全局变量名称", required = true) @PathVariable("globalVarName") String globalVarName ); @ApiOperation(value = "根据执行方案全局变量id获取name", produces = "application/json") - @GetMapping("/plan/{planId}/globalVar/getNameById/{globalVarId}") + @GetMapping("/service/plan/{planId}/globalVar/getNameById/{globalVarId}") InternalResponse getGlobalVarNameById( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId, @ApiParam(value = "全局变量ID", required = true) @PathVariable("globalVarId") Long globalVarId ); @ApiOperation(value = "根据执行方案全局变量id获取实例", produces = "application/json") - @GetMapping("/plan/{planId}/globalVar/id/{globalVarId}") + @GetMapping("/service/plan/{planId}/globalVar/id/{globalVarId}") InternalResponse getGlobalVarById( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId, @ApiParam(value = "全局变量ID", required = true) @PathVariable("globalVarId") Long globalVarId ); @ApiOperation(value = "根据执行方案ID获取执行方案业务Id", produces = "application/json") - @GetMapping("/plan/{planId}/planAppId") + @GetMapping("/service/plan/{planId}/planAppId") InternalResponse getPlanAppId( @ApiParam(value = "执行方案ID", required = true) @PathVariable("planId") Long planId); @ApiOperation(value = "根据执行方案ID获取执行方案信息", produces = "application/json") - @GetMapping("/app/{appId}/plan/planId/{planId}") + @GetMapping("/service/app/{appId}/plan/planId/{planId}") InternalResponse getPlanById( @ApiParam(value = "业务ID", required = true) @PathVariable("appId") Long appId, @@ -105,7 +104,7 @@ InternalResponse getPlanById( @RequestParam(value = "includeDisabledSteps", required = false, defaultValue = "false") Boolean includeDisabledSteps); - @PutMapping("/app/{appId}/plan/{templateId}/{planId}/createPlanWithId") + @PutMapping("/service/app/{appId}/plan/{templateId}/{planId}/createPlanWithId") InternalResponse createPlanWithIdForMigration( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @@ -115,7 +114,7 @@ InternalResponse createPlanWithIdForMigration( @ApiParam(value = "修改时间") @RequestHeader(value = "X-Update-Time", required = false) Long lastModifyTime, @ApiParam(value = "最后修改人") @RequestHeader(value = "X-Update-User", required = false) String lastModifyUser); - @GetMapping("/app/{appId}/plan/check") + @GetMapping("/service/app/{appId}/plan/check") InternalResponse checkIdAndName( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "模版 ID") @RequestParam("templateId") Long templateId, @@ -123,7 +122,7 @@ InternalResponse checkIdAndName( @ApiParam(value = "执行方案名称", required = true) @RequestParam("planName") String name); @ApiOperation(value = "导入执行方案", produces = "application/json") - @PutMapping("/app/{appId}/plan/{templateId}/savePlanForImport") + @PutMapping("/service/app/{appId}/plan/{templateId}/savePlanForImport") InternalResponse savePlanForImport( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @@ -131,7 +130,7 @@ InternalResponse savePlanForImport( @ApiParam(value = "创建时间") @RequestHeader(value = "X-Create-Time", required = false) Long createTime, @ApiParam(value = "执行方案信息", required = true) @RequestBody TaskPlanVO planInfo); - @GetMapping("/app/{appId}/plan/{templateId}/{planId}/variable") + @GetMapping("/service/app/{appId}/plan/{templateId}/{planId}/variable") InternalResponse> getPlanVariable( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @@ -139,14 +138,14 @@ InternalResponse> getPlanVariable( @ApiParam(value = "执行方案 ID") @PathVariable("planId") Long planId); @ApiOperation(value = "获取执行方案基本信息列表", produces = "application/json") - @GetMapping("/{templateId}") + @GetMapping("/service/{templateId}") InternalResponse> listPlans( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "模版 ID", required = true) @PathVariable(value = "templateId") Long templateId); @ApiOperation(value = "获取模板对应的执行方案Id", produces = "application/json") - @GetMapping("/plan/planIds/template/{templateId}") + @GetMapping("/service/plan/planIds/template/{templateId}") InternalResponse> listPlanIds( @ApiParam(value = "模版 ID", required = true) @PathVariable(value = "templateId") Long templateId); } diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java index 1d681ce990..64f19134f3 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java @@ -47,13 +47,12 @@ import java.util.List; @Api(tags = {"job-manage:service:Task_Template_Management"}) -@RequestMapping("/service") @RestController @InternalAPI public interface ServiceTaskTemplateResource { @ApiOperation(value = "同步脚本更新消息", produces = "application/json") - @PostMapping("/app/{appId}/template/script/{scriptId}/update_message") + @PostMapping("/service/app/{appId}/template/script/{scriptId}/update_message") InternalResponse sendScriptUpdateMessage( @ApiParam(value = "业务 ID", required = true) @PathVariable("appId") Long appId, @ApiParam(value = "脚本 ID", required = true) @PathVariable("scriptId") String scriptId, @@ -61,24 +60,24 @@ InternalResponse sendScriptUpdateMessage( @ApiParam(value = "脚本状态 1 - 上线 2 - 下线 3 - 禁用", required = true) @RequestParam("status") Integer status); @ApiOperation(value = "根据模版 ID 获取模版信息", produces = "application/json") - @GetMapping("/app/{appId}/template/{templateId}") + @GetMapping("/service/app/{appId}/template/{templateId}") InternalResponse getTemplateById( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "模版 ID") @PathVariable("templateId") Long templateId); @ApiOperation(value = "根据模版 ID 获取模版信息", produces = "application/json") - @GetMapping("/template/{templateId}") + @GetMapping("/service/template/{templateId}") InternalResponse getTemplateById( @ApiParam(value = "模版 ID") @PathVariable("templateId") Long templateId); @ApiOperation(value = "根据模版 ID 获取模版名称", produces = "application/json") - @GetMapping("/template/{templateId}/templateName") + @GetMapping("/service/template/{templateId}/templateName") InternalResponse getTemplateNameById( @ApiParam(value = "模版 ID") @PathVariable("templateId") Long templateId); @ApiOperation(value = "更新模版", produces = "application/json") - @PutMapping("/app/{appId}/template/{templateId}/saveTemplateWithVariableId") + @PutMapping("/service/app/{appId}/template/{templateId}/saveTemplateWithVariableId") InternalResponse saveTemplateForMigration( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @@ -91,21 +90,21 @@ InternalResponse saveTemplateForMigration( required = true) @RequestBody TaskTemplateCreateUpdateReq taskTemplateCreateUpdateReq); @ApiOperation(value = "校验模版 ID 和名称", produces = "application/json") - @GetMapping("/app/{appId}/template/check") + @GetMapping("/service/app/{appId}/template/check") InternalResponse checkIdAndName( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "模版 ID") @RequestParam("templateId") Long templateId, @ApiParam(value = "模版名称", required = true) @RequestParam("templateName") String name); @ApiOperation(value = "根据模版 ID 获取模版变量信息", produces = "application/json") - @GetMapping("/app/{appId}/template/{templateId}/variable") + @GetMapping("/service/app/{appId}/template/{templateId}/variable") InternalResponse> getTemplateVariable( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") String username, @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") Long appId, @ApiParam(value = "模版 ID") @PathVariable("templateId") Long templateId); @ApiOperation(value = "获取模版信息列表", produces = "application/json") - @GetMapping("/app/{appId}/template/list") + @GetMapping("/service/app/{appId}/template/list") InternalResponse> listPageTaskTemplates( @ApiParam(value = "业务 ID", required = true, example = "2") @PathVariable("appId") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java index b50032dd49..eb82510d62 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java @@ -37,13 +37,12 @@ import java.util.Set; @Api(tags = {"job-manage:service:User"}) -@RequestMapping("/service/user") @RestController @InternalAPI public interface ServiceUserResource { @ApiOperation(value = "根据业务Id与角色获取用户信息", produces = "application/json") - @GetMapping("/getUsersByRoles") + @GetMapping("/service/user/getUsersByRoles") InternalResponse> getUsersByRoles( @ApiParam("业务Id") @RequestParam(value = "appId", required = true) diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java index 8ee0fec63b..dfc2a2c3c0 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java @@ -42,13 +42,12 @@ import java.util.List; @Api(tags = {"job-manage:service:WhiteIP"}) -@RequestMapping("/service/whiteip") @RestController @InternalAPI public interface ServiceWhiteIPResource { @ApiOperation(value = "获取指定IP在白名单中的生效范围（脚本执行：SCRIPT_EXECUTE/文件分发：FILE_DISTRIBUTION）", produces = "application/json") - @GetMapping("/getWhiteIPActionScopes") + @GetMapping("/service/whiteip/getWhiteIPActionScopes") InternalResponse> getWhiteIPActionScopes( @ApiParam("业务Id") @RequestParam(value = "appId", required = false) @@ -62,11 +61,11 @@ InternalResponse> getWhiteIPActionScopes( ); @ApiOperation(value = "获取白名单内IP详情信息", produces = "application/json") - @GetMapping("/listWhiteIPInfos") + @GetMapping("/service/whiteip/listWhiteIPInfos") InternalResponse> listWhiteIPInfos(); @ApiOperation(value = "新增/更新IP白名单", produces = "application/json") - @PostMapping("") + @PostMapping("/service/whiteip") InternalResponse saveWhiteIP( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java index 5e44c8491b..625c049fea 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java @@ -52,12 +52,11 @@ * 账号 Web API */ @Api(tags = {"job-manage:web:App_Account"}) -@RequestMapping("/web/account") @WebAPI public interface WebAppAccountResource { @ApiOperation(value = "新增账号", produces = "application/json") - @PostMapping(value = "/scope/{scopeType}/{scopeId}/account") + @PostMapping(value = "/web/account/scope/{scopeType}/{scopeId}/account") Response saveAccount( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -77,7 +76,7 @@ Response saveAccount( ); @ApiOperation(value = "更新账号", produces = "application/json") - @PutMapping(value = "/scope/{scopeType}/{scopeId}/account") + @PutMapping(value = "/web/account/scope/{scopeType}/{scopeId}/account") Response updateAccount( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -97,7 +96,7 @@ Response updateAccount( ); @ApiOperation(value = "根据条件获取业务下的所有账号", produces = "application/json") - @GetMapping({"/scope/{scopeType}/{scopeId}/accounts/page"}) + @GetMapping({"/web/account/scope/{scopeType}/{scopeId}/accounts/page"}) Response> listAppAccounts( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -153,7 +152,7 @@ Response> listAppAccounts( ); @ApiOperation(value = "删除账号", produces = "application/json") - @DeleteMapping(value = "/scope/{scopeType}/{scopeId}/account/{accountId}") + @DeleteMapping(value = "/web/account/scope/{scopeType}/{scopeId}/account/{accountId}") Response deleteAccount( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -173,7 +172,7 @@ Response deleteAccount( ); @ApiOperation(value = "获取账号详情", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/account/{accountId}"}) + @GetMapping(value = {"/web/account/scope/{scopeType}/{scopeId}/account/{accountId}"}) Response getAccountById( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") @@ -193,7 +192,7 @@ Response getAccountById( ); @ApiOperation(value = "获取业务下的账号列表，返回简单的账号信息", produces = "application/json") - @GetMapping({"/scope/{scopeType}/{scopeId}/accounts"}) + @GetMapping({"/web/account/scope/{scopeType}/{scopeId}/accounts"}) Response> listAccounts( @ApiParam(value = "用户名，网关自动传入", required = true) @RequestHeader("username") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java index 0aeabc8842..d0904eaf7d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java @@ -66,13 +66,12 @@ * @date 2019/09/19 */ @Api(value = "脚本管理", tags = {"job-manage:web:Script_Management"}) -@RequestMapping("/web/script") @RestController @WebAPI public interface WebScriptResource { @ApiOperation(value = "根据脚本版本ID获取脚本版本详情", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/scriptVersion/{scriptVersionId}"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/scriptVersion/{scriptVersionId}"}) Response getScriptVersionDetail( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -92,7 +91,7 @@ Response getScriptVersionDetail( ); @ApiOperation(value = "根据脚本ID获取脚本详情", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/script/{scriptId}"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}"}) Response getScript( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -111,7 +110,7 @@ Response getScript( String scriptId); @ApiOperation(value = "根据脚本ID获取脚本基本信息", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/script/basic/{scriptId}"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/script/basic/{scriptId}"}) Response getScriptBasicInfo( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -131,7 +130,7 @@ Response getScriptBasicInfo( ); @ApiOperation(value = "根据脚本ID获取已上线脚本", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/scriptVersion/online/{scriptId}"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/scriptVersion/online/{scriptId}"}) Response getOnlineScriptVersionByScriptId( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -153,7 +152,7 @@ Response getOnlineScriptVersionByScriptId( ); @ApiOperation(value = "获取脚本列表", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/script/list"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/script/list"}) Response> listPageScript( @ApiParam("用户名，网关自动传入") @RequestHeader("username") String username, @@ -211,7 +210,7 @@ Response> listPageScript( ); @ApiOperation(value = "获取脚本列表(仅包含基础信息)", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/script/basic/list"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/script/basic/list"}) Response> listScriptBasicInfo( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -231,7 +230,7 @@ Response> listScriptBasicInfo( ); @ApiOperation(value = "获取脚本的所有版本", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/list"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/list"}) Response> listScriptVersion( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -251,7 +250,7 @@ Response> listScriptVersion( ); @ApiOperation(value = "更新脚本元数据，比如脚本描述、名称、标签", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/script/{scriptId}/info") + @PutMapping("/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/info") Response updateScriptInfo( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -275,7 +274,7 @@ Response updateScriptInfo( @ApiOperation(value = "更新脚本", produces = "application/json") - @PostMapping("/scope/{scopeType}/{scopeId}/script") + @PostMapping("/web/script/scope/{scopeType}/{scopeId}/script") Response saveScript( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -295,7 +294,7 @@ Response saveScript( ); @ApiOperation(value = "上线脚本", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/publish") + @PutMapping("/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/publish") Response publishScriptVersion( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -318,7 +317,7 @@ Response publishScriptVersion( ); @ApiOperation(value = "禁用脚本", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/disable") + @PutMapping("/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/disable") Response disableScriptVersion( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -341,7 +340,7 @@ Response disableScriptVersion( ); @ApiOperation(value = "删除脚本", produces = "application/json") - @DeleteMapping("/scope/{scopeType}/{scopeId}/script/{scriptId}") + @DeleteMapping("/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}") Response deleteScriptByScriptId( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -361,7 +360,7 @@ Response deleteScriptByScriptId( ); @ApiOperation(value = "删除某个版本的脚本", produces = "application/json") - @DeleteMapping("/scope/{scopeType}/{scopeId}/scriptVersion/{scriptVersionId}") + @DeleteMapping("/web/script/scope/{scopeType}/{scopeId}/scriptVersion/{scriptVersionId}") Response deleteScriptByScriptVersionId( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -381,7 +380,7 @@ Response deleteScriptByScriptVersionId( ); @ApiOperation(value = "根据条件查询业务下的脚本名称列表", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/scriptNames"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/scriptNames"}) Response listAppScriptNames( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -401,7 +400,7 @@ Response listAppScriptNames( ); @ApiOperation(value = "获取业务下面的已在线业务脚本列表", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/scripts/online"}) + @GetMapping(value = {"/web/script/scope/{scopeType}/{scopeId}/scripts/online"}) Response> listScriptOnline( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -418,7 +417,7 @@ Response> listScriptOnline( ); @ApiOperation(value = "检查脚本内容", produces = "application/json") - @PutMapping("/check") + @PutMapping("/web/script/check") Response> checkScript( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -429,7 +428,7 @@ Response> checkScript( ); @ApiOperation(value = "上传脚本获取内容", produces = "application/json") - @PostMapping("/upload") + @PostMapping("/web/script/upload") Response uploadScript( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -440,8 +439,8 @@ Response uploadScript( ); @ApiOperation(value = "获取脚本可以同步的模板与步骤信息", produces = "application/json") - @GetMapping(value = - "/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/syncTemplateSteps") + @GetMapping(value = "/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId" + + "}/syncTemplateSteps") Response> listScriptSyncTemplateSteps( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -464,7 +463,7 @@ Response> listScriptSyncTemplateSteps( ); @ApiOperation(value = "同步脚本", produces = "application/json") - @PostMapping("/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/sync") + @PostMapping("/web/script/scope/{scopeType}/{scopeId}/script/{scriptId}/scriptVersion/{scriptVersionId}/sync") Response> syncScripts( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -489,7 +488,7 @@ Response> syncScripts( ); @ApiOperation(value = "根据脚本ID/脚本版本ID获取脚本被引次数", produces = "application/json") - @GetMapping("/scope/{scopeType}/{scopeId}/citeCount") + @GetMapping("/web/script/scope/{scopeType}/{scopeId}/citeCount") Response getScriptCiteCount( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -512,7 +511,7 @@ Response getScriptCiteCount( ); @ApiOperation(value = "根据脚本ID/脚本版本ID获取脚本引用信息", produces = "application/json") - @GetMapping("/scope/{scopeType}/{scopeId}/citeInfo") + @GetMapping("/web/script/scope/{scopeType}/{scopeId}/citeInfo") Response getScriptCiteInfo( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -533,7 +532,7 @@ Response getScriptCiteInfo( ); @ApiOperation(value = "批量更新脚本标签-Patch方式", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/tag") + @PutMapping("/web/script/scope/{scopeType}/{scopeId}/tag") Response batchUpdateScriptTags( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -553,7 +552,7 @@ Response batchUpdateScriptTags( ); @ApiOperation(value = "获取业务下标签关联的脚本数量", produces = "application/json") - @GetMapping("/scope/{scopeType}/{scopeId}/tag/count") + @GetMapping("/web/script/scope/{scopeType}/{scopeId}/tag/count") Response getTagScriptCount( @ApiParam("用户名，网关自动传入") @RequestHeader("username") String username, diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java index d07b7c2db3..18efd9817d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java @@ -52,13 +52,12 @@ import java.util.List; @Api(tags = {"job-manage:web:Task_Plan_Management"}) -@RequestMapping("/web") @RestController @WebAPI public interface WebTaskPlanResource { @ApiOperation(value = "获取业务下的执行方案列表", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan/list"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan/list"}) Response> listAllPlans( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -99,7 +98,7 @@ Response> listAllPlans( ); @ApiOperation(value = "获取执行方案基本信息列表", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan/{templateId}"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}"}) Response> listPlans( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -119,7 +118,7 @@ Response> listPlans( ); @ApiOperation(value = "批量获取执行方案基本信息", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan:batchGet"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan:batchGet"}) Response> batchGetPlans( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -139,7 +138,7 @@ Response> batchGetPlans( ); @ApiOperation(value = "根据执行方案 ID 获取执行方案信息", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}"}) Response getPlanById( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -162,7 +161,7 @@ Response getPlanById( ); @ApiOperation(value = "获取模版对应的调试方案信息", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan/{templateId}/debug"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/debug"}) Response getDebugPlan( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -182,7 +181,7 @@ Response getDebugPlan( ); @ApiOperation(value = "更新执行方案", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}") Response savePlan( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -208,7 +207,7 @@ Response savePlan( ); @ApiOperation(value = "删除执行方案", produces = "application/json") - @DeleteMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}") + @DeleteMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}") Response deletePlan( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -231,7 +230,7 @@ Response deletePlan( ); @ApiOperation(value = "根据执行方案 ID 批量拉基础信息", produces = "application/json") - @GetMapping(value = {"/scope/{scopeType}/{scopeId}/task/plan"}) + @GetMapping(value = {"/web/scope/{scopeType}/{scopeId}/task/plan"}) Response> listPlanBasicInfoByIds( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -251,7 +250,7 @@ Response> listPlanBasicInfoByIds( ); @ApiOperation(value = "检查执行方案名称是否已占用", produces = "application/json") - @GetMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/check_name") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/check_name") Response checkPlanName( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -277,7 +276,7 @@ Response checkPlanName( ); @ApiOperation(value = "获取执行方案同步信息", produces = "application/json") - @GetMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/sync_info") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/sync_info") Response syncInfo( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -300,7 +299,7 @@ Response syncInfo( ); @ApiOperation(value = "同步执行方案", produces = "application/json") - @PostMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/sync") + @PostMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/sync") Response syncConfirm( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -326,7 +325,7 @@ Response syncConfirm( ); @ApiOperation(value = "新增收藏", produces = "application/json") - @PutMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/favorite") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/favorite") Response addFavorite( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -349,7 +348,7 @@ Response addFavorite( ); @ApiOperation(value = "删除收藏", produces = "application/json") - @DeleteMapping("/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/favorite") + @DeleteMapping("/web/scope/{scopeType}/{scopeId}/task/plan/{templateId}/{planId}/favorite") Response removeFavorite( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -372,7 +371,7 @@ Response removeFavorite( ); @ApiOperation(value = "根据执行方案 ID 拉基本信息", produces = "application/json") - @GetMapping("/task/plan/{planId}") + @GetMapping("/web/task/plan/{planId}") Response getPlanBasicInfoById( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -383,7 +382,7 @@ Response getPlanBasicInfoById( ); @ApiOperation(value = "批量根据变量名更新执行方案变量值", produces = "application/json") - @PostMapping("/scope/{scopeType}/{scopeId}/task/plan/batch_update_variable") + @PostMapping("/web/scope/{scopeType}/{scopeId}/task/plan/batch_update_variable") Response batchUpdatePlanVariableValueByName( @ApiParam("用户名，网关自动传入") @RequestHeader("username") diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java index b8b41c2fb2..41129c875d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java @@ -55,13 +55,12 @@ * @since 15/10/2019 17:16 */ @Api(tags = {"job-manage:web:Task_Template_Management"}) -@RequestMapping("/web/scope/{scopeType}/{scopeId}/task/template") @RestController @WebAPI public interface WebTaskTemplateResource { @ApiOperation(value = "获取模版基本信息列表", produces = "application/json") - @GetMapping + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/template") Response> listPageTemplates( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -114,7 +113,7 @@ Response> listPageTemplates( ); @ApiOperation(value = "根据模版 ID 获取模版信息", produces = "application/json") - @GetMapping("/{templateId}") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}") Response getTemplateById( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -134,7 +133,7 @@ Response getTemplateById( ); @ApiOperation(value = "更新模版", produces = "application/json") - @PutMapping("/{templateId}") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}") Response saveTemplate( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -158,7 +157,7 @@ Response saveTemplate( ); @ApiOperation(value = "删除模版", produces = "application/json") - @DeleteMapping("/{templateId}") + @DeleteMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}") Response deleteTemplate( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -178,7 +177,7 @@ Response deleteTemplate( ); @ApiOperation(value = "获取业务下标签关联的模版数量", produces = "application/json") - @GetMapping("/tag/count") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/template/tag/count") Response getTagTemplateCount( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -195,7 +194,7 @@ Response getTagTemplateCount( ); @ApiOperation(value = "更新模版元数据，如模版描述、名称、标签", produces = "application/json") - @PutMapping("/{templateId}/basic") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}/basic") Response updateTemplateBasicInfo( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -218,7 +217,7 @@ Response updateTemplateBasicInfo( ); @ApiOperation(value = "新增收藏", produces = "application/json") - @PutMapping("/{templateId}/favorite") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}/favorite") Response addFavorite( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -238,7 +237,7 @@ Response addFavorite( ); @ApiOperation(value = "删除收藏", produces = "application/json") - @DeleteMapping("/{templateId}/favorite") + @DeleteMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}/favorite") Response removeFavorite( @ApiParam("用户名，网关自动传入") @RequestHeader("username") @@ -258,7 +257,7 @@ Response removeFavorite( ); @ApiOperation(value = "检查作业模版名称是否已占用", produces = "application/json") - @GetMapping("/{templateId}/check_name") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/template/{templateId}/check_name") Response checkTemplateName( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -281,7 +280,7 @@ Response checkTemplateName( ); @ApiOperation(value = "根据 ID 批量获取模版基本信息列表", produces = "application/json") - @GetMapping("/basic") + @GetMapping("/web/scope/{scopeType}/{scopeId}/task/template/basic") Response> listTemplateBasicInfoByIds( @ApiParam(value = "用户名，网关自动传入") @RequestHeader("username") @@ -301,7 +300,7 @@ Response> listTemplateBasicInfoByIds( ); @ApiOperation(value = "批量更新模板标签-Patch方式", produces = "application/json") - @PutMapping("/tag") + @PutMapping("/web/scope/{scopeType}/{scopeId}/task/template/tag") Response batchPatchTemplateTags( @ApiParam("用户名，网关自动传入") @RequestHeader("username") diff --git a/src/backend/job-manage/boot-job-manage/build.gradle b/src/backend/job-manage/boot-job-manage/build.gradle index 52601ccd35..23c0211357 100644 --- a/src/backend/job-manage/boot-job-manage/build.gradle +++ b/src/backend/job-manage/boot-job-manage/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation 'org.springframework:spring-webmvc' implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis') runtimeOnly('mysql:mysql-connector-java') + runtimeOnly("com.google.protobuf:protobuf-java:$protobufJavaVersion") testImplementation("com.h2database:h2") } diff --git a/support-files/dependJarInfo/versionList.txt b/support-files/dependJarInfo/versionList.txt index dcb94f7796..8097ff91e0 100644 --- a/support-files/dependJarInfo/versionList.txt +++ b/support-files/dependJarInfo/versionList.txt @@ -24,7 +24,7 @@ 0.9.5.4 2.10.0 1.5.1 -1.9.1 +1.9.4 1.14 3.2.2 4.4 @@ -47,7 +47,7 @@ 3.8.0 10.7.4 10.7.4 -2.8.6 +2.8.9 28.2-jre 2.1.12 6.1.4.Final @@ -58,13 +58,13 @@ 4.4.13 1.5.18 1.3 -2.11.2 -2.11.2 -2.11.2 -2.11.2 -2.11.2 -2.11.2 -2.11.2 +2.12.7.1 +2.12.7.1 +2.12.7.1 +2.12.7.1 +2.12.7.1 +2.12.7.1 +2.12.7.1 1.2.2 1.3.5 3.0.3 @@ -107,26 +107,26 @@ 1.5.1 4.0.5 4.0.5 -8.0.25 +8.0.28 0.3.0 0.1.1 -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final -4.1.52.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final +4.1.68.Final 1.1.0 1.1.3 5.1.3.201810200350-r 5.1.3.201810200350-r -3.11.4 +3.16.3 2.3.2 1.0.3 3.3.10.RELEASE @@ -148,8 +148,8 @@ 1.7.30 1.26 2.2.11.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE +5.3.23 +5.3.23 2.3.4.RELEASE 2.3.4.RELEASE 2.3.4.RELEASE @@ -187,7 +187,7 @@ 2.2.2.RELEASE 2.2.2.RELEASE 2.2.2.RELEASE -2.2.2.RELEASE +3.0.5 2.2.2.RELEASE 2.2.2.RELEASE 2.2.1.RELEASE @@ -204,34 +204,34 @@ 3.0.3.RELEASE 3.0.3.RELEASE 3.0.3.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE +5.3.23 +5.3.23 +5.3.23 2.3.4.RELEASE 2.3.4.RELEASE -3.0.4.RELEASE +3.3.5 2.3.4.RELEASE -5.2.9.RELEASE +5.3.23 5.3.2.RELEASE 5.3.2.RELEASE 5.3.2.RELEASE +5.3.23 5.2.9.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE +5.3.23 +5.3.23 1.2.0.RELEASE 1.2.0.RELEASE 2.2.6.RELEASE 1.2.5.RELEASE -5.3.4.RELEASE -5.3.4.RELEASE -5.3.4.RELEASE +5.5.7 +5.5.7 +5.5.7 1.0.9.RELEASE -5.3.4.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE -5.2.9.RELEASE +5.5.7 +5.3.23 +5.3.23 5.2.9.RELEASE +5.3.23 2.9.2 2.9.2 2.9.2 @@ -241,8 +241,8 @@ 2.9.2 1.5.20 1.5.20 -9.0.38 -9.0.38 +9.0.90 +9.0.90 2.19.3 2.12.1 2.12.1 From 5f7985bea87b84561999579e5d5ca273a995ad6c Mon Sep 17 00:00:00 2001 From: liuliaozhong Date: Tue, 16 Jul 2024 10:11:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=BB=84=E4=BB=B6=E5=AE=89=E5=85=A8=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E=20#2865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java | 1 - .../bk/job/crontab/api/inner/ServiceCronMetricsResource.java | 1 - .../bk/job/crontab/api/inner/ServiceInnerCronJobResource.java | 1 - .../bk/job/execute/api/inner/ServiceExecuteTaskResource.java | 1 - .../tencent/bk/job/execute/api/inner/ServiceMetricsResource.java | 1 - .../job/execute/api/inner/ServiceTaskExecuteResultResource.java | 1 - .../bk/job/file_gateway/api/inner/ServiceFileSourceResource.java | 1 - .../file_gateway/api/inner/ServiceFileSourceTaskResource.java | 1 - .../java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java | 1 - .../tencent/bk/job/manage/api/inner/ServiceAccountResource.java | 1 - .../bk/job/manage/api/inner/ServiceBackupTmpResource.java | 1 - .../bk/job/manage/api/inner/ServiceCheckScriptResource.java | 1 - .../bk/job/manage/api/inner/ServiceCredentialResource.java | 1 - .../bk/job/manage/api/inner/ServiceGlobalSettingsResource.java | 1 - .../com/tencent/bk/job/manage/api/inner/ServiceHostResource.java | 1 - .../tencent/bk/job/manage/api/inner/ServiceMetricsResource.java | 1 - .../bk/job/manage/api/inner/ServiceNotificationResource.java | 1 - .../tencent/bk/job/manage/api/inner/ServiceScriptResource.java | 1 - .../com/tencent/bk/job/manage/api/inner/ServiceTagResource.java | 1 - .../tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java | 1 - .../bk/job/manage/api/inner/ServiceTaskTemplateResource.java | 1 - .../com/tencent/bk/job/manage/api/inner/ServiceUserResource.java | 1 - .../tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java | 1 - .../com/tencent/bk/job/manage/api/web/WebAppAccountResource.java | 1 - .../com/tencent/bk/job/manage/api/web/WebScriptResource.java | 1 - .../com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java | 1 - .../tencent/bk/job/manage/api/web/WebTaskTemplateResource.java | 1 - 27 files changed, 27 deletions(-) diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java index b1c44a3b35..cb6706b293 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronJobResource.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java index 70d9bdc3dd..1bace995b4 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceCronMetricsResource.java @@ -30,7 +30,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java index e2c1614b53..da5db78391 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/inner/ServiceInnerCronJobResource.java @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java index 0fdb49fda0..35c1c674fa 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceExecuteTaskResource.java @@ -32,7 +32,6 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java index 31df08859f..f2386ce629 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceMetricsResource.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java index 118da7273d..adf459654e 100644 --- a/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java +++ b/src/backend/job-execute/api-job-execute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceTaskExecuteResultResource.java @@ -37,7 +37,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java index 7a41abfe1d..597b152193 100644 --- a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java +++ b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceResource.java @@ -31,7 +31,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-file-gateway:service:FileSource"}) diff --git a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java index ec048bfb28..1c34d00962 100644 --- a/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java +++ b/src/backend/job-file-gateway/api-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/inner/ServiceFileSourceTaskResource.java @@ -44,7 +44,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java b/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java index e566e6643f..fb5c50f8d1 100644 --- a/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java +++ b/src/backend/job-logsvr/api-job-logsvr/src/main/java/com/tencent/bk/job/logsvr/api/ServiceLogResource.java @@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java index 2df7fba620..c1048c2a8d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceAccountResource.java @@ -37,7 +37,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java index 54cb094551..a1ff9ac8c9 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceBackupTmpResource.java @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java index 8504da71cc..1b70c3b921 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCheckScriptResource.java @@ -31,7 +31,6 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java index edf659f888..4641607c3d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceCredentialResource.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:Credential"}) diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java index 481c06ceab..7b8f1109b4 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceGlobalSettingsResource.java @@ -30,7 +30,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:GlobalSettings"}) diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java index a88c722adb..ff7b7ce620 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceHostResource.java @@ -39,7 +39,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java index df898ffa3d..bd5af23362 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceMetricsResource.java @@ -37,7 +37,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java index 4dde32573c..9ec273eca5 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceNotificationResource.java @@ -39,7 +39,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java index f8a7ac6df1..fefcdacd0d 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceScriptResource.java @@ -37,7 +37,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = {"job-manage:service:Script_Management"}) diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java index 742ecced9b..f2e158c38e 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTagResource.java @@ -31,7 +31,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java index 6e8a0c8bd2..499f64477b 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskPlanResource.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java index 64f19134f3..ffc5b2291e 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceTaskTemplateResource.java @@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java index eb82510d62..ba74b4faa7 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceUserResource.java @@ -30,7 +30,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java index dfc2a2c3c0..7b6012eacc 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/inner/ServiceWhiteIPResource.java @@ -35,7 +35,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java index 625c049fea..e4bd80c032 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebAppAccountResource.java @@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import springfox.documentation.annotations.ApiIgnore; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java index d0904eaf7d..8eda4d8eff 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebScriptResource.java @@ -52,7 +52,6 @@ import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java index 18efd9817d..51a83b58a0 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskPlanResource.java @@ -43,7 +43,6 @@ import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java index 41129c875d..96738395d7 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebTaskTemplateResource.java @@ -44,7 +44,6 @@ import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; From 53071edbba5474cb0921bf58aeea9696a714b9d1 Mon Sep 17 00:00:00 2001 From: liuliaozhong Date: Tue, 16 Jul 2024 14:00:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=BB=84=E4=BB=B6=E5=AE=89=E5=85=A8=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E=20#2865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/commons/build.gradle | 2 +- support-files/dependJarInfo/md5List.txt | 76 ++++++++++++------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/backend/commons/build.gradle b/src/backend/commons/build.gradle index 7648f1778c..3a06f18aa2 100644 --- a/src/backend/commons/build.gradle +++ b/src/backend/commons/build.gradle @@ -36,7 +36,7 @@ subprojects { version "${jobCommonVersion}" dependencies { compileOnly 'javax.servlet:javax.servlet-api:3.1.0' - compileOnly 'ch.qos.logback:logback-classic:1.1.11' + compileOnly 'ch.qos.logback:logback-classic:1.3.14' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/support-files/dependJarInfo/md5List.txt b/support-files/dependJarInfo/md5List.txt index b4f2cf1db7..2437321f85 100644 --- a/support-files/dependJarInfo/md5List.txt +++ b/support-files/dependJarInfo/md5List.txt @@ -24,7 +24,7 @@ a6e02ea9a5acdc1a31df04d13f3ddc94 45fd4a89c9fd671a0d1dc97c0ec77abe ef26289b4355269fa45ca0174d4d6652 e91fcd30ba329fd1b0b6dc5321fd067c -d095339044d22475f8b1fea1b626d3bb +07dc532ee316fe1f2f0323e9bd2f8df4 e9158e0983096d3df09236f7b53125aa f54a8510f834a1a57166970bfc982e94 4a37023740719b391f10030362c86be6 @@ -47,7 +47,7 @@ ab48cdaa9aecefe5e938873ba2db3bb0 2c7321712d66562130f999b27334a4f6 4ed623006ecdcd2dd4633dbdc4c054dc b6a5fddf960ada6a6f1236f4a525d4fb -310f5841387183aca7900fead98d4858 +e67627f67e03301092dc7de0a2d7cef8 33083157d8725e867b2c71fb4ddf5e59 4b1acf3448b750cb485da7e37384fcd8 b53954fc8475542d5740dc0315556ea7 @@ -58,13 +58,13 @@ f2aa34cc77e2f7839735ec79592e1b00 e07a248f61c52776a2366c075dcd4963 d1bf2df33d7ae4dcfc12a6b1956d3e4c 5fa4ec4ec0c5aa70af8a7d4922df1931 -fb3fd29c5c990b78c8d1b40b9e8839de -1cf7bf96372fd34cb4a450f19d8e706b -14fd0effa4d1d3e09edb36423be82aff -8ce4743e07d8553fb8b57558973de9f7 -a43cefe1a03a5a6f1967b5832873b123 -10fc883f659e2407ea2639fe6dd5b112 -eed352dcdf5b22864084e25ed0671e84 +a9f4e4700f6670614028753302a995ed +e90114f7c87c241568606cc9e2c61cb1 +5c2dab5ceb80bddf3350ecc90bd99314 +32b31d87ce9a59a8df6d01d101a981c9 +dea2a9dfd6e25d39ee3f8b6c53df9ef8 +571f59c606b6012b4c99068b8004abff +3bb892f4d0c9dcc0559643c762efe194 1cbb480310fa1987f9db7a3ed7118af7 8b165cf58df5f8c2a222f637c0a07c97 6bb54dbf912bf1b6c79592838db76b51 @@ -107,26 +107,26 @@ badce92967671a310b5356f009ea57b2 f9092388f452855f4f41d9a294f9f4e9 d1a6c1d2717ace5be9fc4c7c889d2159 4c11f98e756dc607d6aad28469d612b1 -fdf55dcef04b09f2eaf42b75e61ccc9a +95cde01c78e7b04e13305338d60e056a 583a5b0db40c45508feefd900c9513f1 739701e8e7cd9a1a37c6e2b215b6e13a -adefee7023c7df6aa3ce1c991be1cc81 -26f4a8e4e9f5f636cb6dc77790ac9028 -43c2166a8380a6de94b4c699d4201687 -1d009df6b173f9ba40f44c1c98ac1290 -a10b743f92ebc118d4a6fbebd5a946a2 -5ad98b184022d9bb236b241eb5f72492 -10e5983aa882053b9d02b75380c32a64 -33b2f5e9eb6289328784defe6dcc5f74 -63bae2403f7b86964d10931d4473ebd7 -973eef4e4ca3ef4538b22c23efecff80 +e1e3de14cee314c3f019b5440758f381 +86a6b1be13eab24e50ebeab3c8fafdda +579238d33534bc908f8ba6e2a0337b15 +296945da75b4ded99746a7b542496eb5 +696fec3043b6c11c510a972f715a4bac +d8ce49acebde39147e7f1d22360dd27a +4bf0a05183c8a3220206abf6a53c240d +fc4540303951bb57fb4c9f290d9a25c2 +4ef12e72f69949a2e92dcc57157ea7e1 +9921a1230f9a84e6f8564b823e586f5a b851ccee6b416361992d43f861fa3306 63e24bf59ed6cb64eb62e8cd0e495a6c 1a5d6d1073dd2f5d026852dea49e23d4 848917322d5b4e121e53cc512d01a2f4 3705263c16eda688ca65cf8952e083d2 1625e427fdb663ebc495796939e6f42b -c4ceefed77d79affded2a1302e74606d +64e1c03215de2564e94caa089edf846c d7299dbaec0e0ed7af281b07cc40c8c1 69122b098fff1c6b1bf2cd3b355e7e03 2cb5e926b0d7fb935074a6097275d602 @@ -148,8 +148,8 @@ cacf8ba1c8c0056b1722a189e65e233d f8be00da99bc4ab64c79ab1e2be7cb7c 72d987f6193910b63c5e6881ab64da32 ed28008333df8dd1dc29cedf90eb28fb -3387706c47e5575473de25ffb97811ba -440c037bb6c2d0ca2f27c36238fca573 +3d1bd213d1a8356d6f87c3c8d4f49509 +54a6169c8887dac4c3a5e2e3975d838c d344958f6acd622e442372aaa02953a9 76a2bbff04fecc7d43b588293ed90be9 93bd4834fd14d715f843518f78b71f76 @@ -187,7 +187,7 @@ f3d37a87ce0e2fd4e56ba129ea1b8c99 6349dbeb65a5a7239aecb5e23d6a437d 2cb67053eaa53edd067730bb7aa18937 8d0b33599da8dfb5cfd61f2725374c0a -7f2a0cf87ab020c422626f9a5cb688b7 +f03ce55efa759649f48334d9a18de82c 34f8635a17ece8b67aca535a16f82e66 2b57b84b3bffa55710fc8bc19b840bb6 fe5929c168deac85b9e663619faeddc9 @@ -204,14 +204,14 @@ e67349a9c15215d1d864ffad74d1357c 494b1499c6b76d4f568c3911b7110582 c059b7a2ce69f0c462977c31d948a46b 9d7c2d3df98fe28c0180dde5be3f5063 -cd4b68bf47d6175f141a55b365c28fff -82bca2d8246df4ffc0dd7c97665d21ea -a063b16385dbeee24b99dad07bb4ae1f +46c0dbad4be399fa6b5b3db33c2f1e2a +8be573b100ba308fc572422a7b880588 +7586bf5525218f46206bc6fe07e84736 abe90a0987ead342d65de75a95d403cb a21430d31412f137c30c174e3be619de -4d0ec48b0bcdc4c5dfeff353c858fbf4 +66069e5d9e1c06777c2e54bbbeae5353 0332b2676cb2e6b9523251439f1b5d0f -87bf38bc8842be3f5ece122da045c82c +561b0a8c63dccf2a3f67e26bc4708979 eae7064dfe1ff0a120049ca2a1983cfe d897c6e15e2c413a7790b715775dc122 6d6e89e0413089cbad5b870ae7ddbee3 @@ -223,15 +223,15 @@ e9c14fbf22b27491de4514b3de1a9bd6 63a461c6e878b1a510f0bb5c58b7ade7 0e466f3d6f7f00b58e8405a95668c83a be72ef5acb43ebe6fbfce3a27ac71664 -2f30888a68a3b17ba6ec31143865181e -19e53c47622be720b08bcb27e8d73290 -1defc546326c98876136b109bfa6f1f9 +ab1ee5d674b490bd4c6df8d6803cedad +18e1bb07199cdeea4b1917f6dd05d423 +c50f345b86fbbb02101b4cb0ee721272 1e82ac18e012e96c58e0098bc9cd2e24 -1c2052d4ada65bb3d5bab4b816dbba1f -e745eeab9b6175d16d002ab9d0f2d5ea -0e08df30bdd6cf91ef40ab8155cb4768 +b04af8c8601498ef1508f471e2cceaf2 +9abf629595fe674159f7240b6e4d652c +19c1f44c123f1bed8e36816f64c873ae e51cac99cdd6841801d6f16d2c2702f0 -f3aafd50ceab3c2acce87cdf451eecca +4085c2870c380281c38dc9a9a340910a 28b0d37b0ce9483597466f49a37ce562 2d5a141a7c85c9b82acb4c16710c36ee 1433cbbb72dabde215e83f1e4faa5cbf @@ -241,8 +241,8 @@ bd3d55991beef2ca5e98ee61215c33da 34d27cb411e654f3c2b69bf536984e77 619f94ec2cfa0276622657810eada472 9a816507533880637936bee8c27b238e -f98862daa7adeddd61eaa61c7ad34d45 -740cac5cd193b77996ba82572e10cde8 +8d88f2789df4b14b66d4d8616415dc9f +7fe523958297c4c99834d8d9c8250d6a 09c19f22d438019835b1f5c0adc0403a b569cef884a2f96deb03c96362d53a01 3401964a9fc0e0772ab6623b37749d8c