From 298aaaf48cfb815f15b1e9781d5b19f22501dcb5 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 21 Oct 2024 15:43:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E6=96=B9=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ops/handler/monitor/MonitorAgentInstallTask.java | 12 +++++++----- .../src/main/resources/application.properties | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java b/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java index fdbe8402..d6979c75 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java @@ -38,7 +38,10 @@ import com.orion.ops.entity.domain.MachineInfoDO; import com.orion.ops.entity.domain.MachineMonitorDO; import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.service.api.*; +import com.orion.ops.service.api.MachineEnvService; +import com.orion.ops.service.api.MachineInfoService; +import com.orion.ops.service.api.MachineMonitorService; +import com.orion.ops.service.api.WebSideMessageService; import com.orion.ops.utils.PathBuilders; import com.orion.spring.SpringHolder; import lombok.SneakyThrows; @@ -64,8 +67,6 @@ public class MonitorAgentInstallTask implements Runnable { private static final MachineMonitorService machineMonitorService = SpringHolder.getBean(MachineMonitorService.class); - private static final MachineMonitorEndpointService machineMonitorEndpointService = SpringHolder.getBean(MachineMonitorEndpointService.class); - private static final WebSideMessageService webSideMessageService = SpringHolder.getBean(WebSideMessageService.class); private final Long machineId; @@ -171,7 +172,8 @@ private void startAgentApp(String startScriptPath) { try { // 执行启动命令 this.appendLog("开始执行启动脚本 path: {}", startScriptPath); - executor = session.getCommandExecutor("bash -l " + startScriptPath); + // executor = session.getCommandExecutor("bash -l " + startScriptPath); + executor = session.getCommandExecutor(startScriptPath); executor.getChannel().setPty(false); CommandExecutors.syncExecCommand(executor, logStream); int exitCode = executor.getExitCode(); @@ -235,7 +237,7 @@ private String getStartScript(String agentJarPath) { param.put("processName", MonitorConst.AGENT_FILE_NAME_PREFIX); param.put("machineId", machineId); param.put("agentJarPath", agentJarPath); - return Strings.format(MonitorConst.START_SCRIPT_VALUE, param); + return Strings.format(MonitorConst.START_SCRIPT_VALUE, param).replaceAll("\r\n", "\n"); } /** diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application.properties b/orion-ops-api/orion-ops-web/src/main/resources/application.properties index 9803a4f8..b8c0dcd1 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/application.properties +++ b/orion-ops-api/orion-ops-web/src/main/resources/application.properties @@ -43,7 +43,7 @@ log.interceptor.ignore.fields=avatar,password,beforePassword,protectPassword,com expose.api.access.header=accessToken expose.api.access.secret=ops_access # 监控配置 -machine.monitor.latest.version=1.0.1 +machine.monitor.latest.version=1.0.2 machine.monitor.default.url=http://{}:9220 machine.monitor.default.access.header=accessToken machine.monitor.default.access.token=agent_access From c05504d71d6648bc34a0a44bd5ae381731212090 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 24 Oct 2024 09:37:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 8 ++++---- docker/adminer/build.sh | 2 +- docker/mysql/build.sh | 2 +- docker/push.sh | 2 +- docker/redis/build.sh | 2 +- docker/service/build.sh | 2 +- orion-ops-api/orion-ops-common/pom.xml | 2 +- orion-ops-api/orion-ops-dao/pom.xml | 2 +- orion-ops-api/orion-ops-data/pom.xml | 2 +- orion-ops-api/orion-ops-mapping/pom.xml | 2 +- orion-ops-api/orion-ops-model/pom.xml | 2 +- orion-ops-api/orion-ops-runner/pom.xml | 2 +- orion-ops-api/orion-ops-service/pom.xml | 2 +- orion-ops-api/orion-ops-web/pom.xml | 2 +- .../src/main/resources/application.properties | 2 +- orion-ops-api/pom.xml | 2 +- orion-ops-vue/package.json | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d5acc918..fa998b45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-ops: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.9 ports: - 1022:22 - 1080:80 @@ -19,7 +19,7 @@ services: - orion-ops-db - orion-ops-redis orion-ops-db: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.9 privileged: true environment: - MYSQL_DATABASE=orion-ops @@ -33,7 +33,7 @@ services: - /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files - /data/orion-ops-space/docker-volumes/mysql/etc-mysql:/etc/mysql orion-ops-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.9 privileged: true ports: - 16379:6379 @@ -43,7 +43,7 @@ services: - /data/orion-ops-space/docker-volumes/orion-ops-redis/data:/data command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}" orion-ops-adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.9 restart: always ports: - 18080:8080 \ No newline at end of file diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 6e8fdbd9..584f2b83 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=1.2.8 +version=1.2.9 docker build -t orion-ops-adminer:${version} . docker tag orion-ops-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 05350402..569e2995 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.8 +version=1.2.9 cp -r ../../sql ./sql docker build -t orion-ops-mysql:${version} . rm -rf ./sql diff --git a/docker/push.sh b/docker/push.sh index 1043797f..3a7ee919 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.8 +version=1.2.9 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index f13162fd..e77df9d3 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=1.2.8 +version=1.2.9 docker build -t orion-ops-redis:${version} . docker tag orion-ops-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index 1da48b99..1b48dad0 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.8 +version=1.2.9 mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web.jar ./ mv ../../orion-ops-vue/dist ./ cp $HOME/orion-ops/lib/machine-monitor-agent-latest.jar ./ diff --git a/orion-ops-api/orion-ops-common/pom.xml b/orion-ops-api/orion-ops-common/pom.xml index a5f2cb8a..339a624e 100644 --- a/orion-ops-api/orion-ops-common/pom.xml +++ b/orion-ops-api/orion-ops-common/pom.xml @@ -5,7 +5,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-dao/pom.xml b/orion-ops-api/orion-ops-dao/pom.xml index b6ae4267..d3b0ff3b 100644 --- a/orion-ops-api/orion-ops-dao/pom.xml +++ b/orion-ops-api/orion-ops-dao/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-data/pom.xml b/orion-ops-api/orion-ops-data/pom.xml index 290ae5d0..e10694b6 100644 --- a/orion-ops-api/orion-ops-data/pom.xml +++ b/orion-ops-api/orion-ops-data/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-mapping/pom.xml b/orion-ops-api/orion-ops-mapping/pom.xml index ff82d911..9d564077 100644 --- a/orion-ops-api/orion-ops-mapping/pom.xml +++ b/orion-ops-api/orion-ops-mapping/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-model/pom.xml b/orion-ops-api/orion-ops-model/pom.xml index 23fecbde..85f3c261 100644 --- a/orion-ops-api/orion-ops-model/pom.xml +++ b/orion-ops-api/orion-ops-model/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-runner/pom.xml b/orion-ops-api/orion-ops-runner/pom.xml index 970030fa..6a78159c 100644 --- a/orion-ops-api/orion-ops-runner/pom.xml +++ b/orion-ops-api/orion-ops-runner/pom.xml @@ -4,7 +4,7 @@ orion-ops-api com.orion.ops - 1.2.8 + 1.2.9 orion-ops-runner diff --git a/orion-ops-api/orion-ops-service/pom.xml b/orion-ops-api/orion-ops-service/pom.xml index 76de8bd4..2fa4b05f 100644 --- a/orion-ops-api/orion-ops-service/pom.xml +++ b/orion-ops-api/orion-ops-service/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-web/pom.xml b/orion-ops-api/orion-ops-web/pom.xml index 4c001e4b..a2c354b6 100644 --- a/orion-ops-api/orion-ops-web/pom.xml +++ b/orion-ops-api/orion-ops-web/pom.xml @@ -4,7 +4,7 @@ com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 ../pom.xml diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application.properties b/orion-ops-api/orion-ops-web/src/main/resources/application.properties index b8c0dcd1..cd1d2a79 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/application.properties +++ b/orion-ops-api/orion-ops-web/src/main/resources/application.properties @@ -31,7 +31,7 @@ logging.logback.rollingpolicy.max-history=30 logging.logback.rollingpolicy.max-file-size=64MB logging.logback.rollingpolicy.total-size-cap=0B # app -app.version=1.2.8 +app.version=1.2.9 login.token.header=O-Login-Token value.mix.secret.key=${SECRET_KEY:orion_ops} demo.mode=${DEMO_MODE:false} diff --git a/orion-ops-api/pom.xml b/orion-ops-api/pom.xml index 98321acb..1bb00798 100644 --- a/orion-ops-api/pom.xml +++ b/orion-ops-api/pom.xml @@ -11,7 +11,7 @@ orion-ops-api com.orion.ops orion-ops-api - 1.2.8 + 1.2.9 pom 4.0.0 https://github.com/lijiahangmax/orion-ops diff --git a/orion-ops-vue/package.json b/orion-ops-vue/package.json index 4fae401c..36a6cd42 100644 --- a/orion-ops-vue/package.json +++ b/orion-ops-vue/package.json @@ -1,6 +1,6 @@ { "name": "orion-ops-vue", - "version": "1.2.8", + "version": "1.2.9", "private": true, "scripts": { "serve": "vue-cli-service serve --mode dev",