From e66330de8f02a42dac2d2dac10aa29d9fecfb9ca Mon Sep 17 00:00:00 2001
From: ethan-liu <ethan-liu@noreply.gitcode.com>
Date: Tue, 23 Apr 2024 16:50:39 +0800
Subject: [PATCH 01/11] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 550894ade..42df55ba3 100644
--- a/README.md
+++ b/README.md
@@ -114,9 +114,7 @@ openssl rand -hex 16
 
 若，使用过程中遇到问题，开issue反馈给我们。
 
-* 建木：https://gitee.com/jianmu-dev/jianmu/issues
-* 建木Worker：https://gitee.com/organizations/jianmu-workers/issues
-* 建木节点：https://gitee.com/organizations/jianmu-runners/issues
+* 建木：https://gitcode.com/jianmu-dev/jianmu/issues
 
 [官方示例](https://ci.jianmu.dev)
 
-- 
Gitee


From f60fce943b870ddf0cc94ca1a7025a17ef0f3221 Mon Sep 17 00:00:00 2001
From: liamjung <liamjung@noreply.gitcode.com>
Date: Mon, 1 Jul 2024 17:41:29 +0800
Subject: [PATCH 02/11] refactor: version base url

---
 ui/src/api/view-no-auth.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/api/view-no-auth.ts b/ui/src/api/view-no-auth.ts
index e78543071..fab1a7e3c 100644
--- a/ui/src/api/view-no-auth.ts
+++ b/ui/src/api/view-no-auth.ts
@@ -32,7 +32,7 @@ export const baseUrl = {
   parameter: '/view/parameters',
   triggerEvent: '/view/trigger_events',
   trigger: '/view/trigger',
-  version: 'https://jianmu.dev/versions/ci',
+  version: 'https://api.jianmu.dev/versions/ci',
   cache: '/view/caches',
 };
 const hubUrl = import.meta.env.VITE_JIANMU_HUB_API_BASE_URL;
-- 
Gitee


From 8d698d79928778c027c77a593c50d9ec907d5280 Mon Sep 17 00:00:00 2001
From: liamjung <liamjung@noreply.gitcode.com>
Date: Mon, 1 Jul 2024 17:42:07 +0800
Subject: [PATCH 03/11] fix: main image url

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 42df55ba3..4bc151ee8 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@
 
 > 建木是一个面向DevOps领域的极易扩展的开源无代码(图形化)/低代码(GitOps)工具。可以帮助用户轻松编排各种DevOps流程并分发到不同平台执行。
 
-![](https://jianmu-blog.assets.dghub.cn/jianmu-blog/1.29.0/assets/blog-source/%E7%AC%AC%E4%B8%80%E5%B1%8F%E5%9B%BE.png)
+![](https://jianmu-blog.assets.dghub.cn/jianmu-blog/1.80.1/assets/blog-source/%E7%AC%AC%E4%B8%80%E5%B1%8F%E5%9B%BE.png)
 
 在线体验：[devops.jianmuhub.com](https://devops.jianmuhub.com)
 
-- 
Gitee


From 0b9a9b313fd46efbf678638ae8e507d8e40a981c Mon Sep 17 00:00:00 2001
From: ethan-liu <ethan-liu@noreply.gitcode.com>
Date: Fri, 23 Aug 2024 16:51:23 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0JM=5FTASK=5FREF?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=8F=98=E9=87=8F=20=20feat:=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0JM=5FTASK=5FREF=E5=86=85=E7=BD=AE=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/internal/WorkerInternalApplication.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 5bd0d8a3d..aa20f7cf6 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
@@ -284,7 +284,7 @@ public class WorkerInternalApplication {
                     .map(entry -> Map.entry("JIANMU_" + entry.getKey(), entry.getValue()))
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         }
-        parameterMap.putAll(this.getEnvVariable(worker, taskInstance.getTriggerId(), taskInstance.getBusinessId(), taskInstance.getDefKey()));
+        parameterMap.putAll(this.getEnvVariable(worker, taskInstance.getTriggerId(), taskInstance.getBusinessId(), taskInstance.getDefKey(), taskInstance.getAsyncTaskRef()));
         this.addFeatureParam(parameterMap);
         parameterMap = parameterMap.entrySet().stream()
                 .filter(entry -> entry.getKey() != null)
@@ -409,7 +409,7 @@ public class WorkerInternalApplication {
      * @param worker
      * @return
      */
-    private HashMap<String, String> getEnvVariable(Worker worker, String triggerId, String businessId, String defKey) {
+    private HashMap<String, String> getEnvVariable(Worker worker, String triggerId, String businessId, String defKey, String taskRef) {
 
         HashMap<String, String> env = new HashMap<>();
         env.put("JM_RESULT_FILE", "/" + triggerId + "/" + businessId);
@@ -421,6 +421,7 @@ public class WorkerInternalApplication {
         env.put("JM_BUSINESS_ID", businessId);
         env.put("JM_TRIGGER_ID", triggerId);
         env.put("JM_DEF_KEY", defKey);
+        env.put("JM_TASK_REF", taskRef);
 
         var triggerEvent = this.triggerEventRepository.findById(triggerId)
                 .orElseThrow(() -> new DataNotFoundException("未找到该触发事件"));
@@ -692,7 +693,7 @@ public class WorkerInternalApplication {
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("未找到对应的异步任务实例："));
         envs.put("JM_RESULT_FILE", "/" + asyncTaskInstance.getTriggerId() + "/" + asyncTaskInstance.getId());
-        var map = this.getEnvVariable(worker, asyncTaskInstance.getTriggerId(), asyncTaskInstance.getId(), asyncTaskInstance.getAsyncTaskType());
+        var map = this.getEnvVariable(worker, asyncTaskInstance.getTriggerId(), asyncTaskInstance.getId(), asyncTaskInstance.getAsyncTaskType(), asyncTaskInstance.getAsyncTaskRef());
         envs.putAll(map);
         if (nodeDef.getImage() != null) {
             envs.put("JIANMU_SCRIPT", "JIANMU_SCRIPT");
-- 
Gitee


From dfc1f9bdd982c71a81996ce33e4d3b1f22560bde Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 11:50:42 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat(worker):=20=E5=A2=9E=E5=8A=A0=20Work?=
 =?UTF-8?q?er=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 2d26ead077525c5aac1dafa8a17ddc0f88f201f2 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 12:40:25 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat(api):=20=E6=B7=BB=E5=8A=A0=20Worker?=
 =?UTF-8?q?=20=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 dc3a4e517f375f47f2c12ab9f0745f8a0d13a2d1 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 18:42:25 +0800
Subject: [PATCH 07/11] =?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 804acd01956723859ac63f2e2c713e973ab5fce6 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sat, 16 Nov 2024 23:48:51 +0800
Subject: [PATCH 08/11] =?UTF-8?q?refactor(worker):=20=E9=87=8D=E6=9E=84Wor?=
 =?UTF-8?q?ker=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 b4d5e5e6fb188696ce9526856d5fd3620afc9f5e Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Sun, 17 Nov 2024 15:17:30 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat(worker):=20=E6=B7=BB=E5=8A=A0=20Work?=
 =?UTF-8?q?er=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 370139a3d4ee4bf9dc9c960a813e4beb06831481 Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Tue, 31 Dec 2024 17:08:51 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E6=AD=A3JsonPath?=
 =?UTF-8?q?=E9=94=AE=E5=90=8D=E4=B8=BA=E6=95=B0=E5=AD=97=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20https://gitee.com/jianmu?=
 =?UTF-8?q?-dev/jianmu/issues/IB8EKH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/data/json-view/index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/data/json-view/index.vue b/ui/src/components/data/json-view/index.vue
index 6ec8caf01..e5fe2c152 100644
--- a/ui/src/components/data/json-view/index.vue
+++ b/ui/src/components/data/json-view/index.vue
@@ -42,16 +42,16 @@ export default /* #__PURE__*/ defineComponent({
   components: { JsonViewItem },
   emits: ['update:selected'],
   methods: {
-    convertKey(key: string): string {
+    convertKey(key: string): [string, boolean] {
       if (Number.isInteger(key)) {
-        return `[${key.toString()}]`;
+        return [`[${key.toString()}]`, true];
       }
 
       if (/[^A-Za-z0-9_$]/.test(key.toString())) {
-        return `["${key}"]`;
+        return [`["${key}"]`, true];
       }
 
-      return `${key}`;
+      return [`${key}`, false];
     },
     build(key: string, val: any, depth: number, path: string, includeKey: boolean): JsonData {
       const children = [];
@@ -84,7 +84,10 @@ export default /* #__PURE__*/ defineComponent({
           children: children,
         };
       } else {
-        let convertedKey = this.convertKey(key);
+        const [convertedKey, needCutDot] = this.convertKey(key);
+        if (needCutDot) {
+          path = path.slice(0, -1);
+        }
         // Build Value
         return {
           key: key,
-- 
Gitee


From 042eff7b0dbfa70ae0105e29a503828af51c83dc Mon Sep 17 00:00:00 2001
From: ethan <ethan-liu@outlook.com>
Date: Tue, 31 Dec 2024 17:10:23 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix(worker):=20=E4=BF=AE=E5=A4=8Dworker?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E5=90=8C=E6=AD=A5=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/src/main/java/dev/jianmu/api/controller/WorkerApi.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java
index db6a76fb6..9fa0a10e4 100644
--- a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java
+++ b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java
@@ -74,6 +74,7 @@ public class WorkerApi {
                 .id(workerId)
                 .name(dto.getName())
                 .type(dto.getType())
+                .tags(dto.getTag())
                 .os(dto.getOs())
                 .arch(dto.getArch())
                 .capacity(dto.getCapacity())
-- 
Gitee