From d6c97e7df0a546d113afb747293c47e98c504546 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Mon, 27 Dec 2021 11:47:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=20--bug=3D1009131=20--user=3D=E9=99=88=E5=BB=BA?= =?UTF-8?q?=E6=98=9F=20=E3=80=90=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E3=80=91=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=B2=A1=E6=9C=89=E9=99=90=E5=88=B6=E4=BD=8F?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E5=8F=AF=E8=B7=B3=E8=BD=AC=E8=BF=9B=E5=8E=BB=20https://www.tap?= =?UTF-8?q?d.cn/55049933/s/10870877?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../track/controller/IssuesController.java | 12 +++++++++++- .../track/controller/TestCaseReviewController.java | 4 ++++ .../track/controller/TestPlanController.java | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java index 6c0c7e095a..84744b8f88 100644 --- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java +++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java @@ -7,6 +7,7 @@ import io.metersphere.base.domain.IssuesDao; import io.metersphere.base.domain.IssuesWithBLOBs; import io.metersphere.commons.constants.NoticeConstants; import io.metersphere.commons.constants.OperLogConstants; +import io.metersphere.commons.constants.PermissionConstants; import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.dto.IssueTemplateDao; @@ -18,6 +19,7 @@ import io.metersphere.track.request.testcase.AuthUserIssueRequest; import io.metersphere.track.request.testcase.IssuesRequest; import io.metersphere.track.request.testcase.IssuesUpdateRequest; import io.metersphere.track.service.IssuesService; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,18 +33,21 @@ public class IssuesController { private IssuesService issuesService; @PostMapping("/list/{goPage}/{pageSize}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ) public Pager> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody IssuesRequest request) { Page> page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, issuesService.list(request)); } @PostMapping("/list/relate/{goPage}/{pageSize}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ) public Pager> relateList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody IssuesRequest request) { Page> page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, issuesService.relateList(request)); } @PostMapping("/add") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_CREATE) @MsAuditLog(module = "track_bug", type = OperLogConstants.CREATE, content = "#msClass.getLogDetails(#issuesRequest)", msClass = IssuesService.class) @SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, target = "#issuesRequest", event = NoticeConstants.Event.CREATE, mailTemplate = "track/IssuesCreate", subject = "缺陷通知") @@ -51,6 +56,7 @@ public class IssuesController { } @PostMapping("/update") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_EDIT) @MsAuditLog(module = "track_bug", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#issuesRequest.id)", content = "#msClass.getLogDetails(#issuesRequest.id)", msClass = IssuesService.class) @SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, target = "#issuesRequest", event = NoticeConstants.Event.UPDATE, mailTemplate = "track/IssuesUpdate", subject = "缺陷通知") @@ -59,17 +65,20 @@ public class IssuesController { } @GetMapping("/get/case/{id}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ) public List getIssues(@PathVariable String id) { return issuesService.getIssues(id); } @GetMapping("/get/{id}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ) public IssuesWithBLOBs getIssue(@PathVariable String id) { return issuesService.getIssue(id); } @GetMapping("/plan/get/{planId}") - public List getIssuesByPlanoId(@PathVariable String planId) { + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ) + public List getIssuesByPlanId(@PathVariable String planId) { return issuesService.getIssuesByPlanoId(planId); } @@ -89,6 +98,7 @@ public class IssuesController { } @PostMapping("/delete") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_DELETE) @MsAuditLog(module = "track_bug", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#request.id)", msClass = IssuesService.class) public void deleteIssue(@RequestBody IssuesRequest request) { issuesService.deleteIssue(request); diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java index dba9901a49..0709940b57 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java @@ -44,6 +44,7 @@ public class TestCaseReviewController { private TestCaseCommentService testCaseCommentService; @PostMapping("/list/{goPage}/{pageSize}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ) public Pager> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryCaseReviewRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, testCaseReviewService.listCaseReview(request)); @@ -59,6 +60,7 @@ public class TestCaseReviewController { } @PostMapping("/project") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ) public List getProjectByReviewId(@RequestBody TestCaseReview request) { return testCaseReviewService.getProjectByReviewId(request); } @@ -99,6 +101,7 @@ public class TestCaseReviewController { } @PostMapping("/list/all") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ) public List listAll() { return testCaseReviewService.listCaseReviewAll(); } @@ -126,6 +129,7 @@ public class TestCaseReviewController { @GetMapping("/get/{reviewId}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ) public TestCaseReview getTestReview(@PathVariable String reviewId) { checkPermissionService.checkTestReviewOwner(reviewId); return testCaseReviewService.getTestReview(reviewId); diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java index a6b0db84de..2cf5e48f5c 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java @@ -71,6 +71,7 @@ public class TestPlanController { } @PostMapping("/list/all") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_PLAN_READ) public List listAll(@RequestBody QueryTestPlanRequest request) { return testPlanService.listTestAllPlan(request); } @@ -87,6 +88,7 @@ public class TestPlanController { } @PostMapping("/get/{testPlanId}") + @RequiresPermissions(PermissionConstants.PROJECT_TRACK_PLAN_READ) public TestPlan getTestPlan(@PathVariable String testPlanId) { checkPermissionService.checkTestPlanOwner(testPlanId); return testPlanService.getTestPlan(testPlanId);