diff --git a/api/pom.xml b/api/pom.xml index 2fb2ffa25d76e265f247812b88a4cc522b926eb4..897b0cfdade66419c6e5ca2c3a4683ab9fde8134 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,13 +5,13 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 api jar - 2.7.2 + 2.8.0 1.36.0 @@ -24,7 +24,7 @@ dev.jianmu application - 2.7.2 + 2.8.0 @@ -63,7 +63,7 @@ dev.jianmu oauth2 - 2.7.2 + 2.8.0 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 0d1b22cb6d184baaa2beffff314c8e78890acb33..db6a76fb6a449a162f6a2d31cd0b70a03998aefa 100644 --- a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java +++ b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java @@ -81,7 +81,7 @@ public class WorkerApi { this.workerApplication.join(worker); } - @PutMapping("{workerId}/online") + @PatchMapping("{workerId}/online") @Operation(summary = "通知Worker已经Online", description = "通知Worker已经Online") @Parameters({ @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token") @@ -90,7 +90,7 @@ public class WorkerApi { this.workerApplication.online(workerId); } - @PutMapping("{workerId}/offline") + @PatchMapping("{workerId}/offline") @Operation(summary = "通知Worker已经Offline", description = "通知Worker已经Offline") @Parameters({ @Parameter(name = "X-Jianmu-Token", in = ParameterIn.HEADER, description = "认证token") 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 6828aeb268c2304507689dc36c1cb26b04d3d69b..12534810c9f5634ba92b483f7a39c8981daa04dd 100644 --- a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java +++ b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java @@ -2,7 +2,6 @@ package dev.jianmu.api.controller; import dev.jianmu.api.vo.WorkerVo; import dev.jianmu.application.service.WorkerApplication; -import dev.jianmu.application.service.internal.WorkerInternalApplication; import dev.jianmu.worker.aggregate.Worker; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -46,6 +45,7 @@ public class WorkerController { .os(worker.getOs()) .arch(worker.getArch()) .capacity(worker.getCapacity()) + .status(worker.getStatus()) .createdTime(worker.getCreatedTime()) .build()) .collect(Collectors.toList()); diff --git a/application/pom.xml b/application/pom.xml index 46035722dd6ee6b6a45058c7a78e0ca25bcc110c..b15ddcc745ede54e961a2ef638ffff98bc0ee79e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 @@ -15,7 +15,7 @@ dev.jianmu infrastructure - 2.7.2 + 2.8.0 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 e7faa0df7ce91deb4518b03b5280873c3c7a5758..8c8883d82b80a8743f34081a937404e0ff623a43 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 @@ -139,10 +139,7 @@ public class WorkerInternalApplication { public void join(Worker worker) { this.workerRepository.findById(worker.getId()).ifPresentOrElse( w -> this.workerRepository.updateInfo(worker), - () -> { - worker.online(); - this.workerRepository.add(worker); - } + () -> this.workerRepository.add(worker) ); } diff --git a/el/pom.xml b/el/pom.xml index e677c40303b25b192e14a7b2f38a739f10de4a46..ddd751294ad4d489fd6aad750f910f428dd0acfc 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -7,7 +7,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 el @@ -16,7 +16,7 @@ dev.jianmu workflow-core - 2.7.2 + 2.8.0 org.antlr diff --git a/embedded-worker/pom.xml b/embedded-worker/pom.xml index d224a6ee3339eda967026f77bf1dd83df2d2bcb8..d570412a475c2de94e28bff3ed2631135332341e 100644 --- a/embedded-worker/pom.xml +++ b/embedded-worker/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/event/pom.xml b/event/pom.xml index 4eecb6cb3398b6f4dd7248ae8c1e160278aca0e1..3f61f9233b4700e4651c1d9d3229f9c0cd9a064a 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 event diff --git a/git-repo-core/pom.xml b/git-repo-core/pom.xml index 5a43e1474430dabccd7554968d0cef253292013c..7924010ff2e2ee685aed1c4bbf82ae3381425bc0 100644 --- a/git-repo-core/pom.xml +++ b/git-repo-core/pom.xml @@ -7,7 +7,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 git-repo-core diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml index 96f95aed725c39d0e216b8a9024f0213b20596d0..042124783bc541960718925bcad36a53607056ea 100644 --- a/infrastructure/pom.xml +++ b/infrastructure/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 @@ -15,57 +15,57 @@ dev.jianmu project-core - 2.7.2 + 2.8.0 dev.jianmu node-definition - 2.7.2 + 2.8.0 dev.jianmu workflow-core - 2.7.2 + 2.8.0 dev.jianmu el - 2.7.2 + 2.8.0 dev.jianmu task-core - 2.7.2 + 2.8.0 dev.jianmu secret-core - 2.7.2 + 2.8.0 dev.jianmu user-core - 2.7.2 + 2.8.0 dev.jianmu trigger-core - 2.7.2 + 2.8.0 dev.jianmu worker-core - 2.7.2 + 2.8.0 dev.jianmu embedded-worker - 2.7.2 + 2.8.0 dev.jianmu event - 2.7.2 + 2.8.0 diff --git a/node-definition/pom.xml b/node-definition/pom.xml index a40f17ae2942c8304e656161e8a8ba798e37df24..c3dfed13d9434437a31c1a2bd287756c213a454b 100644 --- a/node-definition/pom.xml +++ b/node-definition/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/oauth2/pom.xml b/oauth2/pom.xml index 73b859ea831a9363cad12bd9d6fefea4087ab7ce..8af375783622d91c5116ff6c84ff94eda6fa1baa 100644 --- a/oauth2/pom.xml +++ b/oauth2/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 @@ -20,7 +20,7 @@ dev.jianmu infrastructure - 2.7.2 + 2.8.0 diff --git a/pom.xml b/pom.xml index 978e8ee37bc36e404492ddb1caa8ab9ff63099c9..9f1803aba2ab7297115aa859b40cd483b46a4bde 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.jianmu main pom - 2.7.2 + 2.8.0 application infrastructure diff --git a/project-core/pom.xml b/project-core/pom.xml index 55dd97f74577c9f8c2cdd6bd39d0d3938b55970c..8963c31f7dcfaef82b0d953649be2b8b033c4d74 100644 --- a/project-core/pom.xml +++ b/project-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/secret-core/pom.xml b/secret-core/pom.xml index a2d6f3d9edcf7b75958cd5f853f47b04639ee452..fc0028ae9725ed25ff24c5be38a7e431d10b2cfd 100644 --- a/secret-core/pom.xml +++ b/secret-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/task-core/pom.xml b/task-core/pom.xml index 266219571ec8d354707914905dbfd2d70015c529..c01c5bdca9ed37067582d8624facb830a66c55f5 100644 --- a/task-core/pom.xml +++ b/task-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/trigger-core/pom.xml b/trigger-core/pom.xml index d0b0ee41c981a6741fe99d5976c9ecce8e1ecea7..a6ff8b0f3ca0ac282e4a2da8bddd920e47bf52b2 100644 --- a/trigger-core/pom.xml +++ b/trigger-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/ui/src/views/workers/workers-manager.vue b/ui/src/views/workers/workers-manager.vue index 7bbb22c67ef11e28d65603eaedbd0d5f21acb4a4..116ac2175c692608ab73e6659ef275b5632c9388 100644 --- a/ui/src/views/workers/workers-manager.vue +++ b/ui/src/views/workers/workers-manager.vue @@ -1,267 +1,297 @@ \ No newline at end of file + diff --git a/user-core/pom.xml b/user-core/pom.xml index e41fdb2f79ce7a8c6fb899585328fc21f64727fd..92c80e2a033c08c7413fdc4390b188a9ececeb20 100644 --- a/user-core/pom.xml +++ b/user-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/worker-core/pom.xml b/worker-core/pom.xml index 1339fc49faa1136a9c665ba62973b93a1e1b776f..f45818b18607cabf08ca5739a5da2ddbaa641c10 100644 --- a/worker-core/pom.xml +++ b/worker-core/pom.xml @@ -5,7 +5,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 4.0.0 diff --git a/workflow-core/pom.xml b/workflow-core/pom.xml index 1d2db4ddce8f82c1c7072e0fb53a7b0d6530ab64..82685cd0dec47a94bf81d2aca62e13e6afc817ff 100644 --- a/workflow-core/pom.xml +++ b/workflow-core/pom.xml @@ -7,7 +7,7 @@ main dev.jianmu - 2.7.2 + 2.8.0 workflow-core