From 919e8383bf0d6852b6490db489187eeec8ac81d3 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Tue, 9 Sep 2025 22:27:51 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=8C=85=E5=90=8D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/service/Dockerfile | 2 +- docker/service/entrypoint.sh | 4 ++-- .../dromara/visor/common/constant/FileConst.java | 10 ++++++---- .../agent/intstall/AbstractAgentInstaller.java | 4 ++-- .../asset/service/impl/HostAgentServiceImpl.java | 14 +++++++------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 1a2bc6d4..6d8a5a2a 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -24,7 +24,7 @@ RUN chmod +x /app/entrypoint.sh # 复制 jar 包 COPY ./service/orion-visor-launch.jar /app/app.jar # 复制探针包 -ADD ./service/agent-release.tar.gz /app/agent-release +ADD ./service./instant-agent-release.tar.gz /app/instant-agent-release # 启动检测 HEALTHCHECK --interval=15s --timeout=5s --retries=5 --start-period=10s \ diff --git a/docker/service/entrypoint.sh b/docker/service/entrypoint.sh index 12ee8bf0..a19be15d 100644 --- a/docker/service/entrypoint.sh +++ b/docker/service/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh -AGENT_RELEASE_DIR="/root/orion/orion-visor/agent-release" -DEFAULT_AGENT_DIR="/app/agent-release" +AGENT_RELEASE_DIR="/root/orion/visor/instant-agent-release" +DEFAULT_AGENT_DIR="/app/instant-agent-release" # 确保父目录存在 mkdir -p "$(dirname "$AGENT_RELEASE_DIR")" diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java index 8995c4f3..1bc002fb 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java @@ -37,13 +37,15 @@ public interface FileConst { String SCRIPT = "script"; - String AGENT = "agent"; + String INSTANT_AGENT_PATH = "instant-agent"; - String AGENT_RELEASE = "agent-release"; + String INSTANT_AGENT_NAME = "instant_agent"; - String AGENT_RELEASE_TEMP = "agent-release-temp"; + String INSTANT_AGENT_RELEASE = "instant-agent-release"; - String AGENT_RELEASE_TAR_GZ = "agent-release.tar.gz"; + String INSTANT_AGENT_RELEASE_TEMP = "instant-agent-release-temp"; + + String INSTANT_AGENT_RELEASE_TAR_GZ = "instant-agent-release.tar.gz"; String VERSION = ".version"; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/AbstractAgentInstaller.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/AbstractAgentInstaller.java index 6d1684c8..d4a3ef64 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/AbstractAgentInstaller.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/AbstractAgentInstaller.java @@ -86,7 +86,7 @@ public abstract class AbstractAgentInstaller implements AgentInstaller { this.params = params; this.logId = params.getLogId(); this.startScriptName = Const.START + HostOsTypeEnum.of(params.getOsType()).getScriptSuffix(); - this.uploadAgentName = FileConst.AGENT + HostOsTypeEnum.of(params.getOsType()).getBinarySuffix(); + this.uploadAgentName = FileConst.INSTANT_AGENT_NAME + HostOsTypeEnum.of(params.getOsType()).getBinarySuffix(); } @Override @@ -154,7 +154,7 @@ public abstract class AbstractAgentInstaller implements AgentInstaller { protected String getAgentHomePath() { return PathUtils.buildAppPath(HostOsTypeEnum.WINDOWS.name().equals(params.getOsType()), sshConfig.getUsername(), - FileConst.AGENT) + Const.SLASH; + FileConst.INSTANT_AGENT_PATH) + Const.SLASH; } /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java index e4278506..d22d15d4 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java @@ -95,7 +95,7 @@ public class HostAgentServiceImpl implements HostAgentService { public void readLocalAgentVersion() { log.info("HostAgentService-readLocalAgentVersion start"); // 文件路径 - String path = PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + FileConst.VERSION); + String path = PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + FileConst.VERSION); log.info("HostAgentService-readLocalAgentVersion path: {}", path); try { if (!Files1.isFile(path)) { @@ -191,9 +191,9 @@ public class HostAgentServiceImpl implements HostAgentService { Valid.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE); Valid.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE); // 保存文件 - String releaseDir = PathUtils.getOrionPath(FileConst.AGENT_RELEASE); - String releaseTempDir = PathUtils.getOrionPath(FileConst.AGENT_RELEASE_TEMP); - File releaseTempFile = new File(releaseTempDir + Const.SLASH + FileConst.AGENT_RELEASE_TAR_GZ); + String releaseDir = PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE); + String releaseTempDir = PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE_TEMP); + File releaseTempFile = new File(releaseTempDir + Const.SLASH + FileConst.INSTANT_AGENT_RELEASE_TAR_GZ); log.info("HostAgentService.installAgent start releaseTempDir: {}, releaseTempFile: {}", releaseTempDir, releaseTempFile.getAbsolutePath()); try { // 创建目录 @@ -278,9 +278,9 @@ public class HostAgentServiceImpl implements HostAgentService { .hostId(host.getId()) .osType(host.getOsType()) .agentKey(host.getAgentKey()) - .agentFilePath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + agentFileName)) - .configFilePath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + FileConst.CONFIG_YAML)) - .startScriptPath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + Const.START + os.getScriptSuffix())) + .agentFilePath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + agentFileName)) + .configFilePath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + FileConst.CONFIG_YAML)) + .startScriptPath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + Const.START + os.getScriptSuffix())) .build(); taskParams.add(params); // 添加待检查文件