From 2f2b9da5b75f5658e27b88aada2b1558da7bd6ca Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Thu, 16 Feb 2023 14:34:51 +0800
Subject: [PATCH] =?UTF-8?q?[server]=20[=20scheduler.script=20]=20-=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E8=84=9A=E6=9C=AC=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=83=A8=E5=88=86=E7=9A=84=E4=BB=A3=E7=A0=81=20-=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/wdd/rpc/execute/result/CommandResultReader.java |  2 +-
 .../wdd/rpc/scheduler/job/AgentScriptSchedulerJob.java | 10 +++++-----
 .../service/script/AgentApplyScheduledScript.java      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/io/wdd/rpc/execute/result/CommandResultReader.java b/server/src/main/java/io/wdd/rpc/execute/result/CommandResultReader.java
index 56cc27c..a1ba83d 100644
--- a/server/src/main/java/io/wdd/rpc/execute/result/CommandResultReader.java
+++ b/server/src/main/java/io/wdd/rpc/execute/result/CommandResultReader.java
@@ -70,7 +70,7 @@ public class CommandResultReader implements StreamListener<String, MapRecord<Str
 
         log.info("Octopus Agent [ {} ] execution of [ {} ] Time is [ {} ] stream recordId is [{}]",
                  streamKey,
-                 key,
+                 executionResultFormat.get(1),
                  key,
                  messageId);
         // print to console
diff --git a/server/src/main/java/io/wdd/rpc/scheduler/job/AgentScriptSchedulerJob.java b/server/src/main/java/io/wdd/rpc/scheduler/job/AgentScriptSchedulerJob.java
index 1b3da97..3c2da55 100644
--- a/server/src/main/java/io/wdd/rpc/scheduler/job/AgentScriptSchedulerJob.java
+++ b/server/src/main/java/io/wdd/rpc/scheduler/job/AgentScriptSchedulerJob.java
@@ -26,11 +26,6 @@ public class AgentScriptSchedulerJob extends QuartzJobBean {
     @Override
     protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 
-
-        log.info("[ 定时脚本任务 ]被调用了，调用时间为: {}",
-                 TimeUtils.currentTimeString()
-        );
-
         // 解析 Scheduler 模块传递过来的参数
         JobDataMap jobDataMap = jobExecutionContext
                 .getJobDetail()
@@ -39,6 +34,11 @@ public class AgentScriptSchedulerJob extends QuartzJobBean {
         // ScriptScheduleDTO
         ScriptSchedulerDTO scriptSchedulerDTO = (ScriptSchedulerDTO) jobDataMap.get(SCRIPT_SCHEDULER_MISSION_KEY);
 
+        log.info("[ 定时脚本任务 ] - 调用时间为: {}; 执行内容为: {}",
+                 TimeUtils.currentTimeString(),
+                 scriptSchedulerDTO
+        );
+
         // 调用实际任务执行器, 实际执行定时任务的核心业务内容
         agentApplyScheduledScript.apply(scriptSchedulerDTO);
 
diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/script/AgentApplyScheduledScript.java b/server/src/main/java/io/wdd/rpc/scheduler/service/script/AgentApplyScheduledScript.java
index e0d0460..8ed6c39 100644
--- a/server/src/main/java/io/wdd/rpc/scheduler/service/script/AgentApplyScheduledScript.java
+++ b/server/src/main/java/io/wdd/rpc/scheduler/service/script/AgentApplyScheduledScript.java
@@ -67,7 +67,7 @@ public class AgentApplyScheduledScript {
         // 需要更新数据库
         // 关联性数据库
 
-        log.info("[定时脚本任务]-[业务类]-实际执行完成!");
+        log.info("[ 定时脚本任务 ] - [ 业务类 ] - 实际执行完成!");
     }