manager/my-spring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化图表大小及描述

Browse Source
This commit is contained in:
gaoxq
2026-04-13 09:25:24 +08:00
parent 3bc401e0af
commit 7c21ae123a
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web-api/src/main/java/com/jeesite/modules/utils/DockerUtil.java
View File

@@ -87,8 +87,8 @@ public class DockerUtil {
String[] p = line.split("\\|"); String[] p = line.split("\\|");
if (p.length < 2) continue; if (p.length < 2) continue;
ContainerInfo info = new ContainerInfo(); ContainerInfo info = new ContainerInfo();
info.setContainerId(p.length > 0 ? p[0].trim() : ""); info.setContainerId(p[0].trim());
info.setImage(p.length > 1 ? p[1].trim() : ""); info.setImage(p[1].trim());
info.setCommand(p.length > 2 ? p[2].trim() : ""); info.setCommand(p.length > 2 ? p[2].trim() : "");
info.setCreated(p.length > 3 ? p[3].trim() : ""); info.setCreated(p.length > 3 ? p[3].trim() : "");
info.setStatus(p.length > 4 ? p[4].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 stdout = outBuilder.toString().trim();
String stderr = errOut.toString(StandardCharsets.UTF_8).trim(); String stderr = errOut.toString(StandardCharsets.UTF_8).trim();
int exitCode = channel.getExitStatus(); int exitCode = channel.getExitStatus();
@@ -165,9 +161,6 @@ public class DockerUtil {
return DockerResult.fail("SSH 连接失败: " + e.getMessage()); return DockerResult.fail("SSH 连接失败: " + e.getMessage());
} catch (IOException e) { } catch (IOException e) {
return DockerResult.fail("IO 异常: " + e.getMessage()); return DockerResult.fail("IO 异常: " + e.getMessage());
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return DockerResult.fail("执行被中断");
} finally { } finally {
if (channel != null && channel.isConnected()) channel.disconnect(); if (channel != null && channel.isConnected()) channel.disconnect();
if (session != null && session.isConnected()) session.disconnect(); if (session != null && session.isConnected()) session.disconnect();