mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jenkins-engin' into jenkins-engin

Browse Source
This commit is contained in:
唐潇凯 2025-06-05 11:01:56 +08:00
commit 56150c156b
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineEnvController.java
View File

@ -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;

3
modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineInfoController.java
View File

@ -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;

2
modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/MachineProxyController.java
View File

@ -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;
/**

18
modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java
View File

@ -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<Boolean> add(@RequestBody SecretKeyDto secretKeyDto) throws Exception {
return success(secretKeyService.addSecretKey(secretKeyDto));
}
@PutMapping("/bindingMachine")
@Operation(summary ="绑定机器")
@Operation(summary = "绑定机器")
public CommonResult<Boolean> bindingMachine(@RequestParam("secretKeyId") Long secretKeyId, @RequestParam("machineIds") List<Long> machineIds) {
secretKeyService.bindingMachine(secretKeyId, machineIds);
return success(true);
}
@PutMapping("/update")
@Operation(summary ="编辑密钥信息")
@Operation(summary = "编辑密钥信息")
public CommonResult<Boolean> update(@RequestBody SecretKeyDto secretKeyDto) {
return success(secretKeyService.updateSecretKey(secretKeyDto));
}
@DeleteMapping("/deleteList")
@Operation(summary ="批量删除密钥")
@Operation(summary = "批量删除密钥")
public CommonResult<Boolean> deleteList(@RequestParam("secretKeyId") List<Long> secretKeyIds) {
return success(secretKeyService.deleteList(secretKeyIds));
}
@GetMapping("/list")
@Operation(summary ="获取密钥信息列表")
@PostMapping("/list")
@Operation(summary = "获取密钥信息列表")
public CommonResult<PageResult<SecretKey>> list(@RequestBody SecretKeyDto secretKeyDto) {
return success(secretKeyService.listSecretKey(secretKeyDto));
}