From 5d1a3b8a26f25b41f5b50115b7b99a8336b390e8 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Sun, 2 Mar 2025 13:35:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ops/task/fixed/TerminalHeartbeatDownChecker.java | 2 +- .../src/main/resources/application-dev.properties | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java index 31ea550f..71d1ac59 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java @@ -51,7 +51,7 @@ public class TerminalHeartbeatDownChecker { try { v.heartbeatDownClose(); } catch (Exception e) { - log.error("terminal 心跳检查断连失败 token: {} {}", k, e); + log.error("terminal 心跳检查断连失败 token: {}", k, e); } }); } diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application-dev.properties b/orion-ops-api/orion-ops-web/src/main/resources/application-dev.properties index 6761abd6..635e8e94 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/application-dev.properties +++ b/orion-ops-api/orion-ops-web/src/main/resources/application-dev.properties @@ -1,10 +1,10 @@ # redis -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=Data@123456 +spring.redis.host=${REDIS_HOST:127.0.0.1} +spring.redis.port=${REDIS_PORT:6379} +spring.redis.password=${REDIS_PASSWORD:Data@123456} # mysql -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true -spring.datasource.username=root -spring.datasource.password=Data@123456 +spring.datasource.url=jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true +spring.datasource.username=${MYSQL_USER:root} +spring.datasource.password=${MYSQL_PASSWORD:Data@123456} # mybatis mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl -- Gitee From 4ec128bd9b4e9452a7a3f9f812c3075e57a5f2e3 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 4 Mar 2025 15:44:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index d62ad7bd..de973fd5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ version: '3.3' services: orion-ops: image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-ops:latest + privileged: true ports: - 1022:22 - 1080:80 @@ -15,6 +16,7 @@ services: - SECRET_KEY=orion_ops - DEMO_MODE=false volumes: + - /root/orion-ops:/root/orion-ops - /data/orion-ops-space/docker-volumes/root-orion:/root/orion depends_on: - orion-ops-db -- Gitee