feat: update sql for new DO

others/oms-sql.sql

@@ -1,15 +1,17 @@
 /*
  Navicat Premium Data Transfer
 
+ Source Server         : Local MySQL
  Source Server Type    : MySQL
- Source Server Version : 80020
+ Source Server Version : 80021
- Source Schema         : powerjob-product
+ Source Host           : localhost:3306
+ Source Schema         : powerjob-daily
 
  Target Server Type    : MySQL
- Target Server Version : 80020
+ Target Server Version : 80021
  File Encoding         : 65001
 
- Date: 23/06/2020 22:30:06
+ Date: 08/10/2020 12:39:10
 */
 
 SET NAMES utf8mb4;
@@ -28,7 +30,7 @@ CREATE TABLE `app_info` (
   `password` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `appNameUK` (`app_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for container_info
@@ -62,10 +64,10 @@ CREATE TABLE `instance_info` (
   `gmt_create` datetime(6) DEFAULT NULL,
   `gmt_modified` datetime(6) DEFAULT NULL,
   `instance_id` bigint DEFAULT NULL,
-  `instance_params` text,
+  `instance_params` longtext,
   `job_id` bigint DEFAULT NULL,
   `last_report_time` bigint DEFAULT NULL,
-  `result` text,
+  `result` longtext,
   `running_times` bigint DEFAULT NULL,
   `status` int DEFAULT NULL,
   `task_tracker_address` varchar(255) DEFAULT NULL,
@@ -75,7 +77,7 @@ CREATE TABLE `instance_info` (
   KEY `IDX5b1nhpe5je7gc5s1ur200njr7` (`job_id`),
   KEY `IDXjnji5lrr195kswk6f7mfhinrs` (`app_id`),
   KEY `IDXa98hq3yu0l863wuotdjl7noum` (`instance_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for job_info
@@ -101,7 +103,7 @@ CREATE TABLE `job_info` (
   `min_memory_space` double NOT NULL,
   `next_trigger_time` bigint DEFAULT NULL,
   `notify_user_ids` varchar(255) DEFAULT NULL,
-  `processor_info` text,
+  `processor_info` longtext,
   `processor_type` int DEFAULT NULL,
   `status` int DEFAULT NULL,
   `task_retry_num` int DEFAULT NULL,
@@ -109,7 +111,7 @@ CREATE TABLE `job_info` (
   `time_expression_type` int DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `IDXk2xprmn3lldmlcb52i36udll1` (`app_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for oms_lock
@@ -124,7 +126,7 @@ CREATE TABLE `oms_lock` (
   `ownerip` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `lockNameUK` (`lock_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for server_info
@@ -166,7 +168,7 @@ CREATE TABLE `workflow_info` (
   `max_wf_instance_num` int DEFAULT NULL,
   `next_trigger_time` bigint DEFAULT NULL,
   `notify_user_ids` varchar(255) DEFAULT NULL,
-  `pedag` text,
+  `pedag` longtext,
   `status` int DEFAULT NULL,
   `time_expression` varchar(255) DEFAULT NULL,
   `time_expression_type` int DEFAULT NULL,
@@ -174,7 +176,7 @@ CREATE TABLE `workflow_info` (
   `wf_name` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `IDX7uo5w0e3beeho3fnx9t7eiol3` (`app_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for workflow_instance_info
@@ -184,15 +186,16 @@ CREATE TABLE `workflow_instance_info` (
   `id` bigint NOT NULL AUTO_INCREMENT,
   `actual_trigger_time` bigint DEFAULT NULL,
   `app_id` bigint DEFAULT NULL,
-  `dag` text,
+  `dag` longtext,
   `finished_time` bigint DEFAULT NULL,
   `gmt_create` datetime(6) DEFAULT NULL,
   `gmt_modified` datetime(6) DEFAULT NULL,
-  `result` text,
+  `result` longtext,
   `status` int DEFAULT NULL,
+  `wf_init_params` longtext,
   `wf_instance_id` bigint DEFAULT NULL,
   `workflow_id` bigint DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

powerjob-client/src/test/java/TestWorkflow.java

@@ -1,7 +1,11 @@
 import com.github.kfcfans.powerjob.client.OhMyClient;
+import com.github.kfcfans.powerjob.common.ExecuteType;
+import com.github.kfcfans.powerjob.common.ProcessorType;
 import com.github.kfcfans.powerjob.common.TimeExpressionType;
 import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG;
+import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest;
 import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest;
+import com.github.kfcfans.powerjob.common.utils.JsonUtils;
 import com.google.common.collect.Lists;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -20,7 +24,23 @@ public class TestWorkflow {
 
     @BeforeAll
     public static void initClient() throws Exception {
-        ohMyClient = new OhMyClient("127.0.0.1:7700", "oms-test", null);
+        ohMyClient = new OhMyClient("127.0.0.1:7700", "powerjob-agent-test", "123");
+    }
+
+    @Test
+    public void initTestData() throws Exception {
+        SaveJobInfoRequest base = new SaveJobInfoRequest();
+        base.setJobName("DAG-Node-");
+        base.setTimeExpressionType(TimeExpressionType.WORKFLOW);
+        base.setExecuteType(ExecuteType.STANDALONE);
+        base.setProcessorType(ProcessorType.EMBEDDED_JAVA);
+        base.setProcessorInfo("com.github.kfcfans.powerjob.samples.workflow.WorkflowStandaloneProcessor");
+
+        for (int i = 0; i < 5; i++) {
+            SaveJobInfoRequest request = JsonUtils.parseObject(JsonUtils.toBytes(base), SaveJobInfoRequest.class);
+            request.setJobName(request.getJobName() + i);
+            System.out.println(ohMyClient.saveJob(request));
+        }
     }
 
     @Test
@@ -30,8 +50,8 @@ public class TestWorkflow {
         List<PEWorkflowDAG.Node> nodes = Lists.newLinkedList();
         List<PEWorkflowDAG.Edge> edges = Lists.newLinkedList();
 
-        nodes.add(new PEWorkflowDAG.Node(1L, "node-1"));
+        nodes.add(new PEWorkflowDAG.Node(1L, "DAG-Node-1"));
-        nodes.add(new PEWorkflowDAG.Node(2L, "node-2"));
+        nodes.add(new PEWorkflowDAG.Node(2L, "DAG-Node-2"));
 
         edges.add(new PEWorkflowDAG.Edge(1L, 2L));
 
@@ -81,4 +101,10 @@ public class TestWorkflow {
     public void testFetchWfInstanceInfo() throws Exception {
         System.out.println(ohMyClient.fetchWorkflowInstanceInfo(149962433421639744L));
     }
+
+    @Test
+    public void testRunWorkflowPlus() throws Exception {
+        System.out.println(ohMyClient.runWorkflow(1L, "this is init Params 1", 0));
+        System.out.println(ohMyClient.runWorkflow(1L, "this is init Params 2", 30));
+    }
 }

powerjob-server/src/main/resources/application-daily.properties

@@ -11,7 +11,7 @@ spring.datasource.core.hikari.minimum-idle=5
 
 ####### mongoDB配置，非核心依赖，通过配置 oms.mongodb.enable=false 来关闭 #######
 oms.mongodb.enable=true
-spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-daily
+spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-daily
 
 ####### 邮件配置（不需要邮件报警可以删除以下配置来避免报错） #######
 spring.mail.host=smtp.163.com