diff --git a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/service/TaskMagicDynamicRegistry.java b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/service/TaskMagicDynamicRegistry.java index f87d7530734fead9faaec5b53937c774746f55f0..f8e9310031fe09905138624ceefa6614d048762a 100644 --- a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/service/TaskMagicDynamicRegistry.java +++ b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/service/TaskMagicDynamicRegistry.java @@ -23,9 +23,12 @@ public class TaskMagicDynamicRegistry extends AbstractMagicDynamicRegistry magicResourceStorage, TaskScheduler taskScheduler) { + private final boolean showLog; + + public TaskMagicDynamicRegistry(MagicResourceStorage magicResourceStorage, TaskScheduler taskScheduler, boolean showLog) { super(magicResourceStorage); this.taskScheduler = taskScheduler; + this.showLog = showLog; } @EventListener(condition = "#event.type == 'task'") @@ -54,14 +57,18 @@ public class TaskMagicDynamicRegistry extends AbstractMagicDynamicRegistry { if (entity.isEnabled()) { try { - logger.info("定时任务:[{}]开始执行", scriptName); + if (showLog) { + logger.info("定时任务:[{}]开始执行", scriptName); + } MagicScriptContext magicScriptContext = new MagicScriptContext(); magicScriptContext.setScriptName(scriptName); ScriptManager.executeScript(entity.getScript(), magicScriptContext); } catch (Exception e) { logger.error("定时任务执行出错", e); } finally { - logger.info("定时任务:[{}]执行完毕", scriptName); + if (showLog) { + logger.info("定时任务:[{}]执行完毕", scriptName); + } } } }, trigger); diff --git a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java index f0dbe60e6ba62b49ee7b60cb1cd10226c0760e40..05616160065d22a7bec13eeb8a8eddcd2cb7bed4 100644 --- a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java +++ b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java @@ -43,7 +43,7 @@ public class MagicAPITaskConfiguration implements MagicPluginConfiguration { poolTaskScheduler.setThreadNamePrefix(config.getThreadNamePrefix()); poolTaskScheduler.initialize(); } - return new TaskMagicDynamicRegistry(taskInfoMagicResourceStorage, poolTaskScheduler); + return new TaskMagicDynamicRegistry(taskInfoMagicResourceStorage, poolTaskScheduler, config.isLog()); } @Override diff --git a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicTaskConfig.java b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicTaskConfig.java index 45f1971584e481c22b8cc21118c3dd63c4aec59d..6771f4ab75e84f09879712989cc8f8322f930805 100644 --- a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicTaskConfig.java +++ b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicTaskConfig.java @@ -13,6 +13,12 @@ public class MagicTaskConfig { */ private boolean enable = true; + /** + * 是否打印日志 + * @since 2.1.0 + */ + private boolean log = false; + /** * 线程池相关配置 */ @@ -28,6 +34,14 @@ public class MagicTaskConfig { */ private String threadNamePrefix = "magic-task-"; + public boolean isLog() { + return log; + } + + public void setLog(boolean log) { + this.log = log; + } + public Pool getPool() { return this.pool; }