diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3cb4aba..6b599f6 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1461,6 +1461,7 @@ - 31、调度中心-执行器通讯模型统一,双向RPC切换为Netty; - 32、任务暂停、删除优化,避免quartz delete不完整导致任务脏数据; - 32、quartz misfire 配置优化,计划改为0; +- 33、新增状态列,支持筛选; diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3cb4aba..6b599f6 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1461,6 +1461,7 @@ - 31、调度中心-执行器通讯模型统一,双向RPC切换为Netty; - 32、任务暂停、删除优化,避免quartz delete不完整导致任务脏数据; - 32、quartz misfire 配置优化,计划改为0; +- 33、新增状态列,支持筛选; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java index df5d85a..fd6519c 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java @@ -189,7 +189,7 @@ // ---------------------- fail-callback file ---------------------- - private static String failCallbackFilePath = XxlJobFileAppender.getLogPath().concat(File.separator).concat("callbacklog"); + private static String failCallbackFilePath = XxlJobFileAppender.getLogPath().concat(File.separator).concat("callbacklog").concat(File.separator); private static String failCallbackFileName = failCallbackFilePath.concat("xxl-job-callback-{x}").concat(".log"); private void appendFailCallbackFile(List callbackParamList){ diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 3cb4aba..6b599f6 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1461,6 +1461,7 @@ - 31、调度中心-执行器通讯模型统一,双向RPC切换为Netty; - 32、任务暂停、删除优化,避免quartz delete不完整导致任务脏数据; - 32、quartz misfire 配置优化,计划改为0; +- 33、新增状态列,支持筛选; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java index df5d85a..fd6519c 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java @@ -189,7 +189,7 @@ // ---------------------- fail-callback file ---------------------- - private static String failCallbackFilePath = XxlJobFileAppender.getLogPath().concat(File.separator).concat("callbacklog"); + private static String failCallbackFilePath = XxlJobFileAppender.getLogPath().concat(File.separator).concat("callbacklog").concat(File.separator); private static String failCallbackFileName = failCallbackFilePath.concat("xxl-job-callback-{x}").concat(".log"); private void appendFailCallbackFile(List callbackParamList){ diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java index 0c9c5a1..9d27af7 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java @@ -52,12 +52,7 @@ // file if (!file.exists()) { - try { - file.createNewFile(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - return; - } + file.getParentFile().mkdirs(); } // append file content