chore: change pom version to 3.4.6

powerjob-client/pom.xml

@@ -10,13 +10,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-client</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
     <properties>
         <junit.version>5.6.1</junit.version>
         <fastjson.version>1.2.68</fastjson.version>
-        <powerjob.common.version>3.4.5</powerjob.common.version>
+        <powerjob.common.version>3.4.6</powerjob.common.version>
 
         <mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
     </properties>

powerjob-common/pom.xml

@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-common</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
     <properties>

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() {

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<DeployedContainerInfo> 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();
     }

powerjob-official-processors/pom.xml

@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-official-processors</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -20,7 +20,7 @@
         <!-- 不会被打包的部分，scope 只能是 test 或 provide -->
         <junit.version>5.6.1</junit.version>
         <logback.version>1.2.3</logback.version>
-        <powerjob.worker.version>3.4.5</powerjob.worker.version>
+        <powerjob.worker.version>3.4.6</powerjob.worker.version>
 
         <!-- 全部 shade 化，避免依赖冲突 -->
         <fastjson.version>1.2.68</fastjson.version>

powerjob-server/pom.xml

@@ -10,13 +10,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-server</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
     <properties>
         <swagger.version>2.9.2</swagger.version>
         <springboot.version>2.3.4.RELEASE</springboot.version>
-        <powerjob.common.version>3.4.5</powerjob.common.version>
+        <powerjob.common.version>3.4.6</powerjob.common.version>
         <!-- MySQL version that corresponds to spring-boot-dependencies version. -->
         <mysql.version>8.0.19</mysql.version>
         <ojdbc.version>19.7.0.0</ojdbc.version>

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<Protocol, Transporter> protocol2Transporter = Maps.newConcurrentMap();
 
     @Autowired

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<JSONObject> 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());

powerjob-worker-agent/pom.xml

@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker-agent</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
 
     <properties>
-        <powerjob.worker.version>3.4.5</powerjob.worker.version>
+        <powerjob.worker.version>3.4.6</powerjob.worker.version>
         <logback.version>1.2.3</logback.version>
         <picocli.version>4.3.2</picocli.version>
 

powerjob-worker-samples/pom.xml

@@ -10,11 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerjob-worker-samples</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
 
     <properties>
         <springboot.version>2.2.6.RELEASE</springboot.version>
-        <powerjob.worker.starter.version>3.4.5</powerjob.worker.starter.version>
+        <powerjob.worker.starter.version>3.4.6</powerjob.worker.starter.version>
         <fastjson.version>1.2.68</fastjson.version>
 
         <!-- 部署时跳过该module -->

powerjob-worker-spring-boot-starter/pom.xml

@@ -10,11 +10,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker-spring-boot-starter</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
     <properties>
-        <powerjob.worker.version>3.4.5</powerjob.worker.version>
+        <powerjob.worker.version>3.4.6</powerjob.worker.version>
         <springboot.version>2.2.6.RELEASE</springboot.version>
     </properties>
 

powerjob-worker/pom.xml

@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker</artifactId>
-    <version>3.4.5</version>
+    <version>3.4.6</version>
     <packaging>jar</packaging>
 
     <properties>
         <spring.version>5.2.4.RELEASE</spring.version>
-        <powerjob.common.version>3.4.5</powerjob.common.version>
+        <powerjob.common.version>3.4.6</powerjob.common.version>
         <h2.db.version>1.4.200</h2.db.version>
         <hikaricp.version>3.4.2</hikaricp.version>
         <junit.version>5.6.1</junit.version>

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());