Merge remote-tracking branch 'origin/temp' into temp
# Conflicts: # ops-server/src/main/java/cd/casic/server/controller/PipelineController.java
This commit is contained in:
commit
429e920829
@ -28,7 +28,6 @@ import java.util.List;
|
|||||||
@RequestMapping("/pipeline")
|
@RequestMapping("/pipeline")
|
||||||
public class PipelineController {
|
public class PipelineController {
|
||||||
|
|
||||||
@PermitAll
|
|
||||||
@PostMapping(path="/createPipeline")
|
@PostMapping(path="/createPipeline")
|
||||||
public CommonResult<String> createPipeline(@RequestBody @NotNull @Valid PipelineReq pipelineReq){
|
public CommonResult<String> createPipeline(@RequestBody @NotNull @Valid PipelineReq pipelineReq){
|
||||||
|
|
||||||
@ -39,17 +38,12 @@ public class PipelineController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PermitAll
|
|
||||||
@PostMapping(path="/findAllPipeline")
|
@PostMapping(path="/findAllPipeline")
|
||||||
public CommonResult<List<PipelineResp>> findAllPipeline(){
|
public CommonResult<List<PipelineResp>> findAllPipeline(){
|
||||||
|
|
||||||
// List<PipelineResp> selectAllPipeline = pipelineService.findAllPipeline();
|
// List<PipelineResp> selectAllPipeline = pipelineService.findAllPipeline();
|
||||||
|
|
||||||
List<PipelineResp> selectAllPipeline = new ArrayList<>(0);
|
List<PipelineResp> selectAllPipeline = new ArrayList<>(0);
|
||||||
PipelineResp pipeline = new PipelineResp();
|
|
||||||
pipeline.setId("1");
|
|
||||||
pipeline.setName("test数据交互测试");
|
|
||||||
selectAllPipeline.add(pipeline);
|
|
||||||
return CommonResult.success(selectAllPipeline);
|
return CommonResult.success(selectAllPipeline);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user