From 075ecd8a84ae61b3419db3594663875ded5d565e Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 9 Mar 2024 15:55:19 +0800 Subject: [PATCH] chore: merge 5.0.0 and 4.3.9 to 5.0.1 --- others/powerjob-mysql.sql | 34 +++++-------------- 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-benchmark/pom.xml | 6 ++-- .../powerjob-remote-framework/pom.xml | 6 ++-- .../powerjob-remote-impl-akka/pom.xml | 6 ++-- .../powerjob-remote-impl-http/pom.xml | 6 ++-- powerjob-server/pom.xml | 20 +++++------ powerjob-server/powerjob-server-auth/pom.xml | 2 +- .../powerjob-server-common/pom.xml | 2 +- powerjob-server/powerjob-server-core/pom.xml | 2 +- .../powerjob-server-extension/pom.xml | 2 +- .../powerjob-server-migrate/pom.xml | 2 +- .../powerjob-server-monitor/pom.xml | 2 +- .../powerjob-server-persistence/pom.xml | 6 ++-- .../powerjob-server-remote/pom.xml | 2 +- .../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 +++---- 24 files changed, 69 insertions(+), 85 deletions(-) diff --git a/others/powerjob-mysql.sql b/others/powerjob-mysql.sql index 7801a2e4..6d516bb8 100644 --- a/others/powerjob-mysql.sql +++ b/others/powerjob-mysql.sql @@ -1,20 +1,22 @@ /* - 官方 SQL 仅基于特定版本(MySQL8)导出,不一定兼容其他数据库,也不一定兼容其他版本。此 SQL 仅供参考。 - 如果您的数据库无法使用此 SQL,建议使用 SpringDataJPA 自带的建表能力,先在开发环境直连测试库自动建表,然后自行导出相关的 SQL 即可。 +官方 SQL 仅基于特定版本(MySQL8)导出,不一定兼容其他数据库,也不一定兼容其他版本。此 SQL 仅供参考。 +如果您的数据库无法使用此 SQL,建议使用 SpringDataJPA 自带的建表能力,先在开发环境直连测试库自动建表,然后自行导出相关的 SQL 即可。 + */ +/* Navicat Premium Data Transfer Source Server : Local@3306 Source Server Type : MySQL Source Server Version : 80300 (8.3.0) Source Host : localhost:3306 - Source Schema : powerjob500 + Source Schema : powerjob5 Target Server Type : MySQL Target Server Version : 80300 (8.3.0) File Encoding : 65001 - Date: 17/02/2024 22:20:07 + Date: 09/03/2024 15:52:04 */ SET NAMES utf8mb4; @@ -95,11 +97,13 @@ CREATE TABLE `instance_info` ( DROP TABLE IF EXISTS `job_info`; CREATE TABLE `job_info` ( `id` bigint NOT NULL AUTO_INCREMENT, + `advanced_runtime_config` varchar(255) DEFAULT NULL, `alarm_config` varchar(255) DEFAULT NULL, `app_id` bigint DEFAULT NULL, `concurrency` int DEFAULT NULL, `designated_workers` varchar(255) DEFAULT NULL, `dispatch_strategy` int DEFAULT NULL, + `dispatch_strategy_config` varchar(255) DEFAULT NULL, `execute_type` int DEFAULT NULL, `extra` varchar(255) DEFAULT NULL, `gmt_create` datetime(6) DEFAULT NULL, @@ -163,26 +167,7 @@ CREATE TABLE `oms_lock` ( `ownerip` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `uidx01_oms_lock` (`lock_name`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; - --- ---------------------------- --- Table structure for powerjob_files --- ---------------------------- -DROP TABLE IF EXISTS `powerjob_files`; -CREATE TABLE `powerjob_files` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `bucket` varchar(255) NOT NULL COMMENT '分桶', - `name` varchar(255) NOT NULL COMMENT '文件名称', - `version` varchar(255) NOT NULL COMMENT '版本', - `meta` varchar(255) DEFAULT NULL COMMENT '元数据', - `length` bigint NOT NULL COMMENT '长度', - `status` int NOT NULL COMMENT '状态', - `data` longblob NOT NULL COMMENT '文件内容', - `extra` varchar(255) DEFAULT NULL COMMENT '其他信息', - `gmt_create` datetime NOT NULL COMMENT '创建时间', - `gmt_modified` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Table structure for pwjb_user_info @@ -340,4 +325,3 @@ CREATE TABLE `workflow_node_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; SET FOREIGN_KEY_CHECKS = 1; - diff --git a/pom.xml b/pom.xml index df64de5a..2202fb0e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ tech.powerjob powerjob - 5.0.0-beta2 + 5.0.1-beta pom powerjob http://www.powerjob.tech diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index 5f779289..bd883c09 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -5,18 +5,18 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-client - 5.0.0-beta2 + 5.0.1-beta jar 5.9.1 1.2.83 - 5.0.0-beta2 + 5.0.1-beta 3.2.4 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index 86b1fa7f..851dfcd9 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-common - 5.0.0-beta2 + 5.0.1-beta jar diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml index 4425c658..7cfe9c31 100644 --- a/powerjob-official-processors/pom.xml +++ b/powerjob-official-processors/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-official-processors - 5.0.0-beta2 + 5.0.1-beta jar @@ -20,7 +20,7 @@ 5.9.1 1.2.13 - 5.0.0-beta2 + 5.0.1-beta 2.2.224 8.0.28 5.3.31 diff --git a/powerjob-remote/pom.xml b/powerjob-remote/pom.xml index 296125b4..70d2e555 100644 --- a/powerjob-remote/pom.xml +++ b/powerjob-remote/pom.xml @@ -5,7 +5,7 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 pom diff --git a/powerjob-remote/powerjob-remote-benchmark/pom.xml b/powerjob-remote/powerjob-remote-benchmark/pom.xml index afb25789..7e937738 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 - 5.0.0-beta2 + 5.0.1-beta 4.0.0 @@ -21,8 +21,8 @@ 1.2.13 2.7.18 - 5.0.0-beta2 - 5.0.0-beta2 + 5.0.1-beta + 5.0.1-beta 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 64369ab8..32b5a2d5 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 - 5.0.0-beta2 + 5.0.1-beta 4.0.0 - 5.0.0-beta2 + 5.0.1-beta powerjob-remote-framework @@ -17,7 +17,7 @@ 8 UTF-8 - 5.0.0-beta2 + 5.0.1-beta 0.10.2 diff --git a/powerjob-remote/powerjob-remote-impl-akka/pom.xml b/powerjob-remote/powerjob-remote-impl-akka/pom.xml index 7bb8b017..f47d5489 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 - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-remote-impl-akka - 5.0.0-beta2 + 5.0.1-beta 8 8 UTF-8 - 5.0.0-beta2 + 5.0.1-beta 2.6.13 diff --git a/powerjob-remote/powerjob-remote-impl-http/pom.xml b/powerjob-remote/powerjob-remote-impl-http/pom.xml index efdbee20..fa0d43fd 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 - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-remote-impl-http - 5.0.0-beta2 + 5.0.1-beta 8 @@ -18,7 +18,7 @@ UTF-8 4.3.7 - 5.0.0-beta2 + 5.0.1-beta diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index e74a1876..8613a597 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-server - 5.0.0-beta2 + 5.0.1-beta pom @@ -51,12 +51,12 @@ 3.0.10 9.2.1 - 5.0.0-beta2 - 5.0.0-beta2 - 5.0.0-beta2 + 5.0.1-beta + 5.0.1-beta + 5.0.1-beta 1.6.14 3.17.1 - 8.5.2 + 1.12.665 4.4 @@ -120,11 +120,11 @@ aliyun-sdk-oss ${aliyun-sdk-oss.version} - + - io.minio - minio - ${minio.version} + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} diff --git a/powerjob-server/powerjob-server-auth/pom.xml b/powerjob-server/powerjob-server-auth/pom.xml index 1da713a0..006529f2 100644 --- a/powerjob-server/powerjob-server-auth/pom.xml +++ b/powerjob-server/powerjob-server-auth/pom.xml @@ -6,7 +6,7 @@ tech.powerjob powerjob-server - 5.0.0-beta2 + 5.0.1-beta 4.0.0 diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml index 3cc6c82d..cdd037fd 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml index d8fbfc46..8afa4f8d 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml index 01a8cd5c..b6c64605 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml index e1fbbbb7..65fd2913 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-monitor/pom.xml b/powerjob-server/powerjob-server-monitor/pom.xml index e72663b5..bb661cb9 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml index ec5011ed..fcb06f5f 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 @@ -41,8 +41,8 @@ aliyun-sdk-oss - io.minio - minio + com.amazonaws + aws-java-sdk-s3 diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml index 852d6887..5fd3180c 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml index 128ffd38..41d3dcfb 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 - 5.0.0-beta2 + 5.0.1-beta ../pom.xml 4.0.0 diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index 7bf6afd4..74efa114 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -5,24 +5,24 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-worker-agent - 5.0.0-beta2 + 5.0.1-beta jar - 5.0.0-beta2 + 5.0.1-beta 1.2.13 4.3.2 5.3.31 2.3.4.RELEASE - 5.0.0-beta2 + 5.0.1-beta 8.0.28 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index 0d722c88..5c2e05ad 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -5,18 +5,18 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-worker-samples - 5.0.0-beta2 + 5.0.1-beta 2.7.18 - 5.0.0-beta2 + 5.0.1-beta 1.2.83 - 5.0.0-beta2 + 5.0.1-beta true diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index c8e1232d..5d887753 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -5,16 +5,16 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-worker-spring-boot-starter - 5.0.0-beta2 + 5.0.1-beta jar - 5.0.0-beta2 + 5.0.1-beta 2.7.18 diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index ee6e4f3a..b70b9554 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -5,12 +5,12 @@ powerjob tech.powerjob - 5.0.0-beta2 + 5.0.1-beta 4.0.0 powerjob-worker - 5.0.0-beta2 + 5.0.1-beta jar @@ -21,10 +21,10 @@ 1.2.13 - 5.0.0-beta2 - 5.0.0-beta2 - 5.0.0-beta2 - 5.0.0-beta2 + 5.0.1-beta + 5.0.1-beta + 5.0.1-beta + 5.0.1-beta