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

🔨 修改插件包名.

Browse Source
This commit is contained in:
lijiahangmax
2025-09-09 22:27:51 +08:00
parent 0b7faa038a
commit 919e8383bf
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/service/Dockerfile
View File

@@ -24,7 +24,7 @@ RUN chmod +x /app/entrypoint.sh
# 复制 jar 包 # 复制 jar 包
COPY ./service/orion-visor-launch.jar /app/app.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 \ HEALTHCHECK --interval=15s --timeout=5s --retries=5 --start-period=10s \

4
docker/service/entrypoint.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
AGENT_RELEASE_DIR="/root/orion/orion-visor/agent-release" AGENT_RELEASE_DIR="/root/orion/visor/instant-agent-release"
DEFAULT_AGENT_DIR="/app/agent-release" DEFAULT_AGENT_DIR="/app/instant-agent-release"
# 确保父目录存在 # 确保父目录存在
mkdir -p "$(dirname "$AGENT_RELEASE_DIR")" mkdir -p "$(dirname "$AGENT_RELEASE_DIR")"

10
orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java
View File

@@ -37,13 +37,15 @@ public interface FileConst {
String SCRIPT = "script"; 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"; String VERSION = ".version";

4
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
View File

@@ -86,7 +86,7 @@ public abstract class AbstractAgentInstaller implements AgentInstaller {
this.params = params; this.params = params;
this.logId = params.getLogId(); this.logId = params.getLogId();
this.startScriptName = Const.START + HostOsTypeEnum.of(params.getOsType()).getScriptSuffix(); 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 @Override
@@ -154,7 +154,7 @@ public abstract class AbstractAgentInstaller implements AgentInstaller {
protected String getAgentHomePath() { protected String getAgentHomePath() {
return PathUtils.buildAppPath(HostOsTypeEnum.WINDOWS.name().equals(params.getOsType()), return PathUtils.buildAppPath(HostOsTypeEnum.WINDOWS.name().equals(params.getOsType()),
sshConfig.getUsername(), sshConfig.getUsername(),
FileConst.AGENT) + Const.SLASH; FileConst.INSTANT_AGENT_PATH) + Const.SLASH;
} }
/** /**

14
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java
View File

@@ -95,7 +95,7 @@ public class HostAgentServiceImpl implements HostAgentService {
public void readLocalAgentVersion() { public void readLocalAgentVersion() {
log.info("HostAgentService-readLocalAgentVersion start"); 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); log.info("HostAgentService-readLocalAgentVersion path: {}", path);
try { try {
if (!Files1.isFile(path)) { if (!Files1.isFile(path)) {
@@ -191,9 +191,9 @@ public class HostAgentServiceImpl implements HostAgentService {
Valid.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE); Valid.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE);
Valid.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE); Valid.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE);
// 保存文件 // 保存文件
String releaseDir = PathUtils.getOrionPath(FileConst.AGENT_RELEASE); String releaseDir = PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE);
String releaseTempDir = PathUtils.getOrionPath(FileConst.AGENT_RELEASE_TEMP); String releaseTempDir = PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE_TEMP);
File releaseTempFile = new File(releaseTempDir + Const.SLASH + FileConst.AGENT_RELEASE_TAR_GZ); File releaseTempFile = new File(releaseTempDir + Const.SLASH + FileConst.INSTANT_AGENT_RELEASE_TAR_GZ);
log.info("HostAgentService.installAgent start releaseTempDir: {}, releaseTempFile: {}", releaseTempDir, releaseTempFile.getAbsolutePath()); log.info("HostAgentService.installAgent start releaseTempDir: {}, releaseTempFile: {}", releaseTempDir, releaseTempFile.getAbsolutePath());
try { try {
// 创建目录 // 创建目录
@@ -278,9 +278,9 @@ public class HostAgentServiceImpl implements HostAgentService {
.hostId(host.getId()) .hostId(host.getId())
.osType(host.getOsType()) .osType(host.getOsType())
.agentKey(host.getAgentKey()) .agentKey(host.getAgentKey())
.agentFilePath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + agentFileName)) .agentFilePath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + agentFileName))
.configFilePath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + FileConst.CONFIG_YAML)) .configFilePath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + FileConst.CONFIG_YAML))
.startScriptPath(PathUtils.getOrionPath(FileConst.AGENT_RELEASE + Const.SLASH + Const.START + os.getScriptSuffix())) .startScriptPath(PathUtils.getOrionPath(FileConst.INSTANT_AGENT_RELEASE + Const.SLASH + Const.START + os.getScriptSuffix()))
.build(); .build();
taskParams.add(params); taskParams.add(params);
// 添加待检查文件 // 添加待检查文件