Browse Source

feat: add database dirver for powerjob-worker-agent to support dynamic sql processor

tjq 4 years ago
parent
commit
4399f99c42

+ 1 - 1
README.md

@@ -6,7 +6,7 @@
 
 <p align="center">
 <a href="https://github.com/PowerJob/PowerJob/actions"><img src="https://github.com/PowerJob/PowerJob/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master" alt="actions"></a>
-<a href="https://search.maven.org/search?q=com.github.kfcfans"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.github.kfcfans/powerjob-worker"></a>
+<a href="https://search.maven.org/search?q=tech.powerjob"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/tech.powerjob/powerjob-worker"></a>
 <a href="https://github.com/PowerJob/PowerJob/releases"><img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/kfcfans/powerjob?color=%23E59866"></a>
 <a href="https://github.com/PowerJob/PowerJob/blob/master/LICENSE"><img src="https://img.shields.io/github/license/KFCFans/PowerJob" alt="LICENSE"></a>
 </p>

+ 1 - 1
README_zhCN.md

@@ -6,7 +6,7 @@
 
 <p align="center">
 <a href="https://github.com/PowerJob/PowerJob/actions"><img src="https://github.com/PowerJob/PowerJob/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master" alt="actions"></a>
-<a href="https://search.maven.org/search?q=com.github.kfcfans"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.github.kfcfans/powerjob-worker"></a>
+<a href="https://search.maven.org/search?q=tech.powerjob"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/tech.powerjob/powerjob-worker"></a>
 <a href="https://github.com/PowerJob/PowerJob/releases"><img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/kfcfans/powerjob?color=%23E59866"></a>
 <a href="https://github.com/PowerJob/PowerJob/blob/master/LICENSE"><img src="https://img.shields.io/github/license/KFCFans/PowerJob" alt="LICENSE"></a>
 </p>

+ 1 - 1
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);

+ 1 - 1
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<List<JobInfoDTO>> jobQueryResult = powerJobClient.queryJob(jobInfoQuery);
         System.out.println(JSON.toJSONString(jobQueryResult));

+ 1 - 1
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);

+ 1 - 1
powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml

@@ -25,7 +25,7 @@
         <appender-ref ref="CONSOLE"/>
     </logger>
 
-    <logger name="com.github.kfcfans.powerjob" level="DEBUG" additivity="false">
+    <logger name="tech.powerjob" level="DEBUG" additivity="false">
         <appender-ref ref="CONSOLE"/>
     </logger>
 

+ 44 - 1
powerjob-worker-agent/pom.xml

@@ -19,9 +19,16 @@
         <logback.version>1.2.3</logback.version>
         <picocli.version>4.3.2</picocli.version>
 
-        <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
+        <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
 
         <powerjob.official.processors.version>1.1.0</powerjob.official.processors.version>
+
+        <!-- dependency for dynamic sql processor -->
+        <mysql.version>8.0.19</mysql.version>
+        <ojdbc.version>19.7.0.0</ojdbc.version>
+        <mssql-jdbc.version>7.4.1.jre8</mssql-jdbc.version>
+        <db2-jdbc.version>11.5.0.0</db2-jdbc.version>
+        <postgresql.version>42.2.14</postgresql.version>
     </properties>
 
     <dependencies>
@@ -55,6 +62,42 @@
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
         </dependency>
+
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
+        </dependency>
+        <!-- oracle -->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>${ojdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>${ojdbc.version}</version>
+        </dependency>
+        <!-- sqlserver -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>${mssql-jdbc.version}</version>
+        </dependency>
+        <!-- db2 -->
+        <dependency>
+            <groupId>com.ibm.db2</groupId>
+            <artifactId>jcc</artifactId>
+            <version>${db2-jdbc.version}</version>
+        </dependency>
+        <!-- postgresql -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+        </dependency>
     </dependencies>
 
 

+ 2 - 2
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);
         }
     }

+ 1 - 1
powerjob-worker-samples/pom.xml

@@ -13,7 +13,7 @@
     <version>4.0.0</version>
 
     <properties>
-        <springboot.version>2.2.6.RELEASE</springboot.version>
+        <springboot.version>2.3.4.RELEASE</springboot.version>
         <powerjob.worker.starter.version>4.0.0</powerjob.worker.starter.version>
         <fastjson.version>1.2.68</fastjson.version>
         <powerjob.official.processors.version>1.1.0</powerjob.official.processors.version>

+ 1 - 1
powerjob-worker-samples/src/main/resources/logback.xml

@@ -16,7 +16,7 @@
         <appender-ref ref="STDOUT"/>
     </logger>
 
-    <logger name="com.github.kfcfans.powerjob" level="DEBUG" additivity="false">
+    <logger name="tech.powerjob" level="DEBUG" additivity="false">
         <appender-ref ref="STDOUT"/>
     </logger>
 

+ 1 - 1
powerjob-worker-spring-boot-starter/pom.xml

@@ -15,7 +15,7 @@
 
     <properties>
         <powerjob.worker.version>4.0.0</powerjob.worker.version>
-        <springboot.version>2.2.6.RELEASE</springboot.version>
+        <springboot.version>2.3.4.RELEASE</springboot.version>
     </properties>
 
     <dependencies>

+ 1 - 1
powerjob-worker/src/test/resources/logback-test.xml

@@ -16,7 +16,7 @@
         <appender-ref ref="STDOUT"/>
     </logger>
 
-    <logger name="com.github.kfcfans.powerjob" level="DEBUG" additivity="false">
+    <logger name="tech.powerjob" level="DEBUG" additivity="false">
         <appender-ref ref="STDOUT"/>
     </logger>