From 0959aebf67ddf8f05aafb55c6a442affe1a235e0 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 28 Feb 2023 21:56:31 +0800
Subject: [PATCH] =?UTF-8?q?[server][=20executor]-=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BA=95=E5=B1=82=E7=9A=84=E4=BB=A3=E7=A0=81=20-=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/wdd/rpc/execute/service/AsyncExecutionService.java     | 2 +-
 .../io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java | 4 ++--
 .../io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java
index 8795595..5fddc6e 100644
--- a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java
+++ b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java
@@ -104,7 +104,7 @@ public interface AsyncExecutionService {
      * @param durationTask
      * @return
      */
-    OctopusMessage SyncCallSendCommandToAgent(
+    OctopusMessage AsyncCallSendCommandToAgent(
             String agentTopicName,
             String type,
             List<String> commandList,
diff --git a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java
index 9097269..f7555a1 100644
--- a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java
@@ -135,7 +135,7 @@ public class AsyncExecutionServiceImpl implements AsyncExecutionService {
         }
 
         // 调用最底层的方法
-        this.SyncCallSendCommandToAgent(
+        this.AsyncCallSendCommandToAgent(
                 agentTopicName,
                 type,
                 commandList,
@@ -149,7 +149,7 @@ public class AsyncExecutionServiceImpl implements AsyncExecutionService {
     }
 
     @Override
-    public OctopusMessage SyncCallSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) {
+    public OctopusMessage AsyncCallSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) {
 
         // 检查agentTopicName是否存在
         if (!ALL_AGENT_TOPIC_NAME_SET.contains(agentTopicName)) {
diff --git a/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java b/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java
index 22d6ed9..15d364c 100644
--- a/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java
@@ -180,7 +180,7 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
     @Override
     public ArrayList<String> SyncSendCommandToAgent(String agentTopicName, String type, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, String futureKey, boolean durationTask) {
 
-        OctopusMessage octopusMessage = asyncExecutionService.SyncCallSendCommandToAgent(
+        OctopusMessage octopusMessage = asyncExecutionService.AsyncCallSendCommandToAgent(
                 agentTopicName,
                 type,
                 commandList,
@@ -220,7 +220,6 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
                     TimeUnit.SECONDS
             );
 
-
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         } finally {
@@ -229,7 +228,6 @@ public class SyncExecutionServiceImpl implements SyncExecutionService {
             // 停止等待结果
             asyncWaitOMResult.stopWaiting(omReplayContend);
 
-
             // 解析结果
             omReplayContend
                     .getReplayOMList()