optimize code

Author: ponfee

README.en.md

@@ -182,4 +182,4 @@ Scan the QR code to add WeChat friends, note `disjob`, and invite you to join th
 - [ ] Monitor real-time executing logs of tasks online
 - [ ] Alarm subscribe: Email, SMS, Voice, Lark, Ding Talk, WeChat
 - [ ] Visual monitoring BI dashboard
-- [ ] Support more savepoint implementation: File System, Hadoop, RocksDB, OSS
+- [ ] Support more Savepoint implementation: File System, Hadoop, RocksDB, OSS

README.md

@@ -2,7 +2,7 @@
 
 **`简体中文`** | [English](README.en.md)
 
-一款分布式的任务调度框架，除了具备常规的任务调度功能外，还提供：暂停/取消运行中的任务、恢复执行被暂停的任务、任务拆分、失败重试、广播任务、任务依赖、工作流任务(DAG)、管理器与执行器分离部署、Web管理后台等能力。
+一款分布式的任务调度框架，除了具备常规的任务调度功能外，还提供：暂停/取消运行中的任务、恢复执行被暂停的任务、任务分片、失败重试、广播任务、任务依赖、工作流任务(DAG)、管理器与执行器分离部署、Web管理后台等能力。
 
 轻量级，简单易用，特别适合长任务的执行。有较好的伸缩性、扩展性、稳定性，历经生产检验。
 
@@ -53,7 +53,7 @@ disjob                                        # 主项目①
 - 需要指定Job的分组(job-group)，Job的任务只会派发给指定组的Worker执行
 - 提供任务分片的能力，重写拆分方法[JobHandler#split](disjob-core/src/main/java/cn/ponfee/disjob/core/handle/JobSplitter.java)即可拆分为多个任务，实现分布式任务及并行执行
 - 支持暂停和取消运行中的任务，已暂停的任务可恢复继续执行，执行失败的任务支持重试
-- 支持任务保存(savepoint)其执行状态，让手动或异常暂停的任务能从上一次的执行状态中恢复继续执行
+- 支持任务保存(Savepoint)其执行状态，让手动或异常暂停的任务能从上一次的执行状态中恢复继续执行
 - 任务在执行时若抛出[PauseTaskException](disjob-core/src/main/java/cn/ponfee/disjob/core/exception/PauseTaskException.java)，会暂停对应实例下的全部任务(包括分布在不同worker机器中的任务)
 - 支持广播任务，广播任务会派发给job-group下的所有worker执行
 - 支持Job间的依赖，多个Job配置好依赖关系后便会按既定的依赖顺序依次执行
@@ -62,17 +62,17 @@ disjob                                        # 主项目①
 
 ## Comparison
 
-| **Feature**  | **Quartz** | **Elastic-Job** |   **Xxl-Job**   |           **Disjob**          |
-| ------------ | ---------- |-----------------|-----------------|-------------------------------|
-|  时间类型     |    Cron    |     Cron        |    Cron         | Cron、指定时间、固定频率、固定延时 |
-|  任务编排     |    不支持   |     不支持       |     任务依赖     | DAG表达式、任务依赖              |
-|  任务分片     |    不支持   |    静态分片       |     广播任务     | 广播任务、动态分片               |
-|  停止与恢复    |    不支持   |     不支持       | 终止运行中的任务  | 暂停执行中的任务、恢复已暂停的任务  |
-|  保存执行快照  |    不支持   |    不支持        |     不支持       | 支持                           |
-|  失败重试     |    不支持   |    失效转移       |     支持        | 支持                           |
-|  后台管理     |    不支持   |     支持         |     支持        | 支持                           |
-|  监控告警     |    不支持   |      邮件        |     邮件        | 暂不支持                        |
-|  查看执行日志  |    不支持   |     支持         |     支持        | 暂不支持                        |
+| **Feature**  | **Quartz** | **Elastic-Job** |     **Xxl-Job**      |              **Disjob**                |
+| ------------ | ---------- |-----------------|----------------------|----------------------------------------|
+|  **触发类型**     |    Cron    |     Cron        | Cron、固定频率、父子依赖 | Cron、指定时间、固定频率、固定延时、父子依赖 |
+|  **任务编排**     |    不支持   |     不支持       |     不支持             | DAG表达式                              |
+|  **任务分片**     |    不支持   |    静态分片       |     广播任务          | 广播任务、动态分片                        |
+|  **停止与恢复**    |    不支持   |     不支持       | 终止运行中的任务       | 暂停执行中的任务、恢复已暂停的任务           |
+|  **保存执行快照**  |    不支持   |    不支持        |     不支持            | 支持                                    |
+|  **失败重试**     |    不支持   |    失效转移       |     支持             | 支持                                    |
+|  **后台管理**     |    不支持   |     支持         |     支持             | 支持                                    |
+|  **监控告警**     |    不支持   |      邮件        |     邮件             | 暂不支持                                 |
+|  **查看执行日志**  |    不支持   |     支持         |     支持             | 暂不支持                                 |
 
 ## [Download From Maven Central](https://central.sonatype.com/namespace/cn.ponfee)
 
@@ -234,7 +234,7 @@ Worker接收到子任务后，会提交到框架自定义的线程池中执行
   "jobGroup": "default",
   "jobName": "prime-count-dag",
   "jobState": 1, // job状态：0-禁用；1-启用；
-  "jobType": 2,  // job类型：1-普通(Normal)；2-工作流(DAG)；
+  "jobType": 2,  // job类型：1-常规；2-工作流(DAG)；
   "jobHandler": "cn.ponfee.disjob.test.handler.PrimeCountJobHandler -> cn.ponfee.disjob.test.handler.PrimeAccumulateJobHandler",
   "jobParam": "{\"m\":1,\"n\":10000000000,\"blockSize\":100000000,\"parallel\":10}",
   "triggerType": 2,

disjob-admin/ruoyi-admin/src/main/resources/templates/main.html

@@ -100,7 +100,7 @@ <h2 class="Box-title">
       <div data-target="readme-toc.content" class="Box-body px-5 pb-5">
         <article class="markdown-body entry-content container-lg" itemprop="text"><h1 tabindex="-1" id="user-content-----" dir="auto"><a class="heading-link" href="#----"><img src="https://raw.githubusercontent.com/dromara/disjob/master/docs/images/logo.png" width="125" alt="Logo" style="max-width: 100%;"> </a><a href="https://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow"><img src="https://camo.githubusercontent.com/20b3bc1c34ed71700bd0fc067de4d50e73468def345f89780f839e516cacf8b0/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d677265656e2e737667" alt="License" data-canonical-src="https://img.shields.io/badge/license-Apache--2.0-green.svg" style="max-width: 100%;"></a> <a href="https://www.oracle.com/java/technologies/downloads/#java8" rel="nofollow"><img src="https://camo.githubusercontent.com/491e42a3617b89ac8f08a5b249f31d79bd50f7b268e547701840c82d0c9de759/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6a646b2d382b2d677265656e2e737667" alt="JDK" data-canonical-src="https://img.shields.io/badge/jdk-8+-green.svg" style="max-width: 100%;"></a> <a href="https://central.sonatype.com/namespace/cn.ponfee" rel="nofollow"><img src="https://camo.githubusercontent.com/106ddeb839f22f29dc11f799d543afa86751334a6b8ce737f70686616773949b/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6d6176656e2d2d63656e7472616c2d322e302e332d6f72616e67652e7376673f7374796c653d706c6173746963266c6f676f3d6170616368656d6176656e" alt="Maven Central" data-canonical-src="https://img.shields.io/badge/maven--central-2.0.4-orange.svg?style=plastic&amp;logo=apachemaven" style="max-width: 100%;"></a> <a href="https://github.com/dromara/disjob/actions"><img src="https://github.com/dromara/disjob/workflows/build/badge.svg" alt="Build status" style="max-width: 100%;"></a><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="m7.775 3.275 1.25-1.25a3.5 3.5 0 1 1 4.95 4.95l-2.5 2.5a3.5 3.5 0 0 1-4.95 0 .751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018 1.998 1.998 0 0 0 2.83 0l2.5-2.5a2.002 2.002 0 0 0-2.83-2.83l-1.25 1.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Zm-4.69 9.64a1.998 1.998 0 0 0 2.83 0l1.25-1.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-1.25 1.25a3.5 3.5 0 1 1-4.95-4.95l2.5-2.5a3.5 3.5 0 0 1 4.95 0 .751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018 1.998 1.998 0 0 0-2.83 0l-2.5 2.5a1.998 1.998 0 0 0 0 2.83Z"></path></svg></h1>
           <p dir="auto"><strong><code>简体中文</code></strong> | <a href="https://github.com/dromara/disjob/blob/master/README.en.md">English</a></p>
-          <p dir="auto">一款分布式的任务调度框架，除了具备常规的任务调度功能外，还提供：暂停/取消运行中的任务、恢复执行被暂停的任务、任务拆分、失败重试、广播任务、任务依赖、工作流任务(DAG)、管理器与执行器分离部署、Web管理后台等能力。</p>
+          <p dir="auto">一款分布式的任务调度框架，除了具备常规的任务调度功能外，还提供：暂停/取消运行中的任务、恢复执行被暂停的任务、任务分片、失败重试、广播任务、任务依赖、工作流任务(DAG)、管理器与执行器分离部署、Web管理后台等能力。</p>
           <p dir="auto">轻量级，简单易用，特别适合长任务的执行。有较好的伸缩性、扩展性、稳定性，历经生产检验。</p>
           <h2 tabindex="-1" id="user-content-architecture" dir="auto"><a class="heading-link" href="#architecture">Architecture<svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="m7.775 3.275 1.25-1.25a3.5 3.5 0 1 1 4.95 4.95l-2.5 2.5a3.5 3.5 0 0 1-4.95 0 .751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018 1.998 1.998 0 0 0 2.83 0l2.5-2.5a2.002 2.002 0 0 0-2.83-2.83l-1.25 1.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Zm-4.69 9.64a1.998 1.998 0 0 0 2.83 0l1.25-1.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-1.25 1.25a3.5 3.5 0 1 1-4.95-4.95l2.5-2.5a3.5 3.5 0 0 1 4.95 0 .751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018 1.998 1.998 0 0 0-2.83 0l-2.5 2.5a1.998 1.998 0 0 0 0 2.83Z"></path></svg></a></h2>
           <ul dir="auto">
@@ -365,7 +365,7 @@ <h2 tabindex="-1" id="user-content-example" dir="auto"><a class="heading-link" h
   &quot;jobGroup&quot;: &quot;default&quot;,
   &quot;jobName&quot;: &quot;prime-count-dag&quot;,
   &quot;jobState&quot;: 1, // job状态：0-禁用；1-启用；
-  &quot;jobType&quot;: 2,  // job类型：1-普通(Normal)；2-工作流(DAG)；
+  &quot;jobType&quot;: 2,  // job类型：1-常规；2-工作流(DAG)；
   &quot;jobHandler&quot;: &quot;cn.ponfee.disjob.test.handler.PrimeCountJobHandler -&gt; cn.ponfee.disjob.test.handler.PrimeAccumulateJobHandler&quot;,
   &quot;jobParam&quot;: &quot;{\&quot;m\&quot;:1,\&quot;n\&quot;:10000000000,\&quot;blockSize\&quot;:100000000,\&quot;parallel\&quot;:10}&quot;,
   &quot;triggerType&quot;: 2,
@@ -374,7 +374,7 @@ <h2 tabindex="-1" id="user-content-example" dir="auto"><a class="heading-link" h
   <span class="pl-s">"jobGroup"</span>: <span class="pl-s">"default"</span><span class="pl-kos">,</span>
   <span class="pl-s">"jobName"</span>: <span class="pl-s">"prime-count-dag"</span><span class="pl-kos">,</span>
   <span class="pl-s">"jobState"</span>: <span class="pl-c1">1</span><span class="pl-kos">,</span> <span class="pl-c">// job状态：0-禁用；1-启用；</span>
-  <span class="pl-s">"jobType"</span>: <span class="pl-c1">2</span><span class="pl-kos">,</span>  <span class="pl-c">// job类型：1-普通(Normal)；2-工作流(DAG)；</span>
+  <span class="pl-s">"jobType"</span>: <span class="pl-c1">2</span><span class="pl-kos">,</span>  <span class="pl-c">// job类型：1-常规；2-工作流(DAG)；</span>
   <span class="pl-s">"jobHandler"</span>: <span class="pl-s">"cn.ponfee.disjob.test.handler.PrimeCountJobHandler -&gt; cn.ponfee.disjob.test.handler.PrimeAccumulateJobHandler"</span><span class="pl-kos">,</span>
   <span class="pl-s">"jobParam"</span>: <span class="pl-s">"{\"m\":1,\"n\":10000000000,\"blockSize\":100000000,\"parallel\":10}"</span><span class="pl-kos">,</span>
   <span class="pl-s">"triggerType"</span>: <span class="pl-c1">2</span><span class="pl-kos">,</span>

disjob-admin/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -24,7 +24,7 @@ public class ServletUtils
     /**
      * 定义移动端请求的所有可能类型
      */
-    private final static String[] agent = { "Android", "iPhone", "iPod", "iPad", "Windows Phone", "MQQBrowser" };
+    private static final String[] agent = { "Android", "iPhone", "iPod", "iPad", "Windows Phone", "MQQBrowser" };
 
     /**
      * 获取String参数

disjob-admin/ruoyi-disjob/src/main/java/cn/ponfee/disjob/admin/controller/DisjobInstanceController.java

@@ -41,8 +41,8 @@ public class DisjobInstanceController extends BaseController {
     private static final String PERMISSION_VIEW = "disjob:instance:view";
     private static final String PERMISSION_QUERY = "disjob:instance:query";
     private static final String PERMISSION_OPERATE = "disjob:instance:operate";
-    private final static int WAIT_SLEEP_ROUND = 9;
-    private final static long[] WAIT_SLEEP_MILLIS = {2500, 500};
+    private static final int WAIT_SLEEP_ROUND = 9;
+    private static final long[] WAIT_SLEEP_MILLIS = {2500, 500};
 
     private final SupervisorOpenRpcService supervisorOpenRpcService;
 

disjob-admin/ruoyi-disjob/src/main/java/cn/ponfee/disjob/admin/domain/SchedJobExport.java

@@ -41,7 +41,7 @@ public class SchedJobExport {
     private String jobName;
 
     /**
-     * Job类型：1-普通(Normal)；2-工作流(Workflow)；
+     * Job类型：1-常规；2-工作流(Workflow)；
      */
     @Excel(name = "Job类型")
     private Integer jobType;
@@ -103,9 +103,9 @@ public class SchedJobExport {
     private Integer triggerType;
 
     /**
-     * 触发器配置(对应trigger_type)：1-Cron表达式；2-时间格式(2000-01-01 00:00:00)；3-{"period":"DAILY","start":"2018-12-06 00:00:00","step":1}；4-周期秒数；5-延时秒数；6-父任务job_id(多个逗号分隔)；
+     * 触发器值(对应trigger_type)：1-Cron表达式；2-时间格式(2000-01-01 00:00:00)；3-{"period":"DAILY","start":"2018-12-06 00:00:00","step":1}；4-周期秒数；5-延时秒数；6-父任务job_id(多个逗号分隔)；
      */
-    @Excel(name = "触发器配置")
+    @Excel(name = "触发器值")
     private String triggerValue;
 
     /**

disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/detail.html

@@ -96,6 +96,10 @@
           <p class="form-control-static">[( ${@disjobService.desc('RouteStrategy', job.routeStrategy)} )]</p>
         </div>
       </div>
+      <div class="form-group">
+        <label class="col-sm-3 control-label">备注：</label>
+        <div class="col-sm-9">[(*{remark})]</div>
+      </div>
     </form>
   </div>
 

disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/job.html

@@ -111,7 +111,7 @@
         },
         {
           field: 'triggerValue',
-          title: '触发器配置',
+          title: '触发器值',
           formatter: function (value, row, index) {
             return $.table.tooltip(value, 19, "open");
           }
@@ -140,13 +140,6 @@
             return $.common.dateFormat(parseInt(value), 'yyyy-MM-dd HH:mm:ss');
           }
         },
-        {
-          field: 'remark',
-          title: '备注',
-          formatter: function (value, row, index) {
-            return $.table.tooltip(value, 30, "open");
-          }
-        },
         {
           field: 'updatedBy',
           title: '更新人'

disjob-admin/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java

@@ -31,7 +31,7 @@
  */
 public class KickoutSessionFilter extends AccessControlFilter
 {
-    private final static ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     /**
      * 同一个用户最大会话数

disjob-common/src/main/java/cn/ponfee/disjob/common/base/TimingWheel.java

@@ -91,7 +91,7 @@
  */
 public abstract class TimingWheel<T extends TimingWheel.Timing<T>> implements java.io.Serializable {
     private static final long serialVersionUID = 4500377208898808026L;
-    private final static Logger LOG = LoggerFactory.getLogger(TimingWheel.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TimingWheel.class);
 
     private static final int PROCESS_SLOTS_SIZE = 2;
 

disjob-common/src/main/java/cn/ponfee/disjob/common/concurrent/AsyncDelayedExecutor.java

@@ -38,7 +38,7 @@
  */
 public final class AsyncDelayedExecutor<E> extends Thread {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AsyncDelayedExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AsyncDelayedExecutor.class);
 
     private final Consumer<E> processor;            // 数据处理器
     private final ThreadPoolExecutor asyncExecutor; // 异步执行器

disjob-common/src/main/java/cn/ponfee/disjob/common/concurrent/LoggedUncaughtExceptionHandler.java

@@ -17,7 +17,7 @@
  * @author Ponfee
  */
 public final class LoggedUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
-    private final static Logger LOG = LoggerFactory.getLogger(LoggedUncaughtExceptionHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoggedUncaughtExceptionHandler.class);
 
     public static final LoggedUncaughtExceptionHandler INSTANCE = new LoggedUncaughtExceptionHandler();
 

disjob-common/src/main/java/cn/ponfee/disjob/common/concurrent/LoopThread.java

@@ -21,7 +21,7 @@
  */
 public class LoopThread extends Thread {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoopThread.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoopThread.class);
 
     private static final int NEW        = 0;
     private static final int RUNNING    = 1;

disjob-common/src/main/java/cn/ponfee/disjob/common/concurrent/ThreadPoolExecutors.java

@@ -27,7 +27,7 @@
  */
 public final class ThreadPoolExecutors {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ThreadPoolExecutors.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolExecutors.class);
 
     /**
      * max #workers - 1

disjob-common/src/main/java/cn/ponfee/disjob/common/util/ClassUtils.java

@@ -39,7 +39,7 @@
  */
 public final class ClassUtils {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClassUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClassUtils.class);
 
     public static final Pattern QUALIFIED_CLASS_NAME_PATTERN = Pattern.compile("^([a-zA-Z_$][a-zA-Z\\d_$]*\\.)*[a-zA-Z_$][a-zA-Z\\d_$]*$");
 

disjob-core/src/main/java/cn/ponfee/disjob/core/enums/JobType.java

@@ -23,9 +23,9 @@
 public enum JobType implements IntValueEnum<JobType> {
 
     /**
-     * 普通
+     * 常规
      */
-    NORMAL(1, "普通(Normal)"),
+    GENERAL(1, "常规"),
 
     /**
      * 工作流(DAG)

disjob-core/src/main/java/cn/ponfee/disjob/core/handle/impl/CommandJobHandler.java

@@ -48,7 +48,7 @@
  * @author Ponfee
  */
 public class CommandJobHandler extends JobHandler {
-    private final static Logger LOG = LoggerFactory.getLogger(CommandJobHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandJobHandler.class);
 
     private Charset charset;
     private Long pid;

disjob-core/src/main/java/cn/ponfee/disjob/core/handle/impl/HttpJobHandler.java

@@ -50,12 +50,12 @@
  * @author Ponfee
  */
 public class HttpJobHandler extends JobHandler {
-    private final static Logger LOG = LoggerFactory.getLogger(HttpJobHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpJobHandler.class);
 
     private static final int DEFAULT_CONNECT_TIMEOUT = 2000;
     private static final int DEFAULT_READ_TIMEOUT = 5000;
 
-    private final static RestTemplate REST_TEMPLATE = RestTemplateUtils.buildRestTemplate(
+    private static final RestTemplate REST_TEMPLATE = RestTemplateUtils.buildRestTemplate(
         DEFAULT_CONNECT_TIMEOUT,
         DEFAULT_READ_TIMEOUT,
         StandardCharsets.UTF_8,

disjob-core/src/main/java/cn/ponfee/disjob/core/handle/impl/ScriptJobHandler.java

@@ -50,7 +50,7 @@
  * @author Ponfee
  */
 public class ScriptJobHandler extends JobHandler {
-    private final static Logger LOG = LoggerFactory.getLogger(ScriptJobHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ScriptJobHandler.class);
 
     private static final String[] DOWNLOAD_PROTOCOL = {"http://", "https://", "ftp://"};
     private static final String WORKER_SCRIPT_DIR = SystemUtils.USER_HOME + "/disjob/worker/scripts/";