third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: change pom version to 3.4.6

Browse Source
This commit is contained in:
tjq 2021-02-11 10:38:09 +08:00
parent dfbf9ec137
commit 7441c61313
13 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerjob-client/pom.xml
View File

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

2
powerjob-common/pom.xml
View File

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

2
powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java
View File

@ -11,7 +11,7 @@ import java.io.Serializable;
public interface OmsSerializable extends 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 * @return null for non-http request object or no-null path for http request needed object
*/ */
default String path() { default String path() {

3
powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/WorkerInfo.java
View File

@ -20,6 +20,8 @@ public class WorkerInfo {
private String protocol; private String protocol;
private String client;
private SystemMetrics systemMetrics; private SystemMetrics systemMetrics;
private List<DeployedContainerInfo> containerInfos; private List<DeployedContainerInfo> containerInfos;
@ -28,6 +30,7 @@ public class WorkerInfo {
address = workerHeartbeat.getWorkerAddress(); address = workerHeartbeat.getWorkerAddress();
lastActiveTime = workerHeartbeat.getHeartbeatTime(); lastActiveTime = workerHeartbeat.getHeartbeatTime();
protocol = workerHeartbeat.getProtocol(); protocol = workerHeartbeat.getProtocol();
client = workerHeartbeat.getClient();
systemMetrics = workerHeartbeat.getSystemMetrics(); systemMetrics = workerHeartbeat.getSystemMetrics();
containerInfos = workerHeartbeat.getContainerInfos(); containerInfos = workerHeartbeat.getContainerInfos();
} }

4
powerjob-official-processors/pom.xml
View File

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

4
powerjob-server/pom.xml
View File

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

2
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/TransportService.java
View File

@ -4,6 +4,7 @@ import com.github.kfcfans.powerjob.common.OmsSerializable;
import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.Protocol;
import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.response.AskResponse;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -21,6 +22,7 @@ import java.util.Map;
@Service @Service
public class TransportService { public class TransportService {
@Getter
private final Map<Protocol, Transporter> protocol2Transporter = Maps.newConcurrentMap(); private final Map<Protocol, Transporter> protocol2Transporter = Maps.newConcurrentMap();
@Autowired @Autowired

6
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java
View File

@ -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.model.AppInfoDO;
import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; 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.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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -30,6 +30,8 @@ import java.util.TimeZone;
@RequestMapping("/server") @RequestMapping("/server")
public class ServerController { public class ServerController {
@Resource
private TransportService transportService;
@Resource @Resource
private ServerElectionService serverElectionService; private ServerElectionService serverElectionService;
@Resource @Resource
@ -51,7 +53,7 @@ public class ServerController {
public ResultDTO<JSONObject> ping(@RequestParam(required = false) boolean debug) { public ResultDTO<JSONObject> ping(@RequestParam(required = false) boolean debug) {
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
res.put("localHost", NetUtils.getLocalHost()); res.put("localHost", NetUtils.getLocalHost());
res.put("actorSystemAddress", AkkaStarter.getActorSystemAddress()); res.put("communicationSystemInfo", transportService.getProtocol2Transporter());
res.put("serverTime", CommonUtils.formatTime(System.currentTimeMillis())); res.put("serverTime", CommonUtils.formatTime(System.currentTimeMillis()));
res.put("serverTimeZone", TimeZone.getDefault().getDisplayName()); res.put("serverTimeZone", TimeZone.getDefault().getDisplayName());
res.put("appIds", WorkerManagerService.getAppId2ClusterStatus().keySet()); res.put("appIds", WorkerManagerService.getAppId2ClusterStatus().keySet());

4
powerjob-worker-agent/pom.xml
View File

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

4
powerjob-worker-samples/pom.xml
View File

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

4
powerjob-worker-spring-boot-starter/pom.xml
View File

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

4
powerjob-worker/pom.xml
View File

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

1
powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java
View File

@ -43,6 +43,7 @@ public class WorkerHealthReporter implements Runnable {
heartbeat.setHeartbeatTime(System.currentTimeMillis()); heartbeat.setHeartbeatTime(System.currentTimeMillis());
heartbeat.setVersion(PowerJobWorkerVersion.getVersion()); heartbeat.setVersion(PowerJobWorkerVersion.getVersion());
heartbeat.setProtocol(Protocol.AKKA.name()); heartbeat.setProtocol(Protocol.AKKA.name());
heartbeat.setClient("Atlantis");
// 获取当前加载的容器列表 // 获取当前加载的容器列表
heartbeat.setContainerInfos(OmsContainerFactory.getDeployedContainerInfos()); heartbeat.setContainerInfos(OmsContainerFactory.getDeployedContainerInfos());