From 913273431ad1e7986b2b5403326ce4d214d0fae0 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 11:50:42 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat(worker):=20=E5=A2=9E=E5=8A=A0=20Worker?=
 =?UTF-8?q?=20=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 Worker 实体中添加 online 和 offline 方法，用于更新 Worker 状态
- 在 WorkerController 中添加在线和离线通知接口
- 在 WorkerInternalApplication 中实现在线和离线状态更新逻辑
- 修改 join 接口描述，更准确地反映其功能
---
 .../api/controller/WorkerController.java      | 21 ++++++++++++++++++-
 .../internal/WorkerInternalApplication.java   | 16 ++++++++++++++
 .../dev/jianmu/worker/aggregate/Worker.java   |  8 +++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
index 15a09185c..6824543cb 100644
--- a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
+++ b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
@@ -71,7 +71,7 @@ public class WorkerController {
     }
 
     @PutMapping("{workerId}/join")
-    @Operation(summary = "连接Server接口", description = "连接Server接口")
+    @Operation(summary = "Worker注册接口", description = "Worker注册接口")
     @Parameters({
             @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
     })
@@ -79,6 +79,25 @@ public class WorkerController {
         this.workerApplication.join(workerId, dto.getType(), dto.getName(), dto.getTag());
     }
 
+    @PutMapping("{workerId}/online")
+    @Operation(summary = "通知Worker已经Online", description = "通知Worker已经Online")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void online(@PathVariable("workerId") String workerId) {
+        this.workerApplication.online(workerId);
+    }
+
+    @PutMapping("{workerId}/offline")
+    @Operation(summary = "通知Worker已经Offline", description = "通知Worker已经Offline")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void offline(@PathVariable("workerId") String workerId) {
+        this.workerApplication.offline(workerId);
+    }
+
+
     @GetMapping("{workerId}/ping")
     @Operation(summary = "ping Server接口", description = "ping Server接口")
     @Parameters({
diff --git a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
index aa20f7cf6..952ae7ffd 100644
--- a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
+++ b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
@@ -153,6 +153,22 @@ public class WorkerInternalApplication {
                 .build());
     }
 
+    @Transactional
+    public void online(String workerId) {
+        var worker = this.workerRepository.findById(workerId)
+                .orElseThrow(() -> new RuntimeException("未找到Worker"));
+        worker.online();
+        this.workerRepository.updateStatus(worker);
+    }
+
+    @Transactional
+    public void offline(String workerId) {
+        var worker = this.workerRepository.findById(workerId)
+                .orElseThrow(() -> new RuntimeException("未找到Worker"));
+        worker.offline();
+        this.workerRepository.updateStatus(worker);
+    }
+
     @Transactional
     public void dispatchTask(TaskInstanceCreatedEvent event) {
         var taskInstance = this.taskInstanceRepository.findById(event.getTaskInstanceId())
diff --git a/worker-core/src/main/java/dev/jianmu/worker/aggregate/Worker.java b/worker-core/src/main/java/dev/jianmu/worker/aggregate/Worker.java
index ba05e9a7b..ab2121ee1 100644
--- a/worker-core/src/main/java/dev/jianmu/worker/aggregate/Worker.java
+++ b/worker-core/src/main/java/dev/jianmu/worker/aggregate/Worker.java
@@ -31,6 +31,14 @@ public class Worker {
     private Status status;
     private final LocalDateTime createdTime = LocalDateTime.now();
 
+    public void online() {
+        this.status = Status.ONLINE;
+    }
+
+    public void offline() {
+        this.status = Status.OFFLINE;
+    }
+
     public String getId() {
         return id;
     }
-- 
Gitee


From 134901138d3e304f16b1f181e30ad52a2633d2d7 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 12:40:25 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat(api):=20=E6=B7=BB=E5=8A=A0=20Worker=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ViewController 中新增 findWorkerList 方法，用于查询 Worker 列表
- 创建 WorkerApplication 类，提供 Worker 相关的业务逻辑
- 在 WorkerRepository 和 WorkerMapper 中添加 findAll 方法，用于获取所有 Worker
- 创建 WorkerVo 类，作为 Worker 的视图模型
---
 .../jianmu/api/controller/ViewController.java | 24 +++++++++++++++++-
 .../main/java/dev/jianmu/api/vo/WorkerVo.java | 25 +++++++++++++++++++
 .../service/WorkerApplication.java            | 22 ++++++++++++++++
 .../mapper/task/WorkerMapper.java             |  5 ++++
 .../mybatis/task/WorkerRepositoryImpl.java    |  5 ++++
 .../worker/repository/WorkerRepository.java   |  2 ++
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
 create mode 100644 application/src/main/java/dev/jianmu/application/service/WorkerApplication.java

diff --git a/api/src/main/java/dev/jianmu/api/controller/ViewController.java b/api/src/main/java/dev/jianmu/api/controller/ViewController.java
index 0ee52f3e1..456f7a2c1 100644
--- a/api/src/main/java/dev/jianmu/api/controller/ViewController.java
+++ b/api/src/main/java/dev/jianmu/api/controller/ViewController.java
@@ -7,6 +7,7 @@ import dev.jianmu.api.vo.*;
 import dev.jianmu.application.dsl.DslParser;
 import dev.jianmu.application.exception.DataNotFoundException;
 import dev.jianmu.application.service.*;
+import dev.jianmu.application.service.internal.WorkerInternalApplication;
 import dev.jianmu.application.service.internal.WorkflowInternalApplication;
 import dev.jianmu.infrastructure.storage.StorageService;
 import dev.jianmu.infrastructure.storage.vo.LogVo;
@@ -16,6 +17,7 @@ import dev.jianmu.secret.aggregate.Namespace;
 import dev.jianmu.task.aggregate.InstanceParameter;
 import dev.jianmu.task.aggregate.Volume;
 import dev.jianmu.trigger.event.TriggerEvent;
+import dev.jianmu.worker.aggregate.Worker;
 import dev.jianmu.workflow.aggregate.definition.Workflow;
 import dev.jianmu.workflow.aggregate.parameter.Parameter;
 import dev.jianmu.workflow.aggregate.process.ProcessStatus;
@@ -59,6 +61,7 @@ public class ViewController {
     private final ProjectGroupApplication projectGroupApplication;
     private final CacheApplication cacheApplication;
     private final WorkflowInternalApplication workflowInternalApplication;
+    private final WorkerApplication workerApplication;
 
     public ViewController(
             ProjectApplication projectApplication,
@@ -72,7 +75,8 @@ public class ViewController {
             StorageService storageService,
             ProjectGroupApplication projectGroupApplication,
             CacheApplication cacheApplication,
-            WorkflowInternalApplication workflowInternalApplication
+            WorkflowInternalApplication workflowInternalApplication,
+            WorkerApplication workerApplication
     ) {
         this.projectApplication = projectApplication;
         this.triggerApplication = triggerApplication;
@@ -86,6 +90,7 @@ public class ViewController {
         this.projectGroupApplication = projectGroupApplication;
         this.cacheApplication = cacheApplication;
         this.workflowInternalApplication = workflowInternalApplication;
+        this.workerApplication = workerApplication;
     }
 
     @GetMapping("/parameters/types")
@@ -632,4 +637,21 @@ public class ViewController {
                 .isDefaultGroup(DEFAULT_PROJECT_GROUP_NAME.equals(projectGroup.getName()))
                 .build();
     }
+
+    @GetMapping("/workers")
+    @Operation(summary = "查询Worker列表", description = "查询Worker列表")
+    public List<WorkerVo> findWorkerList() {
+        var workers = this.workerApplication.findAll();
+        return workers.stream().map(worker -> WorkerVo.builder()
+                        .id(worker.getId())
+                        .name(worker.getName())
+                        .type(worker.getType())
+                        .tags(worker.getTags())
+                        .os(worker.getOs())
+                        .arch(worker.getArch())
+                        .capacity(worker.getCapacity())
+                        .createdTime(worker.getCreatedTime())
+                        .build())
+                .collect(Collectors.toList());
+    }
 }
diff --git a/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java b/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
new file mode 100644
index 000000000..e5b979330
--- /dev/null
+++ b/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
@@ -0,0 +1,25 @@
+package dev.jianmu.api.vo;
+
+import dev.jianmu.worker.aggregate.Worker;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "Worker定义VO")
+public class WorkerVo {
+    private String id;
+    private String name;
+    private String tags;
+    private Integer capacity;
+    private String os;
+    private String arch;
+    private Worker.Type type;
+    private Worker.Status status;
+    private LocalDateTime createdTime;
+}
diff --git a/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java b/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java
new file mode 100644
index 000000000..985ec9bdd
--- /dev/null
+++ b/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java
@@ -0,0 +1,22 @@
+package dev.jianmu.application.service;
+
+import dev.jianmu.worker.aggregate.Worker;
+import dev.jianmu.worker.repository.WorkerRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class WorkerApplication {
+    private final WorkerRepository workerRepository;
+
+    public WorkerApplication(WorkerRepository workerRepository) {
+        this.workerRepository = workerRepository;
+    }
+
+    public List<Worker> findAll() {
+        return this.workerRepository.findAll();
+    }
+}
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
index eca0c2817..df9a82878 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
@@ -27,6 +27,10 @@ public interface WorkerMapper {
     @Update("update worker set tags = #{tags} where id = #{id}")
     void updateTag(Worker worker);
 
+    @Select("select * from worker")
+    @Result(column = "created_time", property = "createdTime")
+    List<Worker> findAll();
+
     @Select("select * from worker where id = #{workerId}")
     @Result(column = "created_time", property = "createdTime")
     Optional<Worker> findById(String workerId);
@@ -41,6 +45,7 @@ public interface WorkerMapper {
             "</script>")
     @Result(column = "created_time", property = "createdTime")
     List<Worker> findByTypeInAndCreatedTimeLessThan(@Param("types") List<Worker.Type> types, @Param("createdTime") LocalDateTime createdTime);
+
     @Select("<script> " +
             "select * from worker" +
             "<where>" +
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
index 144428ce5..ebaa13e03 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
@@ -43,6 +43,11 @@ public class WorkerRepositoryImpl implements WorkerRepository {
         this.workerMapper.updateTag(worker);
     }
 
+    @Override
+    public List<Worker> findAll() {
+        return this.workerMapper.findAll();
+    }
+
     @Override
     public Optional<Worker> findById(String workerId) {
         return this.workerMapper.findById(workerId);
diff --git a/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java b/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
index 2a84cf2e3..952fa1dd1 100644
--- a/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
+++ b/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
@@ -21,6 +21,8 @@ public interface WorkerRepository {
 
     void updateTag(Worker worker);
 
+    List<Worker> findAll();
+
     Optional<Worker> findById(String workerId);
 
     Worker findByType(Worker.Type type);
-- 
Gitee


From e3c2d6fb646689531ba7756d0b770bcb25ea6cc1 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 18:42:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20WorkerVo=E6=9C=AA=E5=8A=A0@Data?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/src/main/java/dev/jianmu/api/vo/WorkerVo.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java b/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
index e5b979330..760849b0c 100644
--- a/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
+++ b/api/src/main/java/dev/jianmu/api/vo/WorkerVo.java
@@ -4,11 +4,13 @@ import dev.jianmu.worker.aggregate.Worker;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
 @Builder
+@Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description = "Worker定义VO")
-- 
Gitee


From 0a802c6f8192e4d9e305b5c69785ed0ed82d06b1 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 23:48:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?refactor(worker):=20=E9=87=8D=E6=9E=84Worke?=
 =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新 WorkerJoiningDto，增加 capacity、os 和 arch 字段
---
 .../api/controller/WorkerController.java      | 10 +++++++-
 .../dev/jianmu/api/dto/WorkerJoiningDto.java  |  6 +++++
 .../internal/WorkerInternalApplication.java   | 23 +++++++------------
 .../mapper/task/WorkerMapper.java             |  4 ++--
 .../mybatis/task/WorkerRepositoryImpl.java    |  4 ++--
 .../worker/repository/WorkerRepository.java   |  2 +-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
index 6824543cb..01d2a08d1 100644
--- a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
+++ b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
@@ -76,7 +76,15 @@ public class WorkerController {
             @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
     })
     public void join(@PathVariable("workerId") String workerId, @RequestBody @Valid WorkerJoiningDto dto) {
-        this.workerApplication.join(workerId, dto.getType(), dto.getName(), dto.getTag());
+        var worker = Worker.Builder.aWorker()
+                .id(workerId)
+                .name(dto.getName())
+                .type(dto.getType())
+                .os(dto.getOs())
+                .arch(dto.getArch())
+                .capacity(dto.getCapacity())
+                .build();
+        this.workerApplication.join(worker);
     }
 
     @PutMapping("{workerId}/online")
diff --git a/api/src/main/java/dev/jianmu/api/dto/WorkerJoiningDto.java b/api/src/main/java/dev/jianmu/api/dto/WorkerJoiningDto.java
index 25c138e4c..35316fda2 100644
--- a/api/src/main/java/dev/jianmu/api/dto/WorkerJoiningDto.java
+++ b/api/src/main/java/dev/jianmu/api/dto/WorkerJoiningDto.java
@@ -25,4 +25,10 @@ public class WorkerJoiningDto {
     private String name;
     @Schema(required = true, description = "tag")
     private String tag;
+    @Schema(description = "capacity")
+    private Integer capacity;
+    @Schema(description = "os")
+    private String os;
+    @Schema(description = "arch")
+    private String arch;
 }
diff --git a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
index 952ae7ffd..e7faa0df7 100644
--- a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
+++ b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java
@@ -136,21 +136,14 @@ public class WorkerInternalApplication {
     }
 
     @Transactional
-    public void join(String workerId, Worker.Type type, String name, String tag) {
-        if (this.workerRepository.findById(workerId).isPresent()) {
-            this.workerRepository.updateTag(Worker.Builder.aWorker()
-                    .id(workerId)
-                    .tags(tag)
-                    .build());
-            return;
-        }
-        this.workerRepository.add(Worker.Builder.aWorker()
-                .id(workerId)
-                .name(name)
-                .type(type)
-                .tags(tag)
-                .status(Worker.Status.ONLINE)
-                .build());
+    public void join(Worker worker) {
+        this.workerRepository.findById(worker.getId()).ifPresentOrElse(
+                w -> this.workerRepository.updateInfo(worker),
+                () -> {
+                    worker.online();
+                    this.workerRepository.add(worker);
+                }
+        );
     }
 
     @Transactional
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
index df9a82878..1decbacb9 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/WorkerMapper.java
@@ -24,8 +24,8 @@ public interface WorkerMapper {
     @Update("update worker set status = #{status} where id = #{id}")
     void updateStatus(Worker worker);
 
-    @Update("update worker set tags = #{tags} where id = #{id}")
-    void updateTag(Worker worker);
+    @Update("update worker set name = #{name}, tags = #{tags}, capacity = #{capacity}, os = #{os}, arch = #{arch} where id = #{id}")
+    void updateInfo(Worker worker);
 
     @Select("select * from worker")
     @Result(column = "created_time", property = "createdTime")
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
index ebaa13e03..db267d3fe 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/WorkerRepositoryImpl.java
@@ -39,8 +39,8 @@ public class WorkerRepositoryImpl implements WorkerRepository {
     }
 
     @Override
-    public void updateTag(Worker worker) {
-        this.workerMapper.updateTag(worker);
+    public void updateInfo(Worker worker) {
+        this.workerMapper.updateInfo(worker);
     }
 
     @Override
diff --git a/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java b/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
index 952fa1dd1..adc65ec9a 100644
--- a/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
+++ b/worker-core/src/main/java/dev/jianmu/worker/repository/WorkerRepository.java
@@ -19,7 +19,7 @@ public interface WorkerRepository {
 
     void updateStatus(Worker worker);
 
-    void updateTag(Worker worker);
+    void updateInfo(Worker worker);
 
     List<Worker> findAll();
 
-- 
Gitee


From cccdb0d475fb5eed5bf2cca4b51f699bb9cdaaa4 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sun, 17 Nov 2024 15:17:30 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat(worker):=20=E6=B7=BB=E5=8A=A0=20Worker?=
 =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianmu/api/controller/ViewController.java |  22 +-
 .../dev/jianmu/api/controller/WorkerApi.java  | 337 +++++++++++++++++
 .../api/controller/WorkerController.java      | 350 ++----------------
 .../service/WorkerApplication.java            |  14 +-
 .../mapper/task/TaskInstanceMapper.java       |  18 +
 .../task/TaskInstanceRepositoryImpl.java      |  10 +
 .../repository/TaskInstanceRepository.java    |   4 +
 7 files changed, 413 insertions(+), 342 deletions(-)
 create mode 100644 api/src/main/java/dev/jianmu/api/controller/WorkerApi.java

diff --git a/api/src/main/java/dev/jianmu/api/controller/ViewController.java b/api/src/main/java/dev/jianmu/api/controller/ViewController.java
index 456f7a2c1..977292ef4 100644
--- a/api/src/main/java/dev/jianmu/api/controller/ViewController.java
+++ b/api/src/main/java/dev/jianmu/api/controller/ViewController.java
@@ -61,7 +61,6 @@ public class ViewController {
     private final ProjectGroupApplication projectGroupApplication;
     private final CacheApplication cacheApplication;
     private final WorkflowInternalApplication workflowInternalApplication;
-    private final WorkerApplication workerApplication;
 
     public ViewController(
             ProjectApplication projectApplication,
@@ -75,8 +74,7 @@ public class ViewController {
             StorageService storageService,
             ProjectGroupApplication projectGroupApplication,
             CacheApplication cacheApplication,
-            WorkflowInternalApplication workflowInternalApplication,
-            WorkerApplication workerApplication
+            WorkflowInternalApplication workflowInternalApplication
     ) {
         this.projectApplication = projectApplication;
         this.triggerApplication = triggerApplication;
@@ -90,7 +88,6 @@ public class ViewController {
         this.projectGroupApplication = projectGroupApplication;
         this.cacheApplication = cacheApplication;
         this.workflowInternalApplication = workflowInternalApplication;
-        this.workerApplication = workerApplication;
     }
 
     @GetMapping("/parameters/types")
@@ -637,21 +634,4 @@ public class ViewController {
                 .isDefaultGroup(DEFAULT_PROJECT_GROUP_NAME.equals(projectGroup.getName()))
                 .build();
     }
-
-    @GetMapping("/workers")
-    @Operation(summary = "查询Worker列表", description = "查询Worker列表")
-    public List<WorkerVo> findWorkerList() {
-        var workers = this.workerApplication.findAll();
-        return workers.stream().map(worker -> WorkerVo.builder()
-                        .id(worker.getId())
-                        .name(worker.getName())
-                        .type(worker.getType())
-                        .tags(worker.getTags())
-                        .os(worker.getOs())
-                        .arch(worker.getArch())
-                        .capacity(worker.getCapacity())
-                        .createdTime(worker.getCreatedTime())
-                        .build())
-                .collect(Collectors.toList());
-    }
 }
diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java
new file mode 100644
index 000000000..0d1b22cb6
--- /dev/null
+++ b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java
@@ -0,0 +1,337 @@
+package dev.jianmu.api.controller;
+
+import dev.jianmu.api.dto.*;
+import dev.jianmu.api.vo.Auth;
+import dev.jianmu.api.vo.VolumeVo;
+import dev.jianmu.api.vo.WorkerTaskVo;
+import dev.jianmu.application.query.NodeDefApi;
+import dev.jianmu.application.service.TaskInstanceApplication;
+import dev.jianmu.application.service.internal.WorkerInternalApplication;
+import dev.jianmu.infrastructure.GlobalProperties;
+import dev.jianmu.infrastructure.storage.StorageService;
+import dev.jianmu.infrastructure.worker.DeferredResultService;
+import dev.jianmu.infrastructure.worker.unit.Unit;
+import dev.jianmu.task.aggregate.InstanceStatus;
+import dev.jianmu.worker.aggregate.Worker;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.dao.CannotAcquireLockException;
+import org.springframework.dao.DeadlockLoserDataAccessException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
+
+import java.io.IOException;
+
+/**
+ * @author Ethan Liu
+ * @class WorkerController
+ * @description Worker API
+ * @create 2021-04-21 14:40
+ */
+@RestController
+@RequestMapping("workers")
+@Tag(name = "Worker API", description = "为Worker提供的API")
+public class WorkerApi {
+    private final WorkerInternalApplication workerApplication;
+    private final DeferredResultService deferredResultService;
+    private final NodeDefApi nodeDefApi;
+    private final StorageService storageService;
+    private final TaskInstanceApplication taskInstanceApplication;
+    private final GlobalProperties globalProperties;
+
+    public WorkerApi(WorkerInternalApplication workerApplication,
+                     DeferredResultService deferredResultService,
+                     NodeDefApi nodeDefApi,
+                     StorageService storageService,
+                     TaskInstanceApplication taskInstanceApplication,
+                     GlobalProperties globalProperties
+    ) {
+        this.workerApplication = workerApplication;
+        this.deferredResultService = deferredResultService;
+        this.nodeDefApi = nodeDefApi;
+        this.storageService = storageService;
+        this.taskInstanceApplication = taskInstanceApplication;
+        this.globalProperties = globalProperties;
+    }
+
+    @PutMapping("{workerId}/join")
+    @Operation(summary = "Worker注册接口", description = "Worker注册接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void join(@PathVariable("workerId") String workerId, @RequestBody @Valid WorkerJoiningDto dto) {
+        var worker = Worker.Builder.aWorker()
+                .id(workerId)
+                .name(dto.getName())
+                .type(dto.getType())
+                .os(dto.getOs())
+                .arch(dto.getArch())
+                .capacity(dto.getCapacity())
+                .build();
+        this.workerApplication.join(worker);
+    }
+
+    @PutMapping("{workerId}/online")
+    @Operation(summary = "通知Worker已经Online", description = "通知Worker已经Online")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void online(@PathVariable("workerId") String workerId) {
+        this.workerApplication.online(workerId);
+    }
+
+    @PutMapping("{workerId}/offline")
+    @Operation(summary = "通知Worker已经Offline", description = "通知Worker已经Offline")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void offline(@PathVariable("workerId") String workerId) {
+        this.workerApplication.offline(workerId);
+    }
+
+
+    @GetMapping("{workerId}/ping")
+    @Operation(summary = "ping Server接口", description = "ping Server接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void ping(@PathVariable("workerId") String workerId) {
+    }
+
+    @GetMapping("kubernetes/{workerId}/tasks")
+    @Operation(summary = "拉取kube任务接口", description = "拉取kube任务接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public DeferredResult<ResponseEntity<?>> pullKubeTasks(@PathVariable String workerId, TaskPullingDto taskPullingDto) {
+        var deferredResult = this.deferredResultService.newPullDeferredResult(workerId);
+        this.workerApplication.pullKubeTasks(workerId, taskPullingDto.getTriggerId()).ifPresent(taskInstance -> {
+            var unit = this.workerApplication.findUnit(taskInstance);
+            deferredResult.setResult(ResponseEntity.status(HttpStatus.OK).body(unit));
+        });
+        return deferredResult;
+    }
+
+    @GetMapping("{workerId}/tasks")
+    @Operation(summary = "拉取任务接口", description = "拉取任务接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public DeferredResult<ResponseEntity<?>> pullTasks(@PathVariable String workerId) {
+        var deferredResult = this.deferredResultService.newPullDeferredResult(workerId);
+        this.workerApplication.pullTasks(workerId).ifPresent(taskInstance -> {
+            if (taskInstance.isVolume()) {
+                deferredResult.setResult(ResponseEntity
+                        .status(HttpStatus.OK)
+                        .body(WorkerTaskVo.builder()
+                                .type(WorkerTaskVo.Type.VOLUME)
+                                .taskInstanceId(taskInstance.getBusinessId())
+                                .volume(VolumeVo.builder()
+                                        .name(taskInstance.getTriggerId())
+                                        .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
+                                        .build())
+                                .auth(this.getTaskAuth())
+                                .version(taskInstance.getVersion())
+                                .build()
+                        ));
+            } else {
+                deferredResult.setResult(ResponseEntity
+                        .status(HttpStatus.OK)
+                        .body(WorkerTaskVo.builder()
+                                .type(WorkerTaskVo.Type.TASK)
+                                .taskInstanceId(taskInstance.getBusinessId())
+                                .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
+                                .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
+                                .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
+                                .auth(this.getTaskAuth())
+                                .version(taskInstance.getVersion())
+                                .build()
+                        ));
+            }
+        });
+        return deferredResult;
+    }
+
+    @GetMapping("{workerId}/tasks/{businessId}")
+    @Operation(summary = "获取任务详情接口", description = "获取任务详情接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public WorkerTaskVo findTaskById(@PathVariable String workerId, @PathVariable("businessId") String businessId) {
+        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
+                .orElseThrow(() -> new RuntimeException("未找到任务:" + businessId));
+        if (taskInstance.isVolume()) {
+            return WorkerTaskVo.builder()
+                    .type(WorkerTaskVo.Type.VOLUME)
+                    .taskInstanceId(taskInstance.getBusinessId())
+                    .volume(VolumeVo.builder()
+                            .name(taskInstance.getTriggerId())
+                            .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
+                            .build())
+                    .auth(this.getTaskAuth())
+                    .version(taskInstance.getVersion())
+                    .build();
+        } else {
+            return WorkerTaskVo.builder()
+                    .type(WorkerTaskVo.Type.TASK)
+                    .taskInstanceId(taskInstance.getBusinessId())
+                    .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
+                    .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
+                    .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
+                    .auth(this.getTaskAuth())
+                    .version(taskInstance.getVersion())
+                    .build();
+        }
+    }
+
+    private Auth getTaskAuth() {
+        var registry = globalProperties.getWorker().getRegistry();
+        return Auth.builder()
+                .address(registry.getAddress())
+                .username(registry.getUsername())
+                .password(registry.getPassword())
+                .build();
+    }
+
+    @PostMapping("{workerId}/tasks/{businessId}")
+    @Operation(summary = "获取终止任务接口", description = "获取终止任务接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public DeferredResult<ResponseEntity<?>> watchTasks(@PathVariable String workerId, @PathVariable("businessId") String businessId) {
+        var exist = this.deferredResultService.existWatchDeferredResult(workerId, businessId);
+        var deferredResult = this.deferredResultService.newWatchDeferredResult(workerId, businessId);
+        if (!exist) {
+            var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
+                    .orElseThrow(() -> new RuntimeException("未找到任务实例，businessId: " + businessId));
+            if (taskInstance.getStatus() == InstanceStatus.EXECUTION_FAILED) {
+                deferredResult.setResult(ResponseEntity.status(HttpStatus.OK).body(businessId));
+            }
+        }
+        return deferredResult;
+    }
+
+    @Retryable(
+            value = {DeadlockLoserDataAccessException.class, CannotAcquireLockException.class},
+            maxAttempts = 5,
+            backoff = @Backoff(delay = 1000L, multiplier = 2),
+            listeners = "retryListener"
+    )
+    @PatchMapping("{workerId}/tasks/{businessId}/accept")
+    @Operation(summary = "确定任务接口", description = "确定任务接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public WorkerTaskVo acceptTask(HttpServletResponse response, @PathVariable("workerId") String workerId,
+                                   @PathVariable("businessId") String businessId, @Valid @RequestBody TaskInstanceAcceptingDto dto) {
+        var taskInstance = this.workerApplication.acceptTask(response, workerId, businessId, dto.getVersion());
+        if (response.getStatus() != HttpStatus.OK.value()) {
+            return WorkerTaskVo.builder()
+                    .taskInstanceId(businessId)
+                    .build();
+        }
+        if (taskInstance.isVolume()) {
+            return WorkerTaskVo.builder()
+                    .type(WorkerTaskVo.Type.VOLUME)
+                    .taskInstanceId(taskInstance.getBusinessId())
+                    .volume(VolumeVo.builder()
+                            .name(taskInstance.getTriggerId())
+                            .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
+                            .build())
+                    .auth(this.getTaskAuth())
+                    .version(taskInstance.getVersion() + 1)
+                    .build();
+        } else {
+            return WorkerTaskVo.builder()
+                    .type(WorkerTaskVo.Type.TASK)
+                    .taskInstanceId(taskInstance.getBusinessId())
+                    .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
+                    .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
+                    .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
+                    .auth(this.getTaskAuth())
+                    .version(taskInstance.getVersion() + 1)
+                    .build();
+        }
+    }
+
+    @Retryable(
+            value = {DeadlockLoserDataAccessException.class, CannotAcquireLockException.class},
+            maxAttempts = 5,
+            backoff = @Backoff(delay = 1000L, multiplier = 2),
+            listeners = "retryListener"
+    )
+    @PatchMapping("{workerId}/tasks/{businessId}")
+    @Operation(summary = "更新任务接口", description = "更新任务接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void updateTaskInstance(@PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId, @Valid @RequestBody TaskInstanceUpdatingDto dto) {
+        this.workerApplication.updateTaskInstance(workerId, businessId, dto.getStatus().name(), dto.getResultFile(), dto.getErrorMsg(), dto.getExitCode());
+    }
+
+    @PostMapping("{workerId}/tasks/{businessId}/logs")
+    @Operation(summary = "写入任务日志接口", description = "写入任务日志接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void writeTaskLog(HttpServletRequest request, @PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId) {
+        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
+                .orElseThrow(() -> new RuntimeException("未找到任务实例, businessId：" + businessId));
+        try (var writer = this.storageService.writeLog(taskInstance.getId(), false)) {
+            var reader = request.getReader();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                var list = TaskInstanceWritingLogDto.parseString(line);
+                list.stream()
+                        .filter(dto -> dto.getContent() != null)
+                        .forEach(dto -> this.workerApplication.writeTaskLog(writer, workerId, taskInstance.getId(), dto.getContent(), dto.getNumber(), dto.getTimestamp()));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("任务日志写入失败： " + e);
+        }
+    }
+
+    @PostMapping("{workerId}/tasks/{businessId}/logs/batch")
+    @Operation(summary = "实时写入任务日志接口", description = "实时写入任务日志接口")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public void batchWriteTaskLog(HttpServletRequest request, @PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId) {
+        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
+                .orElseThrow(() -> new RuntimeException("未找到任务实例, businessId：" + businessId));
+        try (var writer = this.storageService.writeLog(taskInstance.getId(), true)) {
+            var reader = request.getReader();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if ("null".equals(line)) {
+                    continue;
+                }
+                var list = TaskInstanceWritingLogDto.parseString(line);
+                list.stream()
+                        .filter(dto -> dto.getContent() != null)
+                        .forEach(dto -> this.workerApplication.writeTaskLog(writer, workerId, taskInstance.getId(), dto.getContent(), dto.getNumber(), dto.getTimestamp()));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("任务日志写入失败： " + e);
+        }
+    }
+
+    @GetMapping("/kubernetes/{workerId}/tasks/{triggerId}")
+    @Operation(summary = "获取k8s运行中任务", description = "获取k8s运行中任务")
+    @Parameters({
+            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
+    })
+    public Unit findRunningTaskByTriggerId(@PathVariable("workerId") String workerId, @PathVariable("triggerId") String triggerId) {
+        return this.workerApplication.findRunningTaskByTriggerId(workerId, triggerId);
+    }
+}
diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
index 01d2a08d1..6828aeb26 100644
--- a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
+++ b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java
@@ -1,67 +1,25 @@
 package dev.jianmu.api.controller;
 
-import dev.jianmu.api.dto.*;
-import dev.jianmu.api.vo.Auth;
-import dev.jianmu.api.vo.VolumeVo;
-import dev.jianmu.api.vo.WorkerTaskVo;
-import dev.jianmu.application.query.NodeDefApi;
-import dev.jianmu.application.service.TaskInstanceApplication;
+import dev.jianmu.api.vo.WorkerVo;
+import dev.jianmu.application.service.WorkerApplication;
 import dev.jianmu.application.service.internal.WorkerInternalApplication;
-import dev.jianmu.infrastructure.GlobalProperties;
-import dev.jianmu.infrastructure.storage.StorageService;
-import dev.jianmu.infrastructure.worker.DeferredResultService;
-import dev.jianmu.infrastructure.worker.unit.Unit;
-import dev.jianmu.task.aggregate.InstanceStatus;
 import dev.jianmu.worker.aggregate.Worker;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.dao.CannotAcquireLockException;
-import org.springframework.dao.DeadlockLoserDataAccessException;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.retry.annotation.Backoff;
-import org.springframework.retry.annotation.Retryable;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.async.DeferredResult;
 
-import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
 
-/**
- * @author Ethan Liu
- * @class WorkerController
- * @description Worker API
- * @create 2021-04-21 14:40
- */
 @RestController
-@RequestMapping("workers")
-@Tag(name = "Worker API", description = "Worker API")
+@RequestMapping("frontend/workers")
+@Tag(name = "Worker API", description = "为前端提供的API")
 public class WorkerController {
-    private final WorkerInternalApplication workerApplication;
-    private final DeferredResultService deferredResultService;
-    private final NodeDefApi nodeDefApi;
-    private final StorageService storageService;
-    private final TaskInstanceApplication taskInstanceApplication;
-    private final GlobalProperties globalProperties;
 
-    public WorkerController(WorkerInternalApplication workerApplication,
-                            DeferredResultService deferredResultService,
-                            NodeDefApi nodeDefApi,
-                            StorageService storageService,
-                            TaskInstanceApplication taskInstanceApplication,
-                            GlobalProperties globalProperties
-    ) {
+    private final WorkerApplication workerApplication;
+
+    public WorkerController(WorkerApplication workerApplication) {
         this.workerApplication = workerApplication;
-        this.deferredResultService = deferredResultService;
-        this.nodeDefApi = nodeDefApi;
-        this.storageService = storageService;
-        this.taskInstanceApplication = taskInstanceApplication;
-        this.globalProperties = globalProperties;
     }
 
     @GetMapping("/types")
@@ -70,274 +28,26 @@ public class WorkerController {
         return Worker.Type.values();
     }
 
-    @PutMapping("{workerId}/join")
-    @Operation(summary = "Worker注册接口", description = "Worker注册接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void join(@PathVariable("workerId") String workerId, @RequestBody @Valid WorkerJoiningDto dto) {
-        var worker = Worker.Builder.aWorker()
-                .id(workerId)
-                .name(dto.getName())
-                .type(dto.getType())
-                .os(dto.getOs())
-                .arch(dto.getArch())
-                .capacity(dto.getCapacity())
-                .build();
-        this.workerApplication.join(worker);
-    }
-
-    @PutMapping("{workerId}/online")
-    @Operation(summary = "通知Worker已经Online", description = "通知Worker已经Online")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void online(@PathVariable("workerId") String workerId) {
-        this.workerApplication.online(workerId);
-    }
-
-    @PutMapping("{workerId}/offline")
-    @Operation(summary = "通知Worker已经Offline", description = "通知Worker已经Offline")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void offline(@PathVariable("workerId") String workerId) {
-        this.workerApplication.offline(workerId);
-    }
-
-
-    @GetMapping("{workerId}/ping")
-    @Operation(summary = "ping Server接口", description = "ping Server接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void ping(@PathVariable("workerId") String workerId) {
-    }
-
-    @GetMapping("kubernetes/{workerId}/tasks")
-    @Operation(summary = "拉取kube任务接口", description = "拉取kube任务接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public DeferredResult<ResponseEntity<?>> pullKubeTasks(@PathVariable String workerId, TaskPullingDto taskPullingDto) {
-        var deferredResult = this.deferredResultService.newPullDeferredResult(workerId);
-        this.workerApplication.pullKubeTasks(workerId, taskPullingDto.getTriggerId()).ifPresent(taskInstance -> {
-            var unit = this.workerApplication.findUnit(taskInstance);
-            deferredResult.setResult(ResponseEntity.status(HttpStatus.OK).body(unit));
-        });
-        return deferredResult;
-    }
-
-    @GetMapping("{workerId}/tasks")
-    @Operation(summary = "拉取任务接口", description = "拉取任务接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public DeferredResult<ResponseEntity<?>> pullTasks(@PathVariable String workerId) {
-        var deferredResult = this.deferredResultService.newPullDeferredResult(workerId);
-        this.workerApplication.pullTasks(workerId).ifPresent(taskInstance -> {
-            if (taskInstance.isVolume()) {
-                deferredResult.setResult(ResponseEntity
-                        .status(HttpStatus.OK)
-                        .body(WorkerTaskVo.builder()
-                                .type(WorkerTaskVo.Type.VOLUME)
-                                .taskInstanceId(taskInstance.getBusinessId())
-                                .volume(VolumeVo.builder()
-                                        .name(taskInstance.getTriggerId())
-                                        .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
-                                        .build())
-                                .auth(this.getTaskAuth())
-                                .version(taskInstance.getVersion())
-                                .build()
-                        ));
-            } else {
-                deferredResult.setResult(ResponseEntity
-                        .status(HttpStatus.OK)
-                        .body(WorkerTaskVo.builder()
-                                .type(WorkerTaskVo.Type.TASK)
-                                .taskInstanceId(taskInstance.getBusinessId())
-                                .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
-                                .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
-                                .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
-                                .auth(this.getTaskAuth())
-                                .version(taskInstance.getVersion())
-                                .build()
-                        ));
-            }
-        });
-        return deferredResult;
-    }
-
-    @GetMapping("{workerId}/tasks/{businessId}")
-    @Operation(summary = "获取任务详情接口", description = "获取任务详情接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public WorkerTaskVo findTaskById(@PathVariable String workerId, @PathVariable("businessId") String businessId) {
-        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
-                .orElseThrow(() -> new RuntimeException("未找到任务:" + businessId));
-        if (taskInstance.isVolume()) {
-            return WorkerTaskVo.builder()
-                    .type(WorkerTaskVo.Type.VOLUME)
-                    .taskInstanceId(taskInstance.getBusinessId())
-                    .volume(VolumeVo.builder()
-                            .name(taskInstance.getTriggerId())
-                            .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
-                            .build())
-                    .auth(this.getTaskAuth())
-                    .version(taskInstance.getVersion())
-                    .build();
-        } else {
-            return WorkerTaskVo.builder()
-                    .type(WorkerTaskVo.Type.TASK)
-                    .taskInstanceId(taskInstance.getBusinessId())
-                    .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
-                    .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
-                    .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
-                    .auth(this.getTaskAuth())
-                    .version(taskInstance.getVersion())
-                    .build();
-        }
-    }
-
-    private Auth getTaskAuth() {
-        var registry = globalProperties.getWorker().getRegistry();
-        return Auth.builder()
-                .address(registry.getAddress())
-                .username(registry.getUsername())
-                .password(registry.getPassword())
-                .build();
-    }
-
-    @PostMapping("{workerId}/tasks/{businessId}")
-    @Operation(summary = "获取终止任务接口", description = "获取终止任务接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public DeferredResult<ResponseEntity<?>> watchTasks(@PathVariable String workerId, @PathVariable("businessId") String businessId) {
-        var exist = this.deferredResultService.existWatchDeferredResult(workerId, businessId);
-        var deferredResult = this.deferredResultService.newWatchDeferredResult(workerId, businessId);
-        if (!exist) {
-            var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
-                    .orElseThrow(() -> new RuntimeException("未找到任务实例，businessId: " + businessId));
-            if (taskInstance.getStatus() == InstanceStatus.EXECUTION_FAILED) {
-                deferredResult.setResult(ResponseEntity.status(HttpStatus.OK).body(businessId));
-            }
-        }
-        return deferredResult;
-    }
-
-    @Retryable(
-            value = {DeadlockLoserDataAccessException.class, CannotAcquireLockException.class},
-            maxAttempts = 5,
-            backoff = @Backoff(delay = 1000L, multiplier = 2),
-            listeners = "retryListener"
-    )
-    @PatchMapping("{workerId}/tasks/{businessId}/accept")
-    @Operation(summary = "确定任务接口", description = "确定任务接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public WorkerTaskVo acceptTask(HttpServletResponse response, @PathVariable("workerId") String workerId,
-                                   @PathVariable("businessId") String businessId, @Valid @RequestBody TaskInstanceAcceptingDto dto) {
-        var taskInstance = this.workerApplication.acceptTask(response, workerId, businessId, dto.getVersion());
-        if (response.getStatus() != HttpStatus.OK.value()) {
-            return WorkerTaskVo.builder()
-                    .taskInstanceId(businessId)
-                    .build();
-        }
-        if (taskInstance.isVolume()) {
-            return WorkerTaskVo.builder()
-                    .type(WorkerTaskVo.Type.VOLUME)
-                    .taskInstanceId(taskInstance.getBusinessId())
-                    .volume(VolumeVo.builder()
-                            .name(taskInstance.getTriggerId())
-                            .type(taskInstance.isCreationVolume() ? VolumeVo.Type.CREATION : VolumeVo.Type.DELETION)
-                            .build())
-                    .auth(this.getTaskAuth())
-                    .version(taskInstance.getVersion() + 1)
-                    .build();
-        } else {
-            return WorkerTaskVo.builder()
-                    .type(WorkerTaskVo.Type.TASK)
-                    .taskInstanceId(taskInstance.getBusinessId())
-                    .pullStrategy(this.globalProperties.getWorker().getImagePullPolicy())
-                    .containerSpec(this.workerApplication.getContainerSpec(taskInstance))
-                    .resultFile(this.nodeDefApi.findByType(taskInstance.getDefKey()).getResultFile())
-                    .auth(this.getTaskAuth())
-                    .version(taskInstance.getVersion() + 1)
-                    .build();
-        }
-    }
-
-    @Retryable(
-            value = {DeadlockLoserDataAccessException.class, CannotAcquireLockException.class},
-            maxAttempts = 5,
-            backoff = @Backoff(delay = 1000L, multiplier = 2),
-            listeners = "retryListener"
-    )
-    @PatchMapping("{workerId}/tasks/{businessId}")
-    @Operation(summary = "更新任务接口", description = "更新任务接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void updateTaskInstance(@PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId, @Valid @RequestBody TaskInstanceUpdatingDto dto) {
-        this.workerApplication.updateTaskInstance(workerId, businessId, dto.getStatus().name(), dto.getResultFile(), dto.getErrorMsg(), dto.getExitCode());
-    }
-
-    @PostMapping("{workerId}/tasks/{businessId}/logs")
-    @Operation(summary = "写入任务日志接口", description = "写入任务日志接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void writeTaskLog(HttpServletRequest request, @PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId) {
-        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
-                .orElseThrow(() -> new RuntimeException("未找到任务实例, businessId：" + businessId));
-        try (var writer = this.storageService.writeLog(taskInstance.getId(), false)) {
-            var reader = request.getReader();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                var list = TaskInstanceWritingLogDto.parseString(line);
-                list.stream()
-                        .filter(dto -> dto.getContent() != null)
-                        .forEach(dto -> this.workerApplication.writeTaskLog(writer, workerId, taskInstance.getId(), dto.getContent(), dto.getNumber(), dto.getTimestamp()));
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("任务日志写入失败： " + e);
-        }
-    }
-
-    @PostMapping("{workerId}/tasks/{businessId}/logs/batch")
-    @Operation(summary = "实时写入任务日志接口", description = "实时写入任务日志接口")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public void batchWriteTaskLog(HttpServletRequest request, @PathVariable("workerId") String workerId, @PathVariable("businessId") String businessId) {
-        var taskInstance = this.taskInstanceApplication.findByBusinessIdAndMaxSerialNo(businessId)
-                .orElseThrow(() -> new RuntimeException("未找到任务实例, businessId：" + businessId));
-        try (var writer = this.storageService.writeLog(taskInstance.getId(), true)) {
-            var reader = request.getReader();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if ("null".equals(line)) {
-                    continue;
-                }
-                var list = TaskInstanceWritingLogDto.parseString(line);
-                list.stream()
-                        .filter(dto -> dto.getContent() != null)
-                        .forEach(dto -> this.workerApplication.writeTaskLog(writer, workerId, taskInstance.getId(), dto.getContent(), dto.getNumber(), dto.getTimestamp()));
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("任务日志写入失败： " + e);
-        }
-    }
-
-    @GetMapping("/kubernetes/{workerId}/tasks/{triggerId}")
-    @Operation(summary = "获取k8s运行中任务", description = "获取k8s运行中任务")
-    @Parameters({
-            @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token")
-    })
-    public Unit findRunningTaskByTriggerId(@PathVariable("workerId") String workerId, @PathVariable("triggerId") String triggerId) {
-        return this.workerApplication.findRunningTaskByTriggerId(workerId, triggerId);
+    @DeleteMapping("{workerId}")
+    @Operation(summary = "Worker删除接口", description = "Worker删除接口")
+    public void delete(@PathVariable("workerId") String workerId) {
+        this.workerApplication.delete(workerId);
+    }
+
+    @GetMapping("")
+    @Operation(summary = "查询Worker列表", description = "查询Worker列表")
+    public List<WorkerVo> findWorkerList() {
+        var workers = this.workerApplication.findAll();
+        return workers.stream().map(worker -> WorkerVo.builder()
+                        .id(worker.getId())
+                        .name(worker.getName())
+                        .type(worker.getType())
+                        .tags(worker.getTags())
+                        .os(worker.getOs())
+                        .arch(worker.getArch())
+                        .capacity(worker.getCapacity())
+                        .createdTime(worker.getCreatedTime())
+                        .build())
+                .collect(Collectors.toList());
     }
 }
diff --git a/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java b/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java
index 985ec9bdd..760ace93a 100644
--- a/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java
+++ b/application/src/main/java/dev/jianmu/application/service/WorkerApplication.java
@@ -1,9 +1,11 @@
 package dev.jianmu.application.service;
 
+import dev.jianmu.task.repository.TaskInstanceRepository;
 import dev.jianmu.worker.aggregate.Worker;
 import dev.jianmu.worker.repository.WorkerRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -11,12 +13,22 @@ import java.util.List;
 @Service
 public class WorkerApplication {
     private final WorkerRepository workerRepository;
+    private final TaskInstanceRepository taskInstanceRepository;
 
-    public WorkerApplication(WorkerRepository workerRepository) {
+    public WorkerApplication(WorkerRepository workerRepository, TaskInstanceRepository taskInstanceRepository) {
         this.workerRepository = workerRepository;
+        this.taskInstanceRepository = taskInstanceRepository;
     }
 
     public List<Worker> findAll() {
         return this.workerRepository.findAll();
     }
+
+    @Transactional
+    public void delete(String workerId) {
+        this.workerRepository.findById(workerId).ifPresent(worker -> {
+            this.workerRepository.delete(worker);
+            this.taskInstanceRepository.deleteByWorkerId(worker.getId());
+        });
+    }
 }
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/TaskInstanceMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/TaskInstanceMapper.java
index a56f2d905..8c432c890 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/TaskInstanceMapper.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/TaskInstanceMapper.java
@@ -37,6 +37,9 @@ public interface TaskInstanceMapper {
     @Delete("delete from task_instance where trigger_id = #{triggerId}")
     void deleteByTriggerId(String triggerId);
 
+    @Delete("delete from task_instance where worker_id = #{workerId}")
+    void deleteByWorkerId(String workerId);
+
     @Select("select * from task_instance where id = #{instanceId}")
     @Result(column = "serial_no", property = "serialNo")
     @Result(column = "def_key", property = "defKey")
@@ -97,6 +100,21 @@ public interface TaskInstanceMapper {
     @Result(column = "end_time", property = "endTime")
     List<TaskInstance> findByTriggerId(String triggerId);
 
+    @Select("select * from task_instance where worker_id = #{workerId}")
+    @Result(column = "serial_no", property = "serialNo")
+    @Result(column = "def_key", property = "defKey")
+    @Result(column = "node_info", property = "nodeInfo", typeHandler = NodeInfoTypeHandler.class)
+    @Result(column = "async_task_ref", property = "asyncTaskRef")
+    @Result(column = "workflow_ref", property = "workflowRef")
+    @Result(column = "workflow_version", property = "workflowVersion")
+    @Result(column = "business_id", property = "businessId")
+    @Result(column = "trigger_id", property = "triggerId")
+    @Result(column = "worker_id", property = "workerId")
+    @Result(column = "_version", property = "version")
+    @Result(column = "start_time", property = "startTime")
+    @Result(column = "end_time", property = "endTime")
+    List<TaskInstance> findByWorkerId(String workerId);
+
     @Select("select * from task_instance where status = 'RUNNING'")
     @Result(column = "serial_no", property = "serialNo")
     @Result(column = "def_key", property = "defKey")
diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/TaskInstanceRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/TaskInstanceRepositoryImpl.java
index 3e4ece861..9cf1b4cf2 100644
--- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/TaskInstanceRepositoryImpl.java
+++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/task/TaskInstanceRepositoryImpl.java
@@ -167,6 +167,11 @@ public class TaskInstanceRepositoryImpl implements TaskInstanceRepository {
         return this.taskInstanceMapper.findByTriggerId(triggerId);
     }
 
+    @Override
+    public List<TaskInstance> findByWorkerId(String workerId) {
+        return this.taskInstanceMapper.findByWorkerId(workerId);
+    }
+
     @Override
     public List<TaskInstance> findRunningTask() {
         return this.taskInstanceMapper.findRunningTask();
@@ -192,6 +197,11 @@ public class TaskInstanceRepositoryImpl implements TaskInstanceRepository {
         this.taskInstanceMapper.deleteByTriggerId(triggerId);
     }
 
+    @Override
+    public void deleteByWorkerId(String workerId) {
+        this.taskInstanceMapper.deleteByWorkerId(workerId);
+    }
+
     @Override
     public Optional<TaskInstance> findByWorkerIdAndTriggerIdLimit(String workerId, String triggerId) {
         return this.taskInstanceMapper.findByWorkerIdAndTriggerIdLimit(workerId, triggerId);
diff --git a/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java b/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java
index 9a5d96fef..26b3ea9ba 100644
--- a/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java
+++ b/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java
@@ -33,6 +33,8 @@ public interface TaskInstanceRepository {
 
     List<TaskInstance> findByTriggerId(String triggerId);
 
+    List<TaskInstance> findByWorkerId(String workerId);
+
     List<TaskInstance> findRunningTask();
 
     List<TaskInstance> findByBusinessId(String businessId);
@@ -43,6 +45,8 @@ public interface TaskInstanceRepository {
 
     void deleteByTriggerId(String triggerId);
 
+    void deleteByWorkerId(String workerId);
+
     Optional<TaskInstance> findByWorkerIdAndTriggerIdLimit(String workerId, String triggerId);
 
     Optional<TaskInstance> findByBusinessIdAndVersion(String businessId, int version);
-- 
Gitee


From b0b3091fe762e182f5881e397ec430ea3d6cc93c Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sun, 17 Nov 2024 22:31:00 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat(platform):=20=E6=B7=BB=E5=8A=A0=20Work?=
 =?UTF-8?q?er=20=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 Worker 类型和状态枚举
- 实现 Worker 列表获取和删除接口
- 添加 Worker 管理路由和页面组件
-优化首页导航，增加 Worker管理入口
---
 ui/src/api/dto/enumeration.ts                 |  24 +-
 ui/src/api/dto/worker.ts                      |  16 ++
 ui/src/api/worker.ts                          |  25 +-
 .../assets/svgs/index/worker-manager-btn.svg  |  22 ++
 ui/src/router/modules/platform.ts             |   9 +
 ui/src/views/index.vue                        |  10 +
 ui/src/views/workers/workers-manager.vue      | 267 ++++++++++++++++++
 ui/vite.config.ts                             |   2 +-
 8 files changed, 370 insertions(+), 5 deletions(-)
 create mode 100644 ui/src/api/dto/worker.ts
 create mode 100644 ui/src/assets/svgs/index/worker-manager-btn.svg
 create mode 100644 ui/src/views/workers/workers-manager.vue

diff --git a/ui/src/api/dto/enumeration.ts b/ui/src/api/dto/enumeration.ts
index 5110c217f..7c80cd4bd 100644
--- a/ui/src/api/dto/enumeration.ts
+++ b/ui/src/api/dto/enumeration.ts
@@ -82,7 +82,7 @@ export enum NodeTypeEnum {
   DOCKER = 'DOCKER',
   SHELL = 'SHELL',
   LOCAL = 'LOCAL',
-  COMMUNITY = 'COMMUNITY'
+  COMMUNITY = 'COMMUNITY',
 }
 
 /**
@@ -117,7 +117,7 @@ export enum WebhookRequstStateEnum {
  * 参数类型枚举
  */
 export enum ParamTypeEnum {
-  SECRET = 'SECRET'
+  SECRET = 'SECRET',
 }
 
 /**
@@ -126,7 +126,7 @@ export enum ParamTypeEnum {
 export enum SortTypeEnum {
   DEFAULT_SORT = 'DEFAULT_SORT',
   LAST_MODIFIED_TIME = 'LAST_MODIFIED_TIME',
-  LAST_EXECUTION_TIME = 'LAST_EXECUTION_TIME'
+  LAST_EXECUTION_TIME = 'LAST_EXECUTION_TIME',
 }
 
 /**
@@ -145,3 +145,21 @@ export enum VisibleTypeEnum {
   PRIVATE = 'PRIVATE',
   ORGANIZATION_VISIBLE = 'ORGANIZATION_VISIBLE',
 }
+
+/**
+ * Worker类型枚举
+ */
+export enum WorkerTypeEnum {
+  EMBEDDED = 'EMBEDDED',
+  DOCKER = 'DOCKER',
+  KUBERNETES = 'KUBERNETES',
+  SHELL = 'SHELL',
+}
+
+/**
+ * Worker状态枚举
+ */
+export enum WorkerStatusEnum {
+  ONLINE = 'ONLINE',
+  OFFLINE = 'OFFLINE',
+}
diff --git a/ui/src/api/dto/worker.ts b/ui/src/api/dto/worker.ts
new file mode 100644
index 000000000..a97a06bdb
--- /dev/null
+++ b/ui/src/api/dto/worker.ts
@@ -0,0 +1,16 @@
+import { WorkerTypeEnum, WorkerStatusEnum } from '@/api/dto/enumeration';
+
+/**
+ * WorkerVo
+ */
+export interface IWorkerVo {
+  id: string;
+  name: string;
+  tags: string;
+  capacity: number;
+  os: string;
+  arch: string;
+  type: WorkerTypeEnum;
+  status: WorkerStatusEnum;
+  createdTime: string;
+}
diff --git a/ui/src/api/worker.ts b/ui/src/api/worker.ts
index 5ab5812ad..28fcda070 100644
--- a/ui/src/api/worker.ts
+++ b/ui/src/api/worker.ts
@@ -1,6 +1,7 @@
 import { restProxy } from '@/api/index';
+import { IWorkerVo } from '@/api/dto/worker';
 
-export const baseUrl = '/workers';
+export const baseUrl = '/frontend/workers';
 
 /**
  * 获取worker类型列表
@@ -11,4 +12,26 @@ export function listType(): Promise<string[]> {
     method: 'get',
     auth: true,
   });
+}
+
+/**
+ * 获取worker类型列表
+ */
+export function fetchWorkerList(): Promise<IWorkerVo[]> {
+  return restProxy({
+    url: `${baseUrl}`,
+    method: 'get',
+    auth: true,
+  });
+}
+
+/**
+ * 获取worker类型列表
+ */
+export function deleteWorker(id: string): Promise<void> {
+  return restProxy({
+    url: `${baseUrl}/${id}`,
+    method: 'delete',
+    auth: true,
+  });
 }
\ No newline at end of file
diff --git a/ui/src/assets/svgs/index/worker-manager-btn.svg b/ui/src/assets/svgs/index/worker-manager-btn.svg
new file mode 100644
index 000000000..41a6c7804
--- /dev/null
+++ b/ui/src/assets/svgs/index/worker-manager-btn.svg
@@ -0,0 +1,22 @@
+<svg width="56px" height="56px" viewBox="0 0 56 56" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Worker Management Icon</title>
+    <!-- 背景圆 -->
+    <circle cx="28" cy="28" r="28" fill="#E8E3FF"/>
+    
+    <!-- Worker管理图标 - 使用直接连接线 -->
+    <g transform="translate(4, 4)">
+        <!-- 连接线 - 从中心到各节点 -->
+        <path d="M24 24 L24 10M24 24 L37 30M24 24 L11 30" 
+              stroke="#4B0082" 
+              stroke-width="2.5"
+              fill="none"/>
+              
+        <!-- 主圆圈（代表中心节点） -->
+        <circle cx="24" cy="24" r="7" fill="#4B0082"/>
+        
+        <!-- 三个围绕的小圆点（代表worker节点） -->
+        <circle cx="24" cy="8" r="5" fill="#4B0082"/>
+        <circle cx="38" cy="32" r="5" fill="#4B0082"/>
+        <circle cx="10" cy="32" r="5" fill="#4B0082"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/ui/src/router/modules/platform.ts b/ui/src/router/modules/platform.ts
index a94f57ac9..f8b62fd4b 100644
--- a/ui/src/router/modules/platform.ts
+++ b/ui/src/router/modules/platform.ts
@@ -24,6 +24,15 @@ export default [
       title: '组件库',
     },
   },
+  // Worker管理路由
+  {
+    name: 'worker-manager',
+    path: 'worker-manager',
+    component: () => import('@/views/workers/workers-manager.vue'),
+    meta: {
+      title: 'Worker管理',
+    },
+  },
   // 节点库路由
   {
     name: 'node-library',
diff --git a/ui/src/views/index.vue b/ui/src/views/index.vue
index cd99d1145..3d0004ff4 100644
--- a/ui/src/views/index.vue
+++ b/ui/src/views/index.vue
@@ -23,6 +23,12 @@
           <!--          </router-link>-->
         </div>
         <div class="right-area">
+          <router-link :to="{ name: 'worker-manager' }">
+            <div class="btn-item">
+              <button class="worker-manager"></button>
+              <span class="text">Worker管理</span>
+            </div>
+          </router-link>
           <router-link :to="{ name: 'node-library' }">
             <div class="btn-item">
               <button class="node-library"></button>
@@ -130,6 +136,10 @@ export default defineComponent({
             background-image: url('@/assets/svgs/index/git-btn.svg');
           }
 
+          &.worker-manager {
+            background-image: url('@/assets/svgs/index/worker-manager-btn.svg');
+          }
+
           &.node-library {
             background-image: url('@/assets/svgs/index/node-library-btn.svg');
           }
diff --git a/ui/src/views/workers/workers-manager.vue b/ui/src/views/workers/workers-manager.vue
new file mode 100644
index 000000000..7bbb22c67
--- /dev/null
+++ b/ui/src/views/workers/workers-manager.vue
@@ -0,0 +1,267 @@
+<template>
+    <div class="worker-manager">
+        <div class="right-top-btn">
+            <router-link :to="{ name: 'index' }">
+                <jm-button type="primary" class="jm-icon-button-cancel" size="small">关闭
+                </jm-button>
+            </router-link>
+        </div>
+        <div class="title">
+            <span>Worker列表</span>
+            <span class="desc">（共有 {{ workerListData.length }} 个Worker）</span>
+        </div>
+        <div class="content">
+            <jm-empty v-if="workerListData.length === 0" />
+            <div v-else v-for="(i, idx) in workerListData" :key="idx" class="item">
+                <div class="wrapper">
+                    <div class="top">
+                        <span class="id">ID: {{ i.id }}</span>
+                    </div>
+                    <div class="name">
+                        <span>名称：</span>
+                        <span>{{ i.name }}</span>
+                    </div>
+                    <div class="tags">
+                        <span>标签：</span>
+                        <span>{{ (i.tags || '无') }}</span>
+                    </div>
+                    <div class="os">
+                        <span>操作系统：</span>
+                        <span>{{ i.os }}</span>
+                    </div>
+                    <div class="arch">
+                        <span>架构：</span>
+                        <span>{{ i.arch }}</span>
+                    </div>
+                    <div class="created-time">
+                        <span>注册时间：</span>
+                        <span>{{ datetimeFormatter(i.createdTime) }}</span>
+                    </div>
+                </div>
+                <div class="operation">
+                    <button :class="{ del: true, doing: deletings[i.id] }" @click="del(i.id)" @keypress.enter.prevent>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</template>
+
+<script lang="ts">
+import {
+    defineComponent,
+    getCurrentInstance,
+    onMounted,
+    ref,
+} from 'vue';
+import { Mutable } from '@/utils/lib';
+import { IWorkerVo } from '@/api/dto/worker';
+import { fetchWorkerList, deleteWorker } from '@/api/worker';
+import { datetimeFormatter } from '@/utils/formatter';
+
+export default defineComponent({
+    setup() {
+        const { proxy } = getCurrentInstance() as any;
+        const deletings = ref<{ [name: string]: boolean }>({});
+
+        const workerListData = ref<Mutable<IWorkerVo>[]>([]);
+        const fetchWorkers = async () => {
+            workerListData.value = await fetchWorkerList();
+        };
+
+        onMounted(async () => {
+            await fetchWorkers();
+        });
+        return {
+            deletings,
+            workerListData,
+            datetimeFormatter,
+            del: (id: string) => {
+                if (deletings.value[id]) {
+                    return;
+                }
+
+                let msg = '<div>确定要删除Worker吗?</div>';
+                msg += `<div style="margin-top: 5px; font-size: 12px; line-height: normal;">ID：${id}</div>`;
+                proxy
+                    .$confirm(msg, '删除Worker', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                        dangerouslyUseHTMLString: true,
+                    })
+                    .then(() => {
+                        deletings.value[id] = true;
+                        deleteWorker(id)
+                        .then(() => {
+                            proxy.$success('删除成功');
+                            delete deletings.value[id];
+                            const index = workerListData.value.findIndex(item => item.id === id);
+                            workerListData.value.splice(index, 1);
+                        })
+                        .catch((err: Error) => {
+                            proxy.$throw(err, proxy);
+                            delete deletings.value[id];
+                        });
+                    })
+                    .catch(() => { });
+            },
+        }
+    }
+})
+</script>
+
+<style scoped lang="less">
+.worker-manager {
+    padding: 16px 20px 25px 16px;
+    background-color: #ffffff;
+
+    // height: calc(100vh - 185px);
+    .right-top-btn {
+        position: fixed;
+        right: 20px;
+        top: 78px;
+
+        .jm-icon-button-cancel::before {
+            font-weight: bold;
+        }
+    }
+
+    .title {
+        font-size: 20px;
+        font-weight: bold;
+        color: #082340;
+        position: relative;
+        padding-left: 20px;
+        padding-right: 20px;
+        margin: 30px -20px 20px;
+
+        .desc {
+            font-weight: normal;
+            margin-left: 12px;
+            font-size: 14px;
+            color: #082340;
+            opacity: 0.46;
+        }
+    }
+
+    .content {
+        display: flex;
+        flex-wrap: wrap;
+
+        .item {
+            position: relative;
+            margin: 0.5%;
+            width: 19%;
+            min-width: 260px;
+            height: 170px;
+            background-color: #ffffff;
+            box-shadow: 0px 0px 8px 4px #eff4f9;
+
+            &:hover {
+                box-shadow: 0px 6px 16px 4px #e6eef6;
+                
+                .operation {
+                    display: block;
+                }
+            }
+
+            .wrapper {
+                padding: 15px;
+                border: 1px solid transparent;
+                height: 138px;
+                color: #6b7b8d;
+                font-size: 13px;
+                position: relative;
+
+                &:hover {
+                    border-color: #096dd9;
+                }
+
+                .top {
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    white-space: nowrap;
+
+                    .id {
+                        color: #082340;
+                        font-size: 20px;
+                        font-weight: 500;
+
+                        &:hover {
+                            color: #096dd9;
+                        }
+                    }
+                }
+
+                .name {
+                    margin-top: 5px;
+                    line-height: 20px;
+
+                    &:hover {
+                        color: #096dd9;
+                    }
+                }
+
+                // .tags {
+                //     margin-top: 5px;
+                //     line-height: 20px;
+                // }
+
+                // .os {
+                //     margin-top: 5px;
+                //     line-height: 20px;
+                // }
+
+                // .arch {
+                //     margin-top: 5px;
+                //     line-height: 20px;
+                // }
+
+                .created-time {
+                    position: absolute;
+                    bottom: 20px;
+                }
+            }
+
+            .operation {
+                display: none;
+                position: absolute;
+                right: 6px;
+                top: 8px;
+
+                button {
+                    width: 22px;
+                    height: 22px;
+                    background-color: #ffffff;
+                    border: 0;
+                    background-position: center center;
+                    background-repeat: no-repeat;
+                    background-size: contain;
+                    cursor: pointer;
+
+                    &:active {
+                        background-color: #eff7ff;
+                        border-radius: 4px;
+                    }
+
+                    &.del {
+                        background-image: url('@/assets/svgs/btn/del.svg');
+                    }
+
+                    &.doing {
+                        opacity: 0.5;
+                        cursor: not-allowed;
+
+                        &:active {
+                            background-color: transparent;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index 5364e29ef..a0b5c02b8 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -25,7 +25,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         // 会话
         '/auth': { target, changeOrigin },
         // worker
-        '/workers': { target, changeOrigin },
+        '/frontend/workers': { target, changeOrigin },
         // 密钥管理
         '/secrets': { target, changeOrigin },
         // 流程定义
-- 
Gitee


From 4b4f0492c49e8465444a7eb78fc2b854f173ba58 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sun, 17 Nov 2024 22:40:25 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat(ui):=20=E4=B8=BA=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 nginx 配置中添加了 /frontend/workers 路径的代理设置
---
 ui/nginx-http.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/nginx-http.conf b/ui/nginx-http.conf
index 978bb9e12..17a60e46f 100644
--- a/ui/nginx-http.conf
+++ b/ui/nginx-http.conf
@@ -35,6 +35,14 @@ server {
     proxy_pass http://ci-server:8081;
     proxy_redirect off;
   }
+  location /frontend/workers {
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-NginX-Proxy true;
+    proxy_pass http://ci-server:8081;
+    proxy_redirect off;
+  }
   location /workers {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-- 
Gitee