From 495b43953a9dd04f4482017ecb4dffaec5ba6606 Mon Sep 17 00:00:00 2001
From: linrf <linrf@qq.com>
Date: Tue, 15 Aug 2023 10:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E9=87=8D=E5=90=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Cjenkins-update.bat=E8=84=9A=E6=9C=AC=EF=BC=88?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=91=BD=E4=BB=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/netty/client/handler/ClientHandler.java | 11 +++++------
 .../docus/server/common/utils/StartUpExeUtils.java | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/collector-terminal-management/src/main/java/com/docus/server/common/netty/client/handler/ClientHandler.java b/collector-terminal-management/src/main/java/com/docus/server/common/netty/client/handler/ClientHandler.java
index b57bb09..f4d0749 100644
--- a/collector-terminal-management/src/main/java/com/docus/server/common/netty/client/handler/ClientHandler.java
+++ b/collector-terminal-management/src/main/java/com/docus/server/common/netty/client/handler/ClientHandler.java
@@ -19,7 +19,6 @@ import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -152,15 +151,15 @@ public class ClientHandler extends SimpleChannelInboundHandler<CommMsg<Serializa
         log.info("【终端客户端-收到调度器消息】收到更新采集器文件命令，内容={}", messageContent);
     }
 
-    private void virtualRestart(String messageContent) throws IOException {
+    private void virtualRestart(String messageContent) throws Exception {
         log.info("【终端客户端-收到调度器消息】收到虚拟机重启命令，内容={}", messageContent);
-        StartUpExeUtils.restartComputer();
+        String result = StartUpExeUtils.restartComputer();
         CommMsg<Serializable> collectorRestartMsg = CommMsg.builder()
-            .content("重启虚拟机，操作成功！")
+            .content(result)
             .messageTime(DateUtil.formatDateTime(new Date()))
             .messageType(VIRTUAL_RESTART)
             .build();
-        nettyClient.getCollectorChannelCacheMap().writeAndFlush(messageContent, collectorRestartMsg);
+        nettyClient.sendMessage(collectorRestartMsg);
     }
 
     private void collectorRestart(String messageContent) {
@@ -188,7 +187,7 @@ public class ClientHandler extends SimpleChannelInboundHandler<CommMsg<Serializa
                         .messageTime(DateUtil.formatDateTime(new Date()))
                         .messageType(COLLECTOR_RESTART)
                         .build();
-                    nettyClient.getCollectorChannelCacheMap().writeAndFlush(messageContent, collectorRestartMsg);
+                    nettyClient.sendMessage(collectorRestartMsg);
                 }
             }
         }
diff --git a/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java b/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java
index 869bc90..cdb387e 100644
--- a/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java
+++ b/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java
@@ -32,8 +32,18 @@ public class StartUpExeUtils {
     }
 
     //重启虚拟机
-    public static void restartComputer() throws IOException {
-        Runtime.getRuntime().exec("shutdown /r /t 0");
+    public static String restartComputer() throws IOException, InterruptedException {
+        Process process = Runtime.getRuntime().exec("shutdown /r /t 0");
+
+        int exitCode = process.waitFor();
+
+        if (exitCode == 0) {
+            System.out.println("Command executed successfully.");
+            return "Command executed successfully.";
+        } else {
+            System.out.println("Command execution failed.");
+            return "Command executed failed.";
+        }
     }
 
     //仅启动exe客户端，不检查进程