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

Merge branch '4.3.5'

Browse Source
This commit is contained in:
tjq 2023-08-14 23:57:14 +08:00
commit 9ab2e92934
33 changed files with 98 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README_zhCN.md
View File

@ -20,7 +20,7 @@ PowerJob（原OhMyScheduler）是全新一代分布式调度与计算框架，
* DAG工作流支持：支持在线配置任务依赖关系，可视化得对任务进行编排，同时还支持上下游任务间的数据传递 * DAG工作流支持：支持在线配置任务依赖关系，可视化得对任务进行编排，同时还支持上下游任务间的数据传递
* 执行器支持广泛：支持Spring Bean、内置/外置Java类、Shell、Python等处理器，应用范围广。 * 执行器支持广泛：支持Spring Bean、内置/外置Java类、Shell、Python等处理器，应用范围广。
* 运维便捷：支持在线日志功能，执行器产生的日志可以在前端控制台页面实时显示，降低debug成本，极大地提高开发效率。 * 运维便捷：支持在线日志功能，执行器产生的日志可以在前端控制台页面实时显示，降低debug成本，极大地提高开发效率。
* 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...），扩展依赖为MongoDB（用于存储庞大的在线日志）。 * 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...）。
* 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。
* 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。

42
others/dev/docker-compose.yml
View File

@ -11,7 +11,7 @@ services:
deploy: deploy:
resources: resources:
limits: limits:
memory: 640M memory: 768M
restart: always restart: always
container_name: powerjob-mysql container_name: powerjob-mysql
image: powerjob/powerjob-mysql:test_env image: powerjob/powerjob-mysql:test_env
@ -20,38 +20,38 @@ services:
volumes: volumes:
- ~/powerjob-data/powerjob-mysql:/var/lib/mysql - ~/powerjob-data/powerjob-mysql:/var/lib/mysql
command: --lower_case_table_names=1 command: --lower_case_table_names=1
powerjob-mongodb: # powerjob-mongodb:
image: mongo:latest # image: mongo:latest
container_name: powerjob-mongodb # container_name: powerjob-mongodb
restart: always # restart: always
deploy: # deploy:
resources: # resources:
limits: # limits:
memory: 256M # memory: 256M
environment: # environment:
MONGO_INITDB_ROOT_USERNAME: "root" # MONGO_INITDB_ROOT_USERNAME: "root"
MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!" # MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!"
MONGO_INITDB_DATABASE: "powerjob_daily" # MONGO_INITDB_DATABASE: "powerjob_daily"
ports: # ports:
- "27017:27017" # - "27017:27017"
volumes: # volumes:
- ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro # - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
- ~/powerjob-data/powerjob-mongodb:/data/db # - ~/powerjob-data/powerjob-mongodb:/data/db
powerjob-server: powerjob-server:
build: build:
context: ../../powerjob-server/docker context: ../../powerjob-server/docker
deploy: deploy:
resources: resources:
limits: limits:
memory: 768M memory: 896M
container_name: powerjob-server container_name: powerjob-server
image: powerjob/powerjob-server:test_env image: powerjob/powerjob-server:test_env
restart: always restart: always
depends_on: depends_on:
- powerjob-mysql - powerjob-mysql
- powerjob-mongodb # - powerjob-mongodb
environment: environment:
PARAMS: "--spring.profiles.active=product --oms.mongodb.enable=true --spring.data.mongodb.uri=mongodb://zqq:No1Bug2Please3!@powerjob-mongodb/powerjob_daily?retryWrites=true&w=majority --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai" PARAMS: "--spring.profiles.active=daily --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai --oms.storage.dfs.mysql_series.url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"
JVMOPTIONS: "-server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/powerjob/server/gc.log" JVMOPTIONS: "-server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/powerjob/server/gc.log"
ports: ports:
- "7700:7700" - "7700:7700"

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>powerjob</name> <name>powerjob</name>
<url>http://www.powerjob.tech</url> <url>http://www.powerjob.tech</url>

6
powerjob-client/pom.xml
View File

@ -5,18 +5,18 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-client</artifactId> <artifactId>powerjob-client</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<junit.version>5.9.1</junit.version> <junit.version>5.9.1</junit.version>
<fastjson.version>1.2.83</fastjson.version> <fastjson.version>1.2.83</fastjson.version>
<powerjob.common.version>4.3.4</powerjob.common.version> <powerjob.common.version>4.3.5</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>

4
powerjob-common/pom.xml
View File

@ -5,12 +5,12 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-common</artifactId> <artifactId>powerjob-common</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

4
powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java
View File

@ -170,8 +170,8 @@ public class NetUtils {
log.warn("[Net] findNetworkInterface failed", e); log.warn("[Net] findNetworkInterface failed", e);
} }
// sort by interface index, the smaller is preferred. // sort by interface index, the smaller is preferred. （部分用户反馈 IP 获取逻辑反而劣化了，先注释）
validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex)); // validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex));
// Try to find the preferred one // Try to find the preferred one
for (NetworkInterface networkInterface : validNetworkInterfaces) { for (NetworkInterface networkInterface : validNetworkInterfaces) {

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

@ -5,12 +5,12 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-official-processors</artifactId> <artifactId>powerjob-official-processors</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -20,7 +20,7 @@
<!-- 不会被打包的部分，scope 只能是 test 或 provide --> <!-- 不会被打包的部分，scope 只能是 test 或 provide -->
<junit.version>5.9.1</junit.version> <junit.version>5.9.1</junit.version>
<logback.version>1.2.9</logback.version> <logback.version>1.2.9</logback.version>
<powerjob.worker.version>4.3.4</powerjob.worker.version> <powerjob.worker.version>4.3.5</powerjob.worker.version>
<spring.jdbc.version>5.2.9.RELEASE</spring.jdbc.version> <spring.jdbc.version>5.2.9.RELEASE</spring.jdbc.version>
<h2.db.version>2.1.214</h2.db.version> <h2.db.version>2.1.214</h2.db.version>
<mysql.version>8.0.28</mysql.version> <mysql.version>8.0.28</mysql.version>

2
powerjob-remote/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

6
powerjob-remote/powerjob-remote-benchmark/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-remote</artifactId> <artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -21,8 +21,8 @@
<logback.version>1.2.9</logback.version> <logback.version>1.2.9</logback.version>
<springboot.version>2.7.4</springboot.version> <springboot.version>2.7.4</springboot.version>
<powerjob-remote-impl-http.version>4.3.4</powerjob-remote-impl-http.version> <powerjob-remote-impl-http.version>4.3.5</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.4</powerjob-remote-impl-akka.version> <powerjob-remote-impl-akka.version>4.3.5</powerjob-remote-impl-akka.version>
<gatling.version>3.9.0</gatling.version> <gatling.version>3.9.0</gatling.version>
<gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version> <gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>

6
powerjob-remote/powerjob-remote-framework/pom.xml
View File

@ -5,11 +5,11 @@
<parent> <parent>
<artifactId>powerjob-remote</artifactId> <artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>4.3.4</version> <version>4.3.5</version>
<artifactId>powerjob-remote-framework</artifactId> <artifactId>powerjob-remote-framework</artifactId>
<properties> <properties>
@ -17,7 +17,7 @@
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powerjob-common.version>4.3.4</powerjob-common.version> <powerjob-common.version>4.3.5</powerjob-common.version>
<reflections.version>0.10.2</reflections.version> <reflections.version>0.10.2</reflections.version>

6
powerjob-remote/powerjob-remote-impl-akka/pom.xml
View File

@ -5,19 +5,19 @@
<parent> <parent>
<artifactId>powerjob-remote</artifactId> <artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-remote-impl-akka</artifactId> <artifactId>powerjob-remote-impl-akka</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powerjob-remote-framework.version>4.3.4</powerjob-remote-framework.version> <powerjob-remote-framework.version>4.3.5</powerjob-remote-framework.version>
<akka.version>2.6.13</akka.version> <akka.version>2.6.13</akka.version>
</properties> </properties>

6
powerjob-remote/powerjob-remote-impl-http/pom.xml
View File

@ -5,12 +5,12 @@
<parent> <parent>
<artifactId>powerjob-remote</artifactId> <artifactId>powerjob-remote</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-remote-impl-http</artifactId> <artifactId>powerjob-remote-impl-http</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@ -18,7 +18,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.3.7</vertx.version> <vertx.version>4.3.7</vertx.version>
<powerjob-remote-framework.version>4.3.4</powerjob-remote-framework.version> <powerjob-remote-framework.version>4.3.5</powerjob-remote-framework.version>
</properties> </properties>
<dependencies> <dependencies>

10
powerjob-server/pom.xml
View File

@ -5,12 +5,12 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
@ -50,9 +50,9 @@
<groovy.version>3.0.10</groovy.version> <groovy.version>3.0.10</groovy.version>
<cron-utils.version>9.1.6</cron-utils.version> <cron-utils.version>9.1.6</cron-utils.version>
<powerjob-common.version>4.3.4</powerjob-common.version> <powerjob-common.version>4.3.5</powerjob-common.version>
<powerjob-remote-impl-http.version>4.3.4</powerjob-remote-impl-http.version> <powerjob-remote-impl-http.version>4.3.5</powerjob-remote-impl-http.version>
<powerjob-remote-impl-akka.version>4.3.4</powerjob-remote-impl-akka.version> <powerjob-remote-impl-akka.version>4.3.5</powerjob-remote-impl-akka.version>
<springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version> <springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
<aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version> <aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version>
<commons-collections4.version>4.4</commons-collections4.version> <commons-collections4.version>4.4</commons-collections4.version>

2
powerjob-server/powerjob-server-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-extension/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-migrate/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-monitor/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-persistence/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java
View File

@ -142,7 +142,7 @@ public class AliOssService extends AbstractDFsService {
} }
this.oss = new OSSClientBuilder().build(endpoint, credentialsProvider); this.oss = new OSSClientBuilder().build(endpoint, credentialsProvider);
log.info("[AliOssService] initialize OSS successfully!"); log.info("[AliOssService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
} }
@Override @Override

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java
View File

@ -1,5 +1,6 @@
package tech.powerjob.server.persistence.storage.impl; package tech.powerjob.server.persistence.storage.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import tech.powerjob.server.extension.dfs.*; import tech.powerjob.server.extension.dfs.*;
@ -17,6 +18,7 @@ import java.util.Optional;
* @author tjq * @author tjq
* @since 2023/7/30 * @since 2023/7/30
*/ */
@Slf4j
@Priority(value = Integer.MAX_VALUE) @Priority(value = Integer.MAX_VALUE)
@Conditional(EmptyDFsService.EmptyCondition.class) @Conditional(EmptyDFsService.EmptyCondition.class)
public class EmptyDFsService extends AbstractDFsService { public class EmptyDFsService extends AbstractDFsService {
@ -41,7 +43,7 @@ public class EmptyDFsService extends AbstractDFsService {
@Override @Override
protected void init(ApplicationContext applicationContext) { protected void init(ApplicationContext applicationContext) {
log.info("[EmptyDFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
} }

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java
View File

@ -158,6 +158,8 @@ public class GridFsService extends AbstractDFsService {
protected void init(ApplicationContext applicationContext) { protected void init(ApplicationContext applicationContext) {
String uri = parseMongoUri(applicationContext.getEnvironment()); String uri = parseMongoUri(applicationContext.getEnvironment());
initMongo(uri); initMongo(uri);
log.info("[GridFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
} }
public static class GridFsCondition extends PropertyAndOneBeanCondition { public static class GridFsCondition extends PropertyAndOneBeanCondition {

8
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java
View File

@ -17,6 +17,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.serialize.JsonUtils;
import tech.powerjob.common.utils.CommonUtils; import tech.powerjob.common.utils.CommonUtils;
import tech.powerjob.common.utils.NetUtils;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.common.spring.condition.PropertyAndOneBeanCondition; import tech.powerjob.server.common.spring.condition.PropertyAndOneBeanCondition;
import tech.powerjob.server.extension.dfs.*; import tech.powerjob.server.extension.dfs.*;
@ -35,8 +36,8 @@ import java.util.Optional;
/** /**
* MySQL 特性类似的数据库存储 * MySQL 特性类似的数据库存储
* PS1. 大文件上传可能会报 max_allowed_packet 不足，可根据参数放开数据库限制 set global max_allowed_packet = 500*1024*1024 * PS1. 大文件上传可能会报 max_allowed_packet 不足，可根据参数放开数据库限制 set global max_allowed_packet = 500*1024*1024
* PS1. 官方基于 MySQL 测试，其他数据库使用前请自测，敬请谅解！ * PS2. 官方基于 MySQL 测试，其他数据库使用前请自测，敬请谅解！
* PS2. 数据库并不适合大规模的文件存储，该扩展仅适用于简单业务，大型业务场景请选择其他存储方案（OSS、MongoDB等） * PS3. 数据库并不适合大规模的文件存储，该扩展仅适用于简单业务，大型业务场景请选择其他存储方案（OSS、MongoDB等）
* ********************* 配置项 ********************* * ********************* 配置项 *********************
* oms.storage.dfs.mysql_series.driver * oms.storage.dfs.mysql_series.driver
* oms.storage.dfs.mysql_series.url * oms.storage.dfs.mysql_series.url
@ -138,6 +139,7 @@ public class MySqlSeriesDfsService extends AbstractDFsService {
deleteByLocation(fileLocation); deleteByLocation(fileLocation);
Map<String, Object> meta = Maps.newHashMap(); Map<String, Object> meta = Maps.newHashMap();
meta.put("_server_", NetUtils.getLocalHost());
meta.put("_local_file_path_", storeRequest.getLocalFile().getAbsolutePath()); meta.put("_local_file_path_", storeRequest.getLocalFile().getAbsolutePath());
Date date = new Date(System.currentTimeMillis()); Date date = new Date(System.currentTimeMillis());
@ -262,6 +264,8 @@ public class MySqlSeriesDfsService extends AbstractDFsService {
log.error("[MySqlSeriesDfsService] init datasource failed!", e); log.error("[MySqlSeriesDfsService] init datasource failed!", e);
ExceptionUtils.rethrow(e); ExceptionUtils.rethrow(e);
} }
log.info("[MySqlSeriesDfsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
} }
void initDatabase(MySQLProperty property) { void initDatabase(MySQLProperty property) {

2
powerjob-server/powerjob-server-remote/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

1
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java
View File

@ -75,6 +75,7 @@ public class WorkerClusterQueryService {
* @param appId appId * @param appId appId
* @return alive workers * @return alive workers
*/ */
@DesignateServer
public List<WorkerInfo> getAllAliveWorkers(Long appId) { public List<WorkerInfo> getAllAliveWorkers(Long appId) {
List<WorkerInfo> workers = Lists.newLinkedList(getWorkerInfosByAppId(appId).values()); List<WorkerInfo> workers = Lists.newLinkedList(getWorkerInfosByAppId(appId).values());
workers.removeIf(WorkerInfo::timeout); workers.removeIf(WorkerInfo::timeout);

2
powerjob-server/powerjob-server-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>powerjob-server</artifactId> <artifactId>powerjob-server</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

10
powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties
View File

@ -3,15 +3,19 @@ logging.config=classpath:logback-dev.xml
####### Database properties(Configure according to the the environment) ####### ####### Database properties(Configure according to the the environment) #######
spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.core.username=root spring.datasource.core.username=root
spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.password=No1Bug2Please3!
spring.datasource.core.maximum-pool-size=20 spring.datasource.core.maximum-pool-size=20
spring.datasource.core.minimum-idle=5 spring.datasource.core.minimum-idle=5
####### MongoDB properties(Non-core configuration properties) ####### ####### Storage properties(Delete if not needed) #######
####### delete mongodb config to disable mongodb #######
#oms.storage.dfs.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority #oms.storage.dfs.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority
oms.storage.dfs.mysql_series.driver=com.mysql.cj.jdbc.Driver
oms.storage.dfs.mysql_series.url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
oms.storage.dfs.mysql_series.username=root
oms.storage.dfs.mysql_series.password=No1Bug2Please3!
oms.storage.dfs.mysql_series.auto_create_table=true
####### Email properties(Non-core configuration properties) ####### ####### Email properties(Non-core configuration properties) #######
####### Delete the following code to disable the mail ####### ####### Delete the following code to disable the mail #######

3
powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties
View File

@ -9,8 +9,7 @@ spring.datasource.core.password=No1Bug2Please3!
spring.datasource.core.maximum-pool-size=20 spring.datasource.core.maximum-pool-size=20
spring.datasource.core.minimum-idle=5 spring.datasource.core.minimum-idle=5
####### MongoDB properties(Non-core configuration properties) ####### ####### Storage properties(Delete if not needed) #######
####### delete mongodb config to disable mongodb #######
oms.storage.dfs.mongodb.uri=mongodb://remotehost:27017/powerjob-pre oms.storage.dfs.mongodb.uri=mongodb://remotehost:27017/powerjob-pre
####### Email properties(Non-core configuration properties) ####### ####### Email properties(Non-core configuration properties) #######

3
powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties
View File

@ -9,8 +9,7 @@ spring.datasource.core.password=No1Bug2Please3!
spring.datasource.core.maximum-pool-size=20 spring.datasource.core.maximum-pool-size=20
spring.datasource.core.minimum-idle=5 spring.datasource.core.minimum-idle=5
####### MongoDB properties(Non-core configuration properties) ####### ####### Storage properties(Delete if not needed) #######
####### delete mongodb config to disable mongodb #######
oms.storage.dfs.mongodb.uri=mongodb://localhost:27017/powerjob-product oms.storage.dfs.mongodb.uri=mongodb://localhost:27017/powerjob-product
####### Email properties(Non-core configuration properties) ####### ####### Email properties(Non-core configuration properties) #######

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

@ -5,24 +5,24 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-agent</artifactId> <artifactId>powerjob-worker-agent</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<powerjob.worker.version>4.3.4</powerjob.worker.version> <powerjob.worker.version>4.3.5</powerjob.worker.version>
<logback.version>1.2.9</logback.version> <logback.version>1.2.9</logback.version>
<picocli.version>4.3.2</picocli.version> <picocli.version>4.3.2</picocli.version>
<spring.version>5.3.23</spring.version> <spring.version>5.3.23</spring.version>
<spring.boot.version>2.3.4.RELEASE</spring.boot.version> <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
<powerjob.official.processors.version>4.3.4</powerjob.official.processors.version> <powerjob.official.processors.version>4.3.5</powerjob.official.processors.version>
<!-- dependency for dynamic sql processor --> <!-- dependency for dynamic sql processor -->
<mysql.version>8.0.28</mysql.version> <mysql.version>8.0.28</mysql.version>

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

@ -5,18 +5,18 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-samples</artifactId> <artifactId>powerjob-worker-samples</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<properties> <properties>
<springboot.version>2.7.4</springboot.version> <springboot.version>2.7.4</springboot.version>
<powerjob.worker.starter.version>4.3.4</powerjob.worker.starter.version> <powerjob.worker.starter.version>4.3.5</powerjob.worker.starter.version>
<fastjson.version>1.2.83</fastjson.version> <fastjson.version>1.2.83</fastjson.version>
<powerjob.official.processors.version>4.3.4</powerjob.official.processors.version> <powerjob.official.processors.version>4.3.5</powerjob.official.processors.version>
<!-- 部署时跳过该module --> <!-- 部署时跳过该module -->
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>

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

@ -5,16 +5,16 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<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>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<powerjob.worker.version>4.3.4</powerjob.worker.version> <powerjob.worker.version>4.3.5</powerjob.worker.version>
<springboot.version>2.7.4</springboot.version> <springboot.version>2.7.4</springboot.version>
</properties> </properties>

12
powerjob-worker/pom.xml
View File

@ -5,12 +5,12 @@
<parent> <parent>
<artifactId>powerjob</artifactId> <artifactId>powerjob</artifactId>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<version>4.3.4</version> <version>4.3.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker</artifactId> <artifactId>powerjob-worker</artifactId>
<version>4.3.4</version> <version>4.3.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -21,10 +21,10 @@
<logback.version>1.2.9</logback.version> <logback.version>1.2.9</logback.version>
<powerjob-common.version>4.3.4</powerjob-common.version> <powerjob-common.version>4.3.5</powerjob-common.version>
<powerjob-remote-framework.version>4.3.4</powerjob-remote-framework.version> <powerjob-remote-framework.version>4.3.5</powerjob-remote-framework.version>
<powerjob-remote-impl-akka.version>4.3.4</powerjob-remote-impl-akka.version> <powerjob-remote-impl-akka.version>4.3.5</powerjob-remote-impl-akka.version>
<powerjob-remote-impl-http.version>4.3.4</powerjob-remote-impl-http.version> <powerjob-remote-impl-http.version>4.3.5</powerjob-remote-impl-http.version>
</properties> </properties>
<dependencies> <dependencies>