Merge pull request #86 from stelin/main

Add delay template

README-zh.md

@@ -1,30 +1,62 @@
+<p align="center">
+  <a href="https://openjob.io">
+    <img alt="openjob" src="./public/image/logo.png">
+  </a>
+</p>
+
+<p align="center">
+  一款分布式高性能任务调度框架
+</p>
+
 ## 介绍
-Openjob 是一款分布式高性能任务调度框架，支持多种定时任务和延时任务，采用无中心化设计，支持无线扩容。
+Openjob 是一款分布式高性能任务调度框架，支持多种定时任务、延时任务、工作流设计，采用无中心化架构，底层使用一致性分片算法，支持无线扩容。
 ## 特性
 ##### 高可靠
-分布式无状态设计，Master/Worker 架构，只依赖一种数据库(MySQL/PostgreSQL/Oracle)
+分布式无状态设计，采用 Master/Worker 架构，只依赖一种数据库(MySQL/PostgreSQL/Oracle)
 ##### 高性能
-任务调度精确到秒级别，支持轻量级分布式计算，任务采用分片算法，支持无限扩容。
+任务调度精确到秒级别，支持轻量级分布式计算，底层使用一致性分片算法，支持无限扩容。
 ##### 定时调度
 支持分布式定时任务、固定频率任务、高性能秒级任务、一次性任务定时调度。
 ##### 分布式计算
 支持单机、广播、Map、MapReduce 和分片多种分布式编程模型，轻松实现大数据分布式计算。
 ##### 工作流
-内置工作流调度引擎，支持可视化 DAG，方便高效实现复杂任务调度。
+内置工作流调度引擎，支持可视化 DAG 设计，简单高效实现复杂任务调度。
 ##### 延时任务
-基于 Redis 实现高性能延时任务，同时支持延时任务多级存储、丰富的任务管理。
+基于 Redis 高性能延时任务，底层任务多级存储，提供丰富的任务管理。
 ##### 跨语言
-官方提供 Java/Go/PHP 多余支持，以及Spring Boot、Gin、Swoft 等常见框架整合。
+支持 Java/Go/PHP/Python 多语言 ，以及Spring Boot、Gin、Swoft 常见框架整合。
 ##### 权限管理
-命名空间设计，支持丰富的权限管理，精确到按钮级别。
+命名空间设计，丰富的按钮级别权限管理，。
 ##### 报警监控
 全面的监控指标，丰富及时的报警方式，便于运维人员快速定位和解决线上问题。
+
+## 依赖
+
+```xml
+<openjob.worker.version>1.0.0</openjob.worker.version>
+<dependency>
+    <groupId>io.openjob.worker</groupId>
+    <artifactId>openjob-worker-core</artifactId>
+    <version>${openjob.worker.version}</version>
+</dependency>
+
+<!--If your project base on `Spring Boot`, you can directly use the following dependencies-->
+<dependency>
+    <groupId>io.openjob.worker</groupId>
+    <artifactId>openjob-worker-spring-boot-starter</artifactId>
+    <version>${openjob.worker.version}</version>
+</dependency>
+```
+
 ## 文档
-- 官网([https://openjob.io](https://openjob.io))
-- 文档([https://openjob.io/docs](https://openjob.io/docs/intro))
-- 体验([https://demo.openjob.io](https://demo.openjob.io))
-  - openjob/123456
-## 交流
+- [官网](https://openjob.io)
+- [文档](https://openjob.io/docs/intro)
+- [试用](https://demo.openjob.io)
+## 联系
+* Mail list:
+  * [email protected]
+- Online chat:
+  - [Gitter](https://gitter.im/openjob/openjob)
 
 ## 协议
-Please see [LICENSE](LICENSE)
+Openjob is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.

README.md

@@ -50,12 +50,22 @@
 - [Official documentation](https://openjob.io/docs/intro)
 ## Live demo
 - Find the [live demo](https://demo.openjob.io) on our website.
+  - username: openjob
+  - password: openjob.io
 ## Contact
 * Mail list:
-  * [email protected]
   * [email protected]
 - Online chat:
 
+## Openjob ecosystem
+- [Openjob Website](https://github.com/open-job/openjob-website) - Openjob official website
+- [Openjob UI](https://github.com/open-job/openjob-ui) - UI for Openjob
+- [Openjob Samples](https://github.com/open-job/openjob-samples) - Samples for Openjob
+- [Openjob Docker](https://github.com/open-job/openjob-docker) - Openjob integration with docker
+
+## Contributors
+This project exists thanks to all the people who contribute. [[Contributors](https://github.com/open-job/openjob/graphs/contributors)].
+
 ## License
 Openjob is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
 

openjob-common/pom.xml

@@ -10,6 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openjob-common</artifactId>
 
+    <properties>
+        <kryo.version>5.3.0</kryo.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -19,7 +23,7 @@
         <dependency>
             <groupId>com.esotericsoftware.kryo</groupId>
             <artifactId>kryo5</artifactId>
-            <version>5.3.0</version>
+            <version>${kryo.version}</version>
         </dependency>
 
         <dependency>

openjob-common/src/main/java/io/openjob/common/SpringContext.java

@@ -7,7 +7,7 @@
 import org.springframework.lang.Nullable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class SpringContext implements ApplicationContextAware {
@@ -26,13 +26,14 @@ public static <T> T getBean(String name, Class<T> type) {
         return applicationContext.getBean(name, type);
     }
 
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
     public static Boolean containsBean(String name) {
         return applicationContext.containsBean(name);
     }
 
-    public static Object getBean(String name) {
-        return applicationContext.getBean(name);
-    }
 
     public static String[] getBeanNamesForType(@Nullable Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
         return applicationContext.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);

openjob-common/src/main/java/io/openjob/common/actor/BaseActor.java

@@ -7,7 +7,7 @@
 import scala.runtime.BoxedUnit;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Slf4j

openjob-common/src/main/java/io/openjob/common/constant/AkkaConstant.java

@@ -1,7 +1,7 @@
 package io.openjob.common.constant;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class AkkaConstant {

openjob-common/src/main/java/io/openjob/common/constant/BoolIntEnum.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 /**
- * @author inhere <[email protected]>
+ * @author inhere [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/CommonConstant.java

@@ -1,7 +1,7 @@
 package io.openjob.common.constant;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class CommonConstant {

openjob-common/src/main/java/io/openjob/common/constant/DelayConstant.java

@@ -1,7 +1,7 @@
 package io.openjob.common.constant;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class DelayConstant {

openjob-common/src/main/java/io/openjob/common/constant/ExecuteTypeEnum.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/InstanceStatusEnum.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/LogFieldConstant.java

@@ -1,7 +1,7 @@
 package io.openjob.common.constant;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class LogFieldConstant {

openjob-common/src/main/java/io/openjob/common/constant/ProcessorTypeEnum.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/ProtocolTypeEnum.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/StatusEnum.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @AllArgsConstructor

openjob-common/src/main/java/io/openjob/common/constant/TaskConstant.java

@@ -1,7 +1,7 @@
 package io.openjob.common.constant;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class TaskConstant {

openjob-common/src/main/java/io/openjob/common/constant/TaskStatusEnum.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/constant/TimeExpressionTypeEnum.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Getter

openjob-common/src/main/java/io/openjob/common/context/Node.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/context/Slots.java

@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/dto/JobInstanceDTO.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/kryo/KryoSerializer.java

@@ -4,7 +4,7 @@
 import io.openjob.common.util.KryoUtil;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @see akka https://doc.akka.io/docs/akka/current/serialization.html
  * @since 1.0.0
  */

openjob-common/src/main/java/io/openjob/common/request/ServerCheckTaskMasterRequest.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/request/ServerDelayInstanceStopRequest.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/request/ServerStopJobInstanceRequest.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data

openjob-common/src/main/java/io/openjob/common/request/ServerSubmitJobInstanceRequest.java

@@ -6,14 +6,17 @@
 import java.util.List;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data
 public class ServerSubmitJobInstanceRequest implements Serializable {
     private Long jobId;
     private Long jobInstanceId;
+    private String jobParamType;
     private String jobParams;
+    private String jobExtendParamsType;
+    private String jobExtendParams;
     private Long workflowId;
     private String processorType;
     private String processorInfo;

openjob-common/src/main/java/io/openjob/common/request/ServerWorkerHeartbeatRequest.java

@@ -3,7 +3,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 public class ServerWorkerHeartbeatRequest implements Serializable {

openjob-common/src/main/java/io/openjob/common/request/WorkerDelayAddRequest.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data
@@ -16,11 +16,6 @@ public class WorkerDelayAddRequest implements Serializable {
      */
     private Long deliveryId;
 
-    /**
-     * Namespace id.
-     */
-    private Long namespaceId;
-
     /**
      * Delay task unique id.
      * If is null or blank, will to auto generate.

openjob-common/src/main/java/io/openjob/common/request/WorkerDelayItemPullRequest.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 
 /**
- * @author stelin <[email protected]>
+ * @author stelin [email protected]
  * @since 1.0.0
  */
 @Data