From f1ade56e1324533a427af8bff6006267ae79299c Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 25 Jun 2025 18:48:25 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- docker/adminer/build.sh | 2 +- docker/guacd/Dockerfile | 6 ++++++ docker/guacd/build.sh | 2 +- docker/mysql/build.sh | 2 +- docker/push.sh | 2 +- docker/redis/build.sh | 2 +- docker/service/build.sh | 2 +- docker/ui/build.sh | 2 +- .../java/org/dromara/visor/common/constant/AppConst.java | 2 +- orion-visor-ui/.env.development | 2 +- orion-visor-ui/.env.production | 2 +- orion-visor-ui/package.json | 2 +- pom.xml | 2 +- 14 files changed, 19 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5a6735c5..d0e2aece 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ version: '3.3' +# latest = 2.4.0 services: ui: image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest @@ -100,7 +101,6 @@ services: GUACD_LOG_FILE: /var/log/guacd.log volumes: - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/guacd/drive:/drive - - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/guacd/record:/record - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/guacd/var-logs:/var/log - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/guacd/local-guacamole-lib:/usr/local/guacamole/lib - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/guacd/local-guacamole-extensions:/usr/local/guacamole/extensions diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index f5085cfd..946851b1 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest diff --git a/docker/guacd/Dockerfile b/docker/guacd/Dockerfile index f9e67f68..8687d57f 100644 --- a/docker/guacd/Dockerfile +++ b/docker/guacd/Dockerfile @@ -1 +1,7 @@ FROM guacamole/guacd:1.5.5 +USER root +# 系统时区 +ARG TZ=Asia/Shanghai +# 设置时区 +RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \ + echo '${TZ}' > /etc/timezone diff --git a/docker/guacd/build.sh b/docker/guacd/build.sh index 46a86d07..fab46a88 100644 --- a/docker/guacd/build.sh +++ b/docker/guacd/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=1.0.0 +version=2.4.0 docker build -t orion-visor-guacd:${version} . docker tag orion-visor-guacd:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:${version} docker tag orion-visor-guacd:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 6182604d..b521946d 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/push.sh b/docker/push.sh index 4baba7e7..7b853ab1 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index 292baaa5..57be5160 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest diff --git a/docker/service/build.sh b/docker/service/build.sh index bab0a84b..154ed210 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar docker build -t orion-visor-service:${version} . rm -rf ./orion-visor-launch.jar diff --git a/docker/ui/build.sh b/docker/ui/build.sh index cadd9df8..b925c4cc 100644 --- a/docker/ui/build.sh +++ b/docker/ui/build.sh @@ -1,6 +1,6 @@ #/bin/bash set -e -version=2.3.9 +version=2.4.0 mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-ui:${version} . rm -rf ./orion-visor-launch.jar diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java index e80c7282..1dd49d18 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java @@ -36,7 +36,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.3.9"; + String VERSION = "2.4.0"; /** * 同 ${spring.application.name} diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index ad91bf7c..1a56480a 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -3,4 +3,4 @@ VITE_API_BASE_URL=http://127.0.0.1:9200/orion-visor/api # websocket 路径 VITE_WS_BASE_URL=ws://127.0.0.1:9200/orion-visor/keep-alive # 版本号 -VITE_APP_VERSION=2.3.9 +VITE_APP_VERSION=2.4.0 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index ee096b13..75998f13 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -3,4 +3,4 @@ VITE_API_BASE_URL=/orion-visor/api # websocket 路径 VITE_WS_BASE_URL=/orion-visor/keep-alive # 版本号 -VITE_APP_VERSION=2.3.9 +VITE_APP_VERSION=2.4.0 diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 97463716..8832e820 100644 --- a/orion-visor-ui/package.json +++ b/orion-visor-ui/package.json @@ -1,7 +1,7 @@ { "name": "orion-visor-ui", "description": "Orion Visor UI", - "version": "2.3.9", + "version": "2.4.0", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index ea8eb4ea..9d2e79a7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.3.9 + 2.4.0 8 8 3.0.0-M5