diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowBatchController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowBatchController.java index c09e32d37..167f3b8bf 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowBatchController.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowBatchController.java @@ -35,6 +35,7 @@ public class WorkflowBatchController { } @PostMapping("/stop/{id}") + @LoginRequired public Boolean stop(@PathVariable("id") Long id) { return workflowBatchService.stop(id); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowController.java index a8d6a842c..9cad6fda5 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowController.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowController.java @@ -31,7 +31,7 @@ public class WorkflowController { private final WorkflowService workflowService; @PostMapping - @LoginRequired(role = RoleEnum.ADMIN) + @LoginRequired(role = RoleEnum.USER) public Boolean saveWorkflow(@RequestBody @Validated WorkflowRequestVO workflowRequestVO) { return workflowService.saveWorkflow(workflowRequestVO); } @@ -43,7 +43,7 @@ public class WorkflowController { } @PutMapping - @LoginRequired(role = RoleEnum.ADMIN) + @LoginRequired(role = RoleEnum.USER) public Boolean updateWorkflow(@RequestBody @Validated WorkflowRequestVO workflowRequestVO) { return workflowService.updateWorkflow(workflowRequestVO); } @@ -55,7 +55,7 @@ public class WorkflowController { } @PutMapping("/update/status/{id}") - @LoginRequired(role = RoleEnum.ADMIN) + @LoginRequired(role = RoleEnum.USER) public Boolean updateStatus(@PathVariable("id") Long id) { return workflowService.updateStatus(id); } @@ -81,7 +81,7 @@ public class WorkflowController { } @PostMapping("/check-node-expression") - @LoginRequired(role = RoleEnum.ADMIN) + @LoginRequired(role = RoleEnum.USER) public Pair checkNodeExpression(@RequestBody DecisionConfig decisionConfig) { return workflowService.checkNodeExpression(decisionConfig); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowNodeController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowNodeController.java index 44d649e03..1e4b01612 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowNodeController.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/WorkflowNodeController.java @@ -1,5 +1,7 @@ package com.aizuda.easy.retry.server.web.controller; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.annotation.RoleEnum; import com.aizuda.easy.retry.server.web.service.WorkflowNodeService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PathVariable; @@ -19,12 +21,14 @@ public class WorkflowNodeController { private final WorkflowNodeService workflowNodeService; @PostMapping("/stop/{nodeId}/{workflowTaskBatchId}") + @LoginRequired(role = RoleEnum.USER) public Boolean stop(@PathVariable("nodeId") Long nodeId, @PathVariable("workflowTaskBatchId") Long workflowTaskBatchId) { return workflowNodeService.stop(nodeId, workflowTaskBatchId); } @PostMapping("/retry/{nodeId}/{workflowTaskBatchId}") + @LoginRequired(role = RoleEnum.USER) public Boolean retry(@PathVariable("nodeId") Long nodeId, @PathVariable("workflowTaskBatchId") Long workflowTaskBatchId) { return workflowNodeService.retry(nodeId, workflowTaskBatchId); diff --git a/frontend/src/views/config/GroupList.vue b/frontend/src/views/config/GroupList.vue index 7e964bf03..3c596207e 100644 --- a/frontend/src/views/config/GroupList.vue +++ b/frontend/src/views/config/GroupList.vue @@ -37,7 +37,7 @@ :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" - :scroll="{ x: 1800 }" + :scroll="{ x: 2000 }" > {{ text }} diff --git a/frontend/src/views/job/WorkflowList.vue b/frontend/src/views/job/WorkflowList.vue index 48eca5acd..325acd687 100644 --- a/frontend/src/views/job/WorkflowList.vue +++ b/frontend/src/views/job/WorkflowList.vue @@ -119,7 +119,7 @@ > 开启 - + 复制