From 7c21ae123aaa7474a3f19390e85d971d017b2c9f Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Mon, 13 Apr 2026 09:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/utils/DockerUtil.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/web-api/src/main/java/com/jeesite/modules/utils/DockerUtil.java b/web-api/src/main/java/com/jeesite/modules/utils/DockerUtil.java
index a34e0a2..cadb807 100644
--- a/web-api/src/main/java/com/jeesite/modules/utils/DockerUtil.java
+++ b/web-api/src/main/java/com/jeesite/modules/utils/DockerUtil.java
@@ -87,8 +87,8 @@ public class DockerUtil {
             String[] p = line.split("\\|");
             if (p.length < 2) continue;
             ContainerInfo info = new ContainerInfo();
-            info.setContainerId(p.length > 0 ? p[0].trim() : "");
-            info.setImage(p.length > 1 ? p[1].trim() : "");
+            info.setContainerId(p[0].trim());
+            info.setImage(p[1].trim());
             info.setCommand(p.length > 2 ? p[2].trim() : "");
             info.setCreated(p.length > 3 ? p[3].trim() : "");
             info.setStatus(p.length > 4 ? p[4].trim() : "");
@@ -146,10 +146,6 @@ public class DockerUtil {
                 }
             }
 
-            while (!channel.isClosed()) {
-                Thread.sleep(50);
-            }
-
             String stdout = outBuilder.toString().trim();
             String stderr = errOut.toString(StandardCharsets.UTF_8).trim();
             int exitCode = channel.getExitStatus();
@@ -165,9 +161,6 @@ public class DockerUtil {
             return DockerResult.fail("SSH 连接失败: " + e.getMessage());
         } catch (IOException e) {
             return DockerResult.fail("IO 异常: " + e.getMessage());
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return DockerResult.fail("执行被中断");
         } finally {
             if (channel != null && channel.isConnected()) channel.disconnect();
             if (session != null && session.isConnected()) session.disconnect();