From d7685a345ad02c64523b3a947d576d988b91d7f7 Mon Sep 17 00:00:00 2001
From: jmxd <838425805@qq.com>
Date: Thu, 23 Mar 2023 09:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E`magic-api.task.log`=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/TaskMagicDynamicRegistry.java     | 13 ++++++++++---
 .../task/starter/MagicAPITaskConfiguration.java    |  2 +-
 .../magicapi/task/starter/MagicTaskConfig.java     | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

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 f87d7530..f8e93100 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<TaskI
 
 	private static final Logger logger = LoggerFactory.getLogger(TaskMagicDynamicRegistry.class);
 
-	public TaskMagicDynamicRegistry(MagicResourceStorage<TaskInfo> magicResourceStorage, TaskScheduler taskScheduler) {
+	private final boolean showLog;
+
+	public TaskMagicDynamicRegistry(MagicResourceStorage<TaskInfo> 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<TaskI
 				CronTask cronTask = new CronTask(() -> {
 					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 f0dbe60e..05616160 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 45f19715..6771f4ab 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;
 	}