From 4399f99c4236e50fecbc254488c0546b673bb1a6 Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 21 Mar 2021 14:15:23 +0800 Subject: [PATCH] feat: add database dirver for powerjob-worker-agent to support dynamic sql processor --- README.md | 2 +- README_zhCN.md | 2 +- .../tech/powerjob/client/test/TestClient.java | 2 +- .../tech/powerjob/client/test/TestQuery.java | 2 +- .../powerjob/client/test/TestWorkflow.java | 2 +- .../src/main/resources/logback-dev.xml | 2 +- powerjob-worker-agent/pom.xml | 45 ++++++++++++++++++- .../tech/powerjob/agent/MainApplication.java | 4 +- powerjob-worker-samples/pom.xml | 2 +- .../src/main/resources/logback.xml | 2 +- powerjob-worker-spring-boot-starter/pom.xml | 2 +- .../src/test/resources/logback-test.xml | 2 +- 12 files changed, 56 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e00e826b..2c6e773a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

actions -Maven Central +Maven Central GitHub release (latest SemVer) LICENSE

diff --git a/README_zhCN.md b/README_zhCN.md index 10aa446e..6eb9c4a9 100644 --- a/README_zhCN.md +++ b/README_zhCN.md @@ -6,7 +6,7 @@

actions -Maven Central +Maven Central GitHub release (latest SemVer) LICENSE

diff --git a/powerjob-client/src/test/java/tech/powerjob/client/test/TestClient.java b/powerjob-client/src/test/java/tech/powerjob/client/test/TestClient.java index 677d683d..f79a4dba 100644 --- a/powerjob-client/src/test/java/tech/powerjob/client/test/TestClient.java +++ b/powerjob-client/src/test/java/tech/powerjob/client/test/TestClient.java @@ -38,7 +38,7 @@ class TestClient extends ClientInitializer { newJobInfo.setTimeExpression("0 0 * * * ? "); newJobInfo.setExecuteType(ExecuteType.STANDALONE); newJobInfo.setProcessorType(ProcessorType.BUILT_IN); - newJobInfo.setProcessorInfo("com.github.kfcfans.powerjob.samples.processors.StandaloneProcessorDemo"); + newJobInfo.setProcessorInfo("tech.powerjob.samples.processors.StandaloneProcessorDemo"); newJobInfo.setDesignatedWorkers(""); newJobInfo.setMinCpuCores(1.1); diff --git a/powerjob-client/src/test/java/tech/powerjob/client/test/TestQuery.java b/powerjob-client/src/test/java/tech/powerjob/client/test/TestQuery.java index a0153baf..93e3e2ef 100644 --- a/powerjob-client/src/test/java/tech/powerjob/client/test/TestQuery.java +++ b/powerjob-client/src/test/java/tech/powerjob/client/test/TestQuery.java @@ -39,7 +39,7 @@ class TestQuery extends ClientInitializer { .setGmtCreateLt(DateUtils.addDays(new Date(), 10)) .setExecuteTypeIn(Lists.newArrayList(ExecuteType.STANDALONE.getV(), ExecuteType.BROADCAST.getV(), ExecuteType.MAP_REDUCE.getV())) .setProcessorTypeIn(Lists.newArrayList(ProcessorType.BUILT_IN.getV(), ProcessorType.SHELL.getV(), ProcessorType.EXTERNAL.getV())) - .setProcessorInfoLike("com.github.kfcfans"); + .setProcessorInfoLike("tech.powerjob"); ResultDTO> jobQueryResult = powerJobClient.queryJob(jobInfoQuery); System.out.println(JSON.toJSONString(jobQueryResult)); diff --git a/powerjob-client/src/test/java/tech/powerjob/client/test/TestWorkflow.java b/powerjob-client/src/test/java/tech/powerjob/client/test/TestWorkflow.java index e40904b6..75d6cae2 100644 --- a/powerjob-client/src/test/java/tech/powerjob/client/test/TestWorkflow.java +++ b/powerjob-client/src/test/java/tech/powerjob/client/test/TestWorkflow.java @@ -38,7 +38,7 @@ class TestWorkflow extends ClientInitializer { base.setTimeExpressionType(TimeExpressionType.WORKFLOW); base.setExecuteType(ExecuteType.STANDALONE); base.setProcessorType(ProcessorType.BUILT_IN); - base.setProcessorInfo("com.github.kfcfans.powerjob.samples.workflow.WorkflowStandaloneProcessor"); + base.setProcessorInfo("tech.powerjob.samples.workflow.WorkflowStandaloneProcessor"); for (int i = 0; i < 5; i++) { SaveJobInfoRequest request = JSONObject.parseObject(JSONObject.toJSONBytes(base), SaveJobInfoRequest.class); diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml b/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml index 3b1d6467..1c58dc7c 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml +++ b/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml @@ -25,7 +25,7 @@ - + diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index da5f7e0a..d56bdae9 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -19,9 +19,16 @@ 1.2.3 4.3.2 - 2.2.6.RELEASE + 2.3.4.RELEASE 1.1.0 + + + 8.0.19 + 19.7.0.0 + 7.4.1.jre8 + 11.5.0.0 + 42.2.14 @@ -55,6 +62,42 @@ logback-classic ${logback.version} + + + + mysql + mysql-connector-java + ${mysql.version} + + + + com.oracle.database.jdbc + ojdbc8 + ${ojdbc.version} + + + com.oracle.database.nls + orai18n + ${ojdbc.version} + + + + com.microsoft.sqlserver + mssql-jdbc + ${mssql-jdbc.version} + + + + com.ibm.db2 + jcc + ${db2-jdbc.version} + + + + org.postgresql + postgresql + ${postgresql.version} + diff --git a/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java b/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java index 00f9b0e6..c8ca2e36 100644 --- a/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java +++ b/powerjob-worker-agent/src/main/java/tech/powerjob/agent/MainApplication.java @@ -18,7 +18,7 @@ import picocli.CommandLine.Option; * @since 2020/5/20 */ @Slf4j -@Command(name = "OhMyAgent", mixinStandardHelpOptions = true, version = "3.4.7", description = "powerjob-worker agent") +@Command(name = "PowerJobAgent", mixinStandardHelpOptions = true, version = "4.0.0", description = "powerjob-worker agent") public class MainApplication implements Runnable { @Option(names = {"-a", "--app"}, description = "worker-agent's name", required = true) @@ -58,7 +58,7 @@ public class MainApplication implements Runnable { worker.init(); }catch (Exception e) { - log.error("[OhMyAgent] startup failed by config: {}.", cfg, e); + log.error("[PowerJobAgent] startup failed by config: {}.", cfg, e); ExceptionUtils.rethrow(e); } } diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index 7fa98cb1..afe99262 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -13,7 +13,7 @@ 4.0.0 - 2.2.6.RELEASE + 2.3.4.RELEASE 4.0.0 1.2.68 1.1.0 diff --git a/powerjob-worker-samples/src/main/resources/logback.xml b/powerjob-worker-samples/src/main/resources/logback.xml index 4d63c229..d937c028 100644 --- a/powerjob-worker-samples/src/main/resources/logback.xml +++ b/powerjob-worker-samples/src/main/resources/logback.xml @@ -16,7 +16,7 @@ - + diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index 72794c47..8097e1b9 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -15,7 +15,7 @@ 4.0.0 - 2.2.6.RELEASE + 2.3.4.RELEASE diff --git a/powerjob-worker/src/test/resources/logback-test.xml b/powerjob-worker/src/test/resources/logback-test.xml index 4e9e8bfa..97891583 100644 --- a/powerjob-worker/src/test/resources/logback-test.xml +++ b/powerjob-worker/src/test/resources/logback-test.xml @@ -16,7 +16,7 @@ - +