From 7cd43960018e83e2a27ae5240e14c034cbca7118 Mon Sep 17 00:00:00 2001 From: zyj <2660555181@qq.com> Date: Wed, 4 Jun 2025 17:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MachineEnvController.java | 3 --- .../controller/MachineInfoController.java | 3 --- .../controller/MachineProxyController.java | 2 -- .../controller/SecretKeyController.java | 18 ++++++++---------- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java index 0a60b328..86e52621 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java @@ -1,6 +1,5 @@ package cd.casic.module.machine.controller; - import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.service.MachineEnvService; import cd.casic.module.machine.dto.MachineEnvDTO; @@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - import static cd.casic.framework.commons.pojo.CommonResult.success; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java index a77e1025..e5bf69f5 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java @@ -1,19 +1,16 @@ package cd.casic.module.machine.controller; - import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.MachineInfo; import cd.casic.module.machine.enums.ConnectionStatus; import cd.casic.module.machine.service.MachineInfoService; import cd.casic.module.machine.dto.MachineInfoDto; - import cd.casic.module.machine.utils.PageResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Map; import static cd.casic.framework.commons.pojo.CommonResult.success; diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java index fa573046..238c4bc2 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java @@ -10,8 +10,6 @@ import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - import static cd.casic.framework.commons.pojo.CommonResult.success; /** diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java index 32f5f061..e9027d3b 100644 --- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java +++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java @@ -1,4 +1,5 @@ package cd.casic.module.machine.controller; + import cd.casic.framework.commons.pojo.CommonResult; import cd.casic.module.machine.entity.SecretKey; import cd.casic.module.machine.service.SecretKeyService; @@ -17,41 +18,38 @@ import static cd.casic.framework.commons.pojo.CommonResult.success; @RestController @RequestMapping("/api/secretKey") -@Tag(name = "密钥管理") +@Tag(name = "密钥管理") public class SecretKeyController { @Resource private SecretKeyService secretKeyService; @PostMapping(value = "/add") - @Operation(summary ="新增密钥") + @Operation(summary = "新增密钥") public CommonResult add(@RequestBody SecretKeyDto secretKeyDto) throws Exception { return success(secretKeyService.addSecretKey(secretKeyDto)); } @PutMapping("/bindingMachine") - @Operation(summary ="绑定机器") + @Operation(summary = "绑定机器") public CommonResult bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List machineIds) { secretKeyService.bindingMachine(secretKeyId, machineIds); return success(true); } @PutMapping("/update") - @Operation(summary ="编辑密钥信息") + @Operation(summary = "编辑密钥信息") public CommonResult update(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.updateSecretKey(secretKeyDto)); } - - - @DeleteMapping("/deleteList") - @Operation(summary ="批量删除密钥") + @Operation(summary = "批量删除密钥") public CommonResult deleteList(@RequestParam("secretKeyId") List secretKeyIds) { return success(secretKeyService.deleteList(secretKeyIds)); } - @GetMapping("/list") - @Operation(summary ="获取密钥信息列表") + @PostMapping("/list") + @Operation(summary = "获取密钥信息列表") public CommonResult> list(@RequestBody SecretKeyDto secretKeyDto) { return success(secretKeyService.listSecretKey(secretKeyDto)); }