From 2e36d0f44b9512339dc7020ea637dd7784a6efa1 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 9 Jul 2025 00:26:55 +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 --- README.md | 2 +- docker-compose.yml | 2 +- docker-upgrade.sh | 4 ++-- pull.sh => git-pull.sh | 0 .../visor/common/constant/AppConst.java | 2 +- orion-visor-dependencies/pom.xml | 2 +- .../dromara/visor/launch/ReplaceVersion.java | 4 ++-- .../terminal/TerminalAccessVncHandler.java | 22 +++++++++++++++++++ orion-visor-ui/.env.development | 2 +- orion-visor-ui/.env.production | 2 +- orion-visor-ui/package.json | 2 +- pom.xml | 2 +- sql/init-4-data.sql | 14 +++++++----- 13 files changed, 42 insertions(+), 18 deletions(-) rename pull.sh => git-pull.sh (100%) diff --git a/README.md b/README.md index fef29570..8e591ad0 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ **`orion-visor`** 提供一站式自动化运维解决方案。 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。 -* **在线终端**：提供在线终端 SSH/RDP 等多种协议，支持快捷命令、自定义快捷键和主题风格。 +* **在线终端**：提供在线终端 SSH/RDP/VNC 等多种协议，支持快捷命令、自定义快捷键和主题风格。 * **文件管理**：支持远程主机 SFTP 大文件的批量上传、下载和在线编辑等操作。 * **批量操作**：支持批量执行主机命令、多主机文件分发等功能。 * **计划任务**：支持配置 cron 表达式，定时执行主机命令。 diff --git a/docker-compose.yml b/docker-compose.yml index c354536b..1b731345 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.3' -# latest = 2.4.1 +# latest = 2.4.2 # 支持以下源 # lijiahangmax/* diff --git a/docker-upgrade.sh b/docker-upgrade.sh index 12a18087..590118a3 100644 --- a/docker-upgrade.sh +++ b/docker-upgrade.sh @@ -8,9 +8,9 @@ if [ "$1" == "demo" ]; then export DEMO_MODE=true echo "Starting services for demo mode..." # 启动指定的服务 - docker compose up -d --remove-orphans mysql redis ui service guacd adminer + docker compose up -d --pull --remove-orphans mysql redis ui service guacd adminer else echo "Starting all services..." # 正常启动所有服务 - docker compose up -d --remove-orphans + docker compose up -d --pull --remove-orphans fi diff --git a/pull.sh b/git-pull.sh similarity index 100% rename from pull.sh rename to git-pull.sh 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 133ecb40..56fab02a 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.4.1"; + String VERSION = "2.4.2"; /** * 同 ${spring.application.name} diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 96526559..72642b7d 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.4.1 + 2.4.2 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java index 4be3d63b..d4b056fd 100644 --- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java @@ -39,9 +39,9 @@ import java.util.function.Function; */ public class ReplaceVersion { - private static final String TARGET_VERSION = "2.4.0"; + private static final String TARGET_VERSION = "2.4.1"; - private static final String REPLACE_VERSION = "2.4.1"; + private static final String REPLACE_VERSION = "2.4.2"; private static final String PATH = new File("").getAbsolutePath(); diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/TerminalAccessVncHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/TerminalAccessVncHandler.java index fe772f4d..92a4ac4e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/TerminalAccessVncHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/TerminalAccessVncHandler.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.dromara.visor.module.terminal.handler.terminal; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 18b59f51..a9980fe5 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.4.1 +VITE_APP_VERSION=2.4.2 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index 25daa624..9ef22fae 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.4.1 +VITE_APP_VERSION=2.4.2 diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 25609244..d057bd54 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.4.1", + "version": "2.4.2", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index 96546390..a97a3ece 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.4.1 + 2.4.2 8 8 3.0.0-M5 diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql index 1eac8910..68c34c13 100644 --- a/sql/init-4-data.sql +++ b/sql/init-4-data.sql @@ -370,12 +370,12 @@ INSERT INTO `dict_value` VALUES (459, 27, 'terminalConnectType', 'RDP', 'RDP', ' INSERT INTO `dict_value` VALUES (460, 68, 'graphColorDepth', '8', '低质量 (8bit)', '{}', 10, '2025-06-19 00:56:41', '2025-06-19 00:56:41', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (461, 68, 'graphColorDepth', '16', '中质量 (16bit)', '{}', 20, '2025-06-19 00:56:53', '2025-06-19 00:56:53', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (462, 68, 'graphColorDepth', '24', '高质量 (24bit)', '{}', 30, '2025-06-19 00:57:21', '2025-06-19 00:57:21', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (463, 69, 'screenResolution', '1920x1080', '1920x1080 (最佳平衡)', '{\"width\": 1920, \"height\": 1080}', 10, '2025-06-19 00:57:51', '2025-06-19 00:58:04', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (464, 69, 'screenResolution', '1600x900', '1600x900 (良好)', '{\"width\": 1600, \"height\": 900}', 20, '2025-06-19 00:58:25', '2025-06-19 00:59:24', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (465, 69, 'screenResolution', '1440x900', '1440x900 (良好)', '{\"width\": 1440, \"height\": 900}', 30, '2025-06-19 00:58:52', '2025-06-19 00:59:30', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (466, 69, 'screenResolution', '1366x768', '1366x768 (低带宽)', '{\"width\": 1366, \"height\": 768}', 40, '2025-06-19 00:59:48', '2025-06-22 00:48:45', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (467, 69, 'screenResolution', '1280x720', '1280x720 (低带宽)', '{\"width\": 1280, \"height\": 720}', 50, '2025-06-19 00:59:59', '2025-06-19 00:59:59', 'admin', 'admin', 0); -INSERT INTO `dict_value` VALUES (468, 69, 'screenResolution', '1024x768', '1024x768 (兼容性)', '{\"width\": 1024, \"height\": 768}', 60, '2025-06-19 01:00:10', '2025-06-19 01:00:10', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (463, 69, 'screenResolution', '1920x1080', '1920x1080', '{\"width\": 1920, \"height\": 1080}', 10, '2025-06-19 00:57:51', '2025-07-03 02:36:09', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (464, 69, 'screenResolution', '1600x900', '1600x900', '{\"width\": 1600, \"height\": 900}', 20, '2025-06-19 00:58:25', '2025-07-03 02:36:05', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (465, 69, 'screenResolution', '1440x900', '1440x900', '{\"width\": 1440, \"height\": 900}', 30, '2025-06-19 00:58:52', '2025-07-03 02:36:01', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (466, 69, 'screenResolution', '1366x768', '1366x768', '{\"width\": 1366, \"height\": 768}', 40, '2025-06-19 00:59:48', '2025-07-03 02:35:58', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (467, 69, 'screenResolution', '1280x720', '1280x720', '{\"width\": 1280, \"height\": 720}', 50, '2025-06-19 00:59:59', '2025-07-03 02:35:54', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (468, 69, 'screenResolution', '1024x768', '1024x768', '{\"width\": 1024, \"height\": 768}', 60, '2025-06-19 01:00:10', '2025-07-03 02:35:50', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (469, 70, 'timezone', 'Asia/Shanghai', '中国上海', '{}', 10, '2025-06-19 01:00:27', '2025-06-19 01:00:27', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (470, 70, 'timezone', 'America/New_York', '美国东部', '{}', 20, '2025-06-19 01:00:40', '2025-06-19 01:00:40', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (471, 70, 'timezone', 'Europe/London', '英国伦敦', '{}', 30, '2025-06-19 01:00:52', '2025-06-19 01:00:52', 'admin', 'admin', 0); @@ -427,6 +427,8 @@ INSERT INTO `dict_value` VALUES (516, 2, 'operatorLogType', 'terminal:rdp-upload INSERT INTO `dict_value` VALUES (517, 2, 'operatorLogType', 'terminal:rdp-download', '下载文件(RDP)', '{}', 120, '2024-02-23 17:55:03', '2024-10-15 15:54:47', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (518, 33, 'terminalFileOperatorType', 'terminal:rdp-upload', '上传文件(RDP)', '{}', 100, '2024-03-05 16:52:06', '2025-06-29 12:27:24', 'admin', 'admin', 0); INSERT INTO `dict_value` VALUES (519, 33, 'terminalFileOperatorType', 'terminal:rdp-download', '下载文件(RDP)', '{}', 110, '2024-03-05 16:52:18', '2025-06-29 12:28:52', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (520, 58, 'hostType', 'VNC', 'VNC', '{\"color\": \"pinkpurple\"}', 30, '2025-07-01 16:02:01', '2025-07-03 00:56:56', 'admin', 'admin', 0); +INSERT INTO `dict_value` VALUES (521, 27, 'terminalConnectType', 'VNC', 'VNC', '{\"color\": \"pinkpurple\"}', 40, '2025-07-01 16:02:21', '2025-07-03 00:56:54', 'admin', 'admin', 0); -- 菜单配置 INSERT INTO `system_menu` VALUES (1, 0, '工作台', NULL, 1, 10, 1, 1, 1, 0, 'IconComputer', NULL, 'workplace', '2023-07-28 10:51:50', '2024-08-11 00:05:44', 'admin', 'admin', 0);