From 9ed67565486630a42b8970a808c9c3b6c1d7dbc9 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Sun, 3 Mar 2024 23:03:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=203.1.0=201.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/web/controller/WorkflowBatchController.java    | 1 +
 .../retry/server/web/controller/WorkflowController.java   | 8 ++++----
 .../server/web/controller/WorkflowNodeController.java     | 4 ++++
 frontend/src/views/config/GroupList.vue                   | 2 +-
 frontend/src/views/job/WorkflowList.vue                   | 3 +--
 5 files changed, 11 insertions(+), 7 deletions(-)

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 c09e32d3..167f3b8b 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 a8d6a842..9cad6fda 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<Integer, String> 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 44d649e0..1e4b0161 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 7e964bf0..3c596207 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 }"
     >
       <span slot="groupName" slot-scope="text, record">
         <a href="#" @click="handlerOpenDrawer(record)">{{ text }}</a>
diff --git a/frontend/src/views/job/WorkflowList.vue b/frontend/src/views/job/WorkflowList.vue
index 48eca5ac..325acd68 100644
--- a/frontend/src/views/job/WorkflowList.vue
+++ b/frontend/src/views/job/WorkflowList.vue
@@ -119,7 +119,7 @@
           >
             <a href="javascript:;" v-if="record.workflowStatus === 0">开启</a>
           </a-popconfirm>
-          <a-divider type="vertical" v-if="record.workflowStatus === 0" />
+          <a-divider type="vertical" v-if="record.workflowStatus === 0 && $auth('job.del')" />
           <a-popconfirm
             title="是否删除工作流?"
             ok-text="删除"
@@ -135,7 +135,6 @@
             ok-text="复制"
             cancel-text="取消"
             @confirm="handleCopy(record)"
-            v-if="$auth('job.del')"
           >
             <a href="javascript:;">复制</a>
           </a-popconfirm>