From c553d966d6b357700003a69b6d996fd88044e08c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 25 Aug 2018 16:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B0=83=E5=BA=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=BC=80=E5=85=B3=EF=BC=8C=E5=8F=AF=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=88=96=E5=8F=AA=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AF=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84=E6=97=A5=E5=BF=97=EF=BC=8C=E8=AF=A6=E8=A7=81?=
 =?UTF-8?q?=EF=BC=9Ajeesite.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/jeesite-core.yml   | 16 ++++++++++++++++
 .../modules/test/service/TestDataService.java    | 10 ++++++++++
 web/src/main/resources/config/jeesite.yml        | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index da92fc5a..69342258 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -210,6 +210,22 @@ job:
     dataSourceName: job
     clusterCheckinInterval: 1000
 
+  # 调度日志
+  log:
+    # 计划调度日志
+    scheduler:
+      enabled: true
+      # 是否只保存错误日志
+      errorLevel: true
+    # 任务执行日志
+    jobDetail:
+      enabled: true
+      # 是否只保存错误日志
+      errorLevel: true
+    # 计划触发日志
+    trigger:
+      enabled: false
+
 # 内容管理
 cms:
 
diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
index ec38c83c..e927e692 100644
--- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
+++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
@@ -8,8 +8,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.service.CrudService;
 import com.jeesite.modules.file.utils.FileUploadUtils;
+import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.test.dao.TestDataChildDao;
 import com.jeesite.modules.test.dao.TestDataDao;
 import com.jeesite.modules.test.entity.TestData;
@@ -116,4 +118,12 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 		testDataChildDao.delete(testDataChild);
 	}
 	
+	/**
+	 * 任务调度测试：testDataService.executeTestTask(userService, 1, 2L, 3F, 4D, 'abc')
+	 */
+	public void executeTestTask(UserService userService, Integer i, Long l, Float f, Double d, String s){
+		System.out.println(DateUtils.getTime() + " 任务执行了~~~  bean: " + userService + ", i: " + i
+				+ ", l: " + l + ", f: " + f + ", d: " + d + ", s: " + s);
+	}
+	
 }
\ No newline at end of file
diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml
index 0a4b853e..f515ff75 100644
--- a/web/src/main/resources/config/jeesite.yml
+++ b/web/src/main/resources/config/jeesite.yml
@@ -232,6 +232,21 @@ jdbc:
 #    dataSourceName: job
 #    clusterCheckinInterval: 1000
 #
+#  # 调度日志
+#  log:
+#    # 计划调度日志
+#    scheduler:
+#      enabled: true
+#      # 是否只保存错误日志
+#      errorLevel: true
+#    # 任务执行日志
+#    jobDetail:
+#      enabled: true
+#      # 是否只保存错误日志
+#      errorLevel: true
+#    # 计划触发日志
+#    trigger:
+#      enabled: false
 
 #============================#
 #==== Framework settings ====#