Merge pull request #60 from lijiahangmax/dev

Dev
lijiahangmax · Oct 24, 2024 · b1aaaf4 · b1aaaf4
2 parents 5e7273f + c05504d
commit b1aaaf4
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 26 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-dao/pom.xml b/orion-ops-api/orion-ops-dao/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-data/pom.xml b/orion-ops-api/orion-ops-data/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-mapping/pom.xml b/orion-ops-api/orion-ops-mapping/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-model/pom.xml b/orion-ops-api/orion-ops-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-runner/pom.xml b/orion-ops-api/orion-ops-runner/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>orion-ops-api</artifactId>
         <groupId>com.orion.ops</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <name>orion-ops-runner</name>

diff --git a/orion-ops-api/orion-ops-service/pom.xml b/orion-ops-api/orion-ops-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...rion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java b/...rion-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/pom.xml b/orion-ops-api/orion-ops-web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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
@@ -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}
@@ -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
diff --git a/orion-ops-api/pom.xml b/orion-ops-api/pom.xml
@@ -11,7 +11,7 @@
     <name>orion-ops-api</name>
     <groupId>com.orion.ops</groupId>
     <artifactId>orion-ops-api</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.9</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
     <url>https://github.com/lijiahangmax/orion-ops</url>

diff --git 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",