From 8c32c775dac65ab5307b298a78e1c8287ddbbd13 Mon Sep 17 00:00:00 2001 From: raylua Date: Fri, 17 Feb 2023 19:27:08 +0800 Subject: [PATCH 1/6] fix: In multi-servers node , no workers found prompt without @DesignateServer in not conform server node --- .../powerjob/server/remote/worker/WorkerClusterQueryService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java index 2cbef095..a931e331 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java @@ -76,6 +76,7 @@ public class WorkerClusterQueryService { * @param appId appId * @return alive workers */ + @DesignateServer public List getAllAliveWorkers(Long appId) { List workers = Lists.newLinkedList(getWorkerInfosByAppId(appId).values()); workers.removeIf(WorkerInfo::timeout); From bdcc9b131d6b8bc6b15274123e04bbff1acdf56b Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 14 Aug 2023 23:14:07 +0800 Subject: [PATCH 2/6] refactor: optimize DfsService's log --- .../server/persistence/storage/impl/AliOssService.java | 2 +- .../server/persistence/storage/impl/EmptyDFsService.java | 4 +++- .../server/persistence/storage/impl/GridFsService.java | 2 ++ .../persistence/storage/impl/MySqlSeriesDfsService.java | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java index 7ae36243..d3a23657 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java @@ -142,7 +142,7 @@ public class AliOssService extends AbstractDFsService { } 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 diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java index 9f464898..28b1340d 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java @@ -1,5 +1,6 @@ package tech.powerjob.server.persistence.storage.impl; +import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; import tech.powerjob.server.extension.dfs.*; @@ -17,6 +18,7 @@ import java.util.Optional; * @author tjq * @since 2023/7/30 */ +@Slf4j @Priority(value = Integer.MAX_VALUE) @Conditional(EmptyDFsService.EmptyCondition.class) public class EmptyDFsService extends AbstractDFsService { @@ -41,7 +43,7 @@ public class EmptyDFsService extends AbstractDFsService { @Override protected void init(ApplicationContext applicationContext) { - + log.info("[EmptyDFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER."); } diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java index c5c4f70c..71f7b0d7 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java @@ -158,6 +158,8 @@ public class GridFsService extends AbstractDFsService { protected void init(ApplicationContext applicationContext) { String uri = parseMongoUri(applicationContext.getEnvironment()); initMongo(uri); + + log.info("[GridFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER."); } public static class GridFsCondition extends PropertyAndOneBeanCondition { diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java index ca8348a8..e98008e0 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Conditional; import org.springframework.core.env.Environment; import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.CommonUtils; +import tech.powerjob.common.utils.NetUtils; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.spring.condition.PropertyAndOneBeanCondition; import tech.powerjob.server.extension.dfs.*; @@ -138,6 +139,7 @@ public class MySqlSeriesDfsService extends AbstractDFsService { deleteByLocation(fileLocation); Map meta = Maps.newHashMap(); + meta.put("_server_", NetUtils.getLocalHost()); meta.put("_local_file_path_", storeRequest.getLocalFile().getAbsolutePath()); Date date = new Date(System.currentTimeMillis()); @@ -262,6 +264,8 @@ public class MySqlSeriesDfsService extends AbstractDFsService { log.error("[MySqlSeriesDfsService] init datasource failed!", e); ExceptionUtils.rethrow(e); } + + log.info("[MySqlSeriesDfsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER."); } void initDatabase(MySQLProperty property) { From 91abbc03d9f75a634119cc70874a66a876c092f8 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 14 Aug 2023 23:14:44 +0800 Subject: [PATCH 3/6] fix: rollback NetUtils's interface index sort --- .../src/main/java/tech/powerjob/common/utils/NetUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java b/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java index b6a3fe93..79aeb85e 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java @@ -170,8 +170,8 @@ public class NetUtils { log.warn("[Net] findNetworkInterface failed", e); } - // sort by interface index, the smaller is preferred. - validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex)); + // sort by interface index, the smaller is preferred. (部分用户反馈 IP 获取逻辑反而劣化了,先注释) + // validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex)); // Try to find the preferred one for (NetworkInterface networkInterface : validNetworkInterfaces) { From b14b49f75e5e62691f3eae2c648f3f03816e9b31 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 14 Aug 2023 23:41:06 +0800 Subject: [PATCH 4/6] chore: optimize test env script --- others/dev/docker-compose.yml | 42 +++++++++---------- .../storage/impl/MySqlSeriesDfsService.java | 4 +- .../resources/application-daily.properties | 10 +++-- .../main/resources/application-pre.properties | 3 +- .../resources/application-product.properties | 3 +- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/others/dev/docker-compose.yml b/others/dev/docker-compose.yml index 4afbba45..3f1b9bdb 100644 --- a/others/dev/docker-compose.yml +++ b/others/dev/docker-compose.yml @@ -11,7 +11,7 @@ services: deploy: resources: limits: - memory: 640M + memory: 768M restart: always container_name: powerjob-mysql image: powerjob/powerjob-mysql:test_env @@ -20,38 +20,38 @@ services: volumes: - ~/powerjob-data/powerjob-mysql:/var/lib/mysql command: --lower_case_table_names=1 - powerjob-mongodb: - image: mongo:latest - container_name: powerjob-mongodb - restart: always - deploy: - resources: - limits: - memory: 256M - environment: - MONGO_INITDB_ROOT_USERNAME: "root" - MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!" - MONGO_INITDB_DATABASE: "powerjob_daily" - ports: - - "27017:27017" - volumes: - - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro - - ~/powerjob-data/powerjob-mongodb:/data/db +# powerjob-mongodb: +# image: mongo:latest +# container_name: powerjob-mongodb +# restart: always +# deploy: +# resources: +# limits: +# memory: 256M +# environment: +# MONGO_INITDB_ROOT_USERNAME: "root" +# MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!" +# MONGO_INITDB_DATABASE: "powerjob_daily" +# ports: +# - "27017:27017" +# volumes: +# - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro +# - ~/powerjob-data/powerjob-mongodb:/data/db powerjob-server: build: context: ../../powerjob-server/docker deploy: resources: limits: - memory: 768M + memory: 896M container_name: powerjob-server image: powerjob/powerjob-server:test_env restart: always depends_on: - powerjob-mysql - - powerjob-mongodb +# - powerjob-mongodb 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" ports: - "7700:7700" diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java index e98008e0..9493f62c 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/MySqlSeriesDfsService.java @@ -36,8 +36,8 @@ import java.util.Optional; /** * MySQL 特性类似的数据库存储 * PS1. 大文件上传可能会报 max_allowed_packet 不足,可根据参数放开数据库限制 set global max_allowed_packet = 500*1024*1024 - * PS1. 官方基于 MySQL 测试,其他数据库使用前请自测,敬请谅解! - * PS2. 数据库并不适合大规模的文件存储,该扩展仅适用于简单业务,大型业务场景请选择其他存储方案(OSS、MongoDB等) + * PS2. 官方基于 MySQL 测试,其他数据库使用前请自测,敬请谅解! + * PS3. 数据库并不适合大规模的文件存储,该扩展仅适用于简单业务,大型业务场景请选择其他存储方案(OSS、MongoDB等) * ********************* 配置项 ********************* * oms.storage.dfs.mysql_series.driver * oms.storage.dfs.mysql_series.url diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties index e61cd400..a2285ddd 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties +++ b/powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties @@ -3,15 +3,19 @@ logging.config=classpath:logback-dev.xml ####### Database properties(Configure according to the the environment) ####### 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.password=No1Bug2Please3! spring.datasource.core.maximum-pool-size=20 spring.datasource.core.minimum-idle=5 -####### MongoDB properties(Non-core configuration properties) ####### -####### delete mongodb config to disable mongodb ####### +####### Storage properties(Delete if not needed) ####### #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) ####### ####### Delete the following code to disable the mail ####### diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties index a19491e8..389e73a0 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties +++ b/powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties @@ -9,8 +9,7 @@ spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.maximum-pool-size=20 spring.datasource.core.minimum-idle=5 -####### MongoDB properties(Non-core configuration properties) ####### -####### delete mongodb config to disable mongodb ####### +####### Storage properties(Delete if not needed) ####### oms.storage.dfs.mongodb.uri=mongodb://remotehost:27017/powerjob-pre ####### Email properties(Non-core configuration properties) ####### diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties index 53e47d17..efd5a637 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties +++ b/powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties @@ -9,8 +9,7 @@ spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.maximum-pool-size=20 spring.datasource.core.minimum-idle=5 -####### MongoDB properties(Non-core configuration properties) ####### -####### delete mongodb config to disable mongodb ####### +####### Storage properties(Delete if not needed) ####### oms.storage.dfs.mongodb.uri=mongodb://localhost:27017/powerjob-product ####### Email properties(Non-core configuration properties) ####### From c91240c1b8911e3dbc6cdfeddc9e77ecbc19f796 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 14 Aug 2023 23:50:17 +0800 Subject: [PATCH 5/6] chore: change main version to 4.3.5 --- pom.xml | 2 +- powerjob-client/pom.xml | 6 +++--- powerjob-common/pom.xml | 4 ++-- powerjob-official-processors/pom.xml | 6 +++--- powerjob-remote/pom.xml | 2 +- powerjob-remote/powerjob-remote-benchmark/pom.xml | 6 +++--- powerjob-remote/powerjob-remote-framework/pom.xml | 6 +++--- powerjob-remote/powerjob-remote-impl-akka/pom.xml | 6 +++--- powerjob-remote/powerjob-remote-impl-http/pom.xml | 6 +++--- powerjob-server/pom.xml | 10 +++++----- powerjob-server/powerjob-server-common/pom.xml | 2 +- powerjob-server/powerjob-server-core/pom.xml | 2 +- powerjob-server/powerjob-server-extension/pom.xml | 2 +- powerjob-server/powerjob-server-migrate/pom.xml | 2 +- powerjob-server/powerjob-server-monitor/pom.xml | 2 +- powerjob-server/powerjob-server-persistence/pom.xml | 2 +- powerjob-server/powerjob-server-remote/pom.xml | 2 +- powerjob-server/powerjob-server-starter/pom.xml | 2 +- powerjob-worker-agent/pom.xml | 8 ++++---- powerjob-worker-samples/pom.xml | 8 ++++---- powerjob-worker-spring-boot-starter/pom.xml | 6 +++--- powerjob-worker/pom.xml | 12 ++++++------ 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 6008d9c4..8a714950 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ tech.powerjob powerjob - 4.3.4 + 4.3.5 pom powerjob http://www.powerjob.tech diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index fea0a769..6b101f20 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -5,18 +5,18 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-client - 4.3.4 + 4.3.5 jar 5.9.1 1.2.83 - 4.3.4 + 4.3.5 3.2.4 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index a168f772..71696144 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-common - 4.3.4 + 4.3.5 jar diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml index f3088354..11f21c4b 100644 --- a/powerjob-official-processors/pom.xml +++ b/powerjob-official-processors/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-official-processors - 4.3.4 + 4.3.5 jar @@ -20,7 +20,7 @@ 5.9.1 1.2.9 - 4.3.4 + 4.3.5 5.2.9.RELEASE 2.1.214 8.0.28 diff --git a/powerjob-remote/pom.xml b/powerjob-remote/pom.xml index dbc9800c..a7e81eb1 100644 --- a/powerjob-remote/pom.xml +++ b/powerjob-remote/pom.xml @@ -5,7 +5,7 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 pom diff --git a/powerjob-remote/powerjob-remote-benchmark/pom.xml b/powerjob-remote/powerjob-remote-benchmark/pom.xml index 081a1082..4333442c 100644 --- a/powerjob-remote/powerjob-remote-benchmark/pom.xml +++ b/powerjob-remote/powerjob-remote-benchmark/pom.xml @@ -5,7 +5,7 @@ powerjob-remote tech.powerjob - 4.3.4 + 4.3.5 4.0.0 @@ -21,8 +21,8 @@ 1.2.9 2.7.4 - 4.3.4 - 4.3.4 + 4.3.5 + 4.3.5 3.9.0 4.2.9 diff --git a/powerjob-remote/powerjob-remote-framework/pom.xml b/powerjob-remote/powerjob-remote-framework/pom.xml index e2e86d76..9bd6e7ca 100644 --- a/powerjob-remote/powerjob-remote-framework/pom.xml +++ b/powerjob-remote/powerjob-remote-framework/pom.xml @@ -5,11 +5,11 @@ powerjob-remote tech.powerjob - 4.3.4 + 4.3.5 4.0.0 - 4.3.4 + 4.3.5 powerjob-remote-framework @@ -17,7 +17,7 @@ 8 UTF-8 - 4.3.4 + 4.3.5 0.10.2 diff --git a/powerjob-remote/powerjob-remote-impl-akka/pom.xml b/powerjob-remote/powerjob-remote-impl-akka/pom.xml index f511e5be..7599031c 100644 --- a/powerjob-remote/powerjob-remote-impl-akka/pom.xml +++ b/powerjob-remote/powerjob-remote-impl-akka/pom.xml @@ -5,19 +5,19 @@ powerjob-remote tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-remote-impl-akka - 4.3.4 + 4.3.5 8 8 UTF-8 - 4.3.4 + 4.3.5 2.6.13 diff --git a/powerjob-remote/powerjob-remote-impl-http/pom.xml b/powerjob-remote/powerjob-remote-impl-http/pom.xml index 6a58f504..12e3e729 100644 --- a/powerjob-remote/powerjob-remote-impl-http/pom.xml +++ b/powerjob-remote/powerjob-remote-impl-http/pom.xml @@ -5,12 +5,12 @@ powerjob-remote tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-remote-impl-http - 4.3.4 + 4.3.5 8 @@ -18,7 +18,7 @@ UTF-8 4.3.7 - 4.3.4 + 4.3.5 diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index fa515f27..cc097c96 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-server - 4.3.4 + 4.3.5 pom @@ -50,9 +50,9 @@ 3.0.10 9.1.6 - 4.3.4 - 4.3.4 - 4.3.4 + 4.3.5 + 4.3.5 + 4.3.5 1.6.14 3.17.1 4.4 diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml index 946f8b24..895fdbe6 100644 --- a/powerjob-server/powerjob-server-common/pom.xml +++ b/powerjob-server/powerjob-server-common/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml index c85431a9..a40a6636 100644 --- a/powerjob-server/powerjob-server-core/pom.xml +++ b/powerjob-server/powerjob-server-core/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml index 6f90723c..ef118d3e 100644 --- a/powerjob-server/powerjob-server-extension/pom.xml +++ b/powerjob-server/powerjob-server-extension/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml index f4f54b1c..1e9844a7 100644 --- a/powerjob-server/powerjob-server-migrate/pom.xml +++ b/powerjob-server/powerjob-server-migrate/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-monitor/pom.xml b/powerjob-server/powerjob-server-monitor/pom.xml index ebe7c793..a0681e18 100644 --- a/powerjob-server/powerjob-server-monitor/pom.xml +++ b/powerjob-server/powerjob-server-monitor/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml index 48b275de..e51b54a9 100644 --- a/powerjob-server/powerjob-server-persistence/pom.xml +++ b/powerjob-server/powerjob-server-persistence/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml index 6a43bc30..ffde4d3f 100644 --- a/powerjob-server/powerjob-server-remote/pom.xml +++ b/powerjob-server/powerjob-server-remote/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml index d7b40670..a6e61c10 100644 --- a/powerjob-server/powerjob-server-starter/pom.xml +++ b/powerjob-server/powerjob-server-starter/pom.xml @@ -5,7 +5,7 @@ powerjob-server tech.powerjob - 4.3.4 + 4.3.5 ../pom.xml 4.0.0 diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index e8aba22e..d7c0174a 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -5,24 +5,24 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-worker-agent - 4.3.4 + 4.3.5 jar - 4.3.4 + 4.3.5 1.2.9 4.3.2 5.3.23 2.3.4.RELEASE - 4.3.4 + 4.3.5 8.0.28 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index b3decf98..34b5b57d 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -5,18 +5,18 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-worker-samples - 4.3.4 + 4.3.5 2.7.4 - 4.3.4 + 4.3.5 1.2.83 - 4.3.4 + 4.3.5 true diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index 73f81b69..fdab9e40 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -5,16 +5,16 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-worker-spring-boot-starter - 4.3.4 + 4.3.5 jar - 4.3.4 + 4.3.5 2.7.4 diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index 3297a182..40a60fde 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 4.3.4 + 4.3.5 4.0.0 powerjob-worker - 4.3.4 + 4.3.5 jar @@ -21,10 +21,10 @@ 1.2.9 - 4.3.4 - 4.3.4 - 4.3.4 - 4.3.4 + 4.3.5 + 4.3.5 + 4.3.5 + 4.3.5 From 0d359b8a8ef53a01d121236d43cce924ce0c1954 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 14 Aug 2023 23:56:50 +0800 Subject: [PATCH 6/6] docs: optimize README --- README_zhCN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zhCN.md b/README_zhCN.md index dc934d3f..c49ed0ee 100644 --- a/README_zhCN.md +++ b/README_zhCN.md @@ -20,7 +20,7 @@ PowerJob(原OhMyScheduler)是全新一代分布式调度与计算框架, * DAG工作流支持:支持在线配置任务依赖关系,可视化得对任务进行编排,同时还支持上下游任务间的数据传递 * 执行器支持广泛:支持Spring Bean、内置/外置Java类、Shell、Python等处理器,应用范围广。 * 运维便捷:支持在线日志功能,执行器产生的日志可以在前端控制台页面实时显示,降低debug成本,极大地提高开发效率。 -* 依赖精简:最小仅依赖关系型数据库(MySQL/Oracle/MS SQLServer...),扩展依赖为MongoDB(用于存储庞大的在线日志)。 +* 依赖精简:最小仅依赖关系型数据库(MySQL/Oracle/MS SQLServer...)。 * 高可用&高性能:调度服务器经过精心设计,一改其他调度框架基于数据库锁的策略,实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升(支持无限的水平扩展)。 * 故障转移与恢复:任务执行失败后,可根据配置的重试策略完成重试,只要执行器集群有足够的计算节点,任务就能顺利完成。