diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index 25bf23e3..873c16d5 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-client - 3.4.5 + 3.4.6 jar 5.6.1 1.2.68 - 3.4.5 + 3.4.6 3.2.4 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index fc0e0f0a..fe718257 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-common - 3.4.5 + 3.4.6 jar diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java index 0c90fde1..01196efe 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java @@ -11,7 +11,7 @@ import java.io.Serializable; public interface OmsSerializable extends Serializable { /** - * request path for http or other protocol, like 'stopInstance' + * request path for http or other protocol, like '/worker/stopInstance' * @return null for non-http request object or no-null path for http request needed object */ default String path() { diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/WorkerInfo.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/WorkerInfo.java index 095008ea..4aaba661 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/WorkerInfo.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/WorkerInfo.java @@ -20,6 +20,8 @@ public class WorkerInfo { private String protocol; + private String client; + private SystemMetrics systemMetrics; private List containerInfos; @@ -28,6 +30,7 @@ public class WorkerInfo { address = workerHeartbeat.getWorkerAddress(); lastActiveTime = workerHeartbeat.getHeartbeatTime(); protocol = workerHeartbeat.getProtocol(); + client = workerHeartbeat.getClient(); systemMetrics = workerHeartbeat.getSystemMetrics(); containerInfos = workerHeartbeat.getContainerInfos(); } diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml index e1bba22a..b28b61fc 100644 --- a/powerjob-official-processors/pom.xml +++ b/powerjob-official-processors/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-official-processors - 1.0.0 + 1.0.1 jar @@ -20,7 +20,7 @@ 5.6.1 1.2.3 - 3.4.5 + 3.4.6 1.2.68 diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 48e42d19..9aac61ce 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-server - 3.4.5 + 3.4.6 jar 2.9.2 2.3.4.RELEASE - 3.4.5 + 3.4.6 8.0.19 19.7.0.0 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/TransportService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/TransportService.java index f9192a4f..14ffdc53 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/TransportService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/TransportService.java @@ -4,6 +4,7 @@ import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.google.common.collect.Maps; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ import java.util.Map; @Service public class TransportService { + @Getter private final Map protocol2Transporter = Maps.newConcurrentMap(); @Autowired diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java index 5b94bf76..ee883a14 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java @@ -9,7 +9,7 @@ import com.github.kfcfans.powerjob.server.extension.ServerElectionService; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; -import com.github.kfcfans.powerjob.server.transport.starter.AkkaStarter; +import com.github.kfcfans.powerjob.server.transport.TransportService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,6 +30,8 @@ import java.util.TimeZone; @RequestMapping("/server") public class ServerController { + @Resource + private TransportService transportService; @Resource private ServerElectionService serverElectionService; @Resource @@ -51,7 +53,7 @@ public class ServerController { public ResultDTO ping(@RequestParam(required = false) boolean debug) { JSONObject res = new JSONObject(); res.put("localHost", NetUtils.getLocalHost()); - res.put("actorSystemAddress", AkkaStarter.getActorSystemAddress()); + res.put("communicationSystemInfo", transportService.getProtocol2Transporter()); res.put("serverTime", CommonUtils.formatTime(System.currentTimeMillis())); res.put("serverTimeZone", TimeZone.getDefault().getDisplayName()); res.put("appIds", WorkerManagerService.getAppId2ClusterStatus().keySet()); diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index cd827eba..fc9097fc 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker-agent - 3.4.5 + 3.4.6 jar - 3.4.5 + 3.4.6 1.2.3 4.3.2 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index 7790e663..9526b515 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-samples - 3.4.5 + 3.4.6 2.2.6.RELEASE - 3.4.5 + 3.4.6 1.2.68 diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index 4bb63afb..98432094 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-spring-boot-starter - 3.4.5 + 3.4.6 jar - 3.4.5 + 3.4.6 2.2.6.RELEASE diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index 557b6e1b..b4c6758a 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker - 3.4.5 + 3.4.6 jar 5.2.4.RELEASE - 3.4.5 + 3.4.6 1.4.200 3.4.2 5.6.1 diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java index 94e4fb64..fbad814d 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java @@ -43,6 +43,7 @@ public class WorkerHealthReporter implements Runnable { heartbeat.setHeartbeatTime(System.currentTimeMillis()); heartbeat.setVersion(PowerJobWorkerVersion.getVersion()); heartbeat.setProtocol(Protocol.AKKA.name()); + heartbeat.setClient("Atlantis"); // 获取当前加载的容器列表 heartbeat.setContainerInfos(OmsContainerFactory.getDeployedContainerInfos());