test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 取消调试注释

This commit is contained in:
chenjianxing 2020-12-25 11:28:16 +08:00
parent a09c4e3b04
commit 0f5da509cf
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/metersphere/controller/ProjectController.java
View File

@ -16,7 +16,6 @@ import org.apache.shiro.authz.annotation.RequiresRoles;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
@ -29,20 +28,18 @@ public class ProjectController {
@GetMapping("/listAll")
public List<ProjectDTO> listAll() {
// String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId();
// ProjectRequest request = new ProjectRequest();
// request.setWorkspaceId(currentWorkspaceId);
// return projectService.getProjectList(request);
return new ArrayList<>();
String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId();
ProjectRequest request = new ProjectRequest();
request.setWorkspaceId(currentWorkspaceId);
return projectService.getProjectList(request);
}
/*jenkins项目列表*/
@GetMapping("/listAll/{workspaceId}")
public List<ProjectDTO> jlistAll(@PathVariable String workspaceId) {
// ProjectRequest request = new ProjectRequest();
// request.setWorkspaceId(workspaceId);
// return projectService.getProjectList(request);
return new ArrayList<>();
ProjectRequest request = new ProjectRequest();
request.setWorkspaceId(workspaceId);
return projectService.getProjectList(request);
}
@GetMapping("/recent/{count}")