From 2e9806057365aae319edec624e2dc5610da0ea4a Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 2 Jul 2025 23:35:46 +0800
Subject: [PATCH 01/31] =?UTF-8?q?:rocket:=20=E5=8D=87=E7=BA=A7=20orion-kit?=
 =?UTF-8?q?=20=E7=89=88=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/visor/common/constant/Const.java | 3 ---
 .../{HttpHeaderConst.java => CustomHeaderConst.java}       | 6 ++----
 orion-visor-dependencies/pom.xml                           | 2 +-
 .../module/infra/controller/UserAggregateController.java   | 7 +++----
 .../infra/define/cache/PreferenceCacheKeyDefine.java       | 2 +-
 .../dromara/visor/module/terminal/utils/SftpFileUtils.java | 2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)
 rename orion-visor-common/src/main/java/org/dromara/visor/common/constant/{HttpHeaderConst.java => CustomHeaderConst.java} (87%)

diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java
index 1fcd64f8..e0b5ba56 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java
@@ -51,9 +51,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst,
 
     String SYSTEM_USERNAME = "system";
 
-    // FIXME KIT
-    String ADMINISTRATOR = "Administrator";
-
     Long ALL_HOST_ID = -1L;
 
     int BATCH_COUNT = 500;
diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java
similarity index 87%
rename from orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java
rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java
index 3e87a5ea..3f1017cc 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java
@@ -22,16 +22,14 @@
  */
 package org.dromara.visor.common.constant;
 
-import cn.orionsec.kit.lang.constant.StandardHttpHeader;
-
 /**
- * http 请求头
+ * 自定义请求头
  *
  * @author Jiahang Li
  * @version 1.0.0
  * @since 2025/7/1 1:02
  */
-public interface HttpHeaderConst extends StandardHttpHeader {
+public interface CustomHeaderConst {
 
     String APP_VERSION = "X-App-Version";
 
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index 7dc53199..96526559 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -18,7 +18,7 @@
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
-        <orion.kit.version>2.0.1</orion.kit.version>
+        <orion.kit.version>2.0.2</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java
index c43678d2..71dc5b99 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java
@@ -22,11 +22,12 @@
  */
 package org.dromara.visor.module.infra.controller;
 
+import cn.orionsec.kit.web.servlet.web.Servlets;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.AppConst;
-import org.dromara.visor.common.constant.HttpHeaderConst;
+import org.dromara.visor.common.constant.CustomHeaderConst;
 import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
 import org.dromara.visor.framework.log.core.enums.IgnoreLogMode;
 import org.dromara.visor.framework.web.core.annotation.RestWrapper;
@@ -71,10 +72,8 @@ public class UserAggregateController {
     @GetMapping("/user")
     @Operation(summary = "获取用户权限聚合信息")
     public UserAggregateVO getUserAggregateInfo(HttpServletResponse response) {
-        // FIXME KIT
         // 设置版本号请求头
-        response.setHeader(HttpHeaderConst.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaderConst.APP_VERSION);
-        response.setHeader(HttpHeaderConst.APP_VERSION, AppConst.VERSION);
+        Servlets.addCustomHeader(response, CustomHeaderConst.APP_VERSION, AppConst.VERSION);
         // 获取用户信息
         return userAggregateService.getUserAggregateInfo();
     }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java
index 2075a57d..5f6a1d89 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 public interface PreferenceCacheKeyDefine {
 
     CacheKeyDefine PREFERENCE = new CacheKeyBuilder()
-            .key("v1:user:prefer:{}:{}")
+            .key("user:prefer:{}:{}")
             .desc("用户偏好 ${userId} ${type}")
             .type(JSONObject.class)
             .struct(RedisCacheStruct.STRING)
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java
index 8c97c447..2ffe54cb 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java
@@ -79,7 +79,7 @@ public class SftpFileUtils {
         SftpFileVO vo = new SftpFileVO();
         vo.setName(file.getName());
         vo.setPath(file.getPath());
-        vo.setSuffix(Files1.getSuffix(file.getName()));
+        vo.setSuffix(Files1.getFileNameSuffix(file.getName()));
         vo.setSize(file.getSize());
         vo.setPermission(file.getPermission());
         vo.setUid(file.getUid());

From 2175a9fb40866b7484b9899e7eae608f323bdb0f Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 2 Jul 2025 23:43:01 +0800
Subject: [PATCH 02/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E7=89=88=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                         |  2 ++
 docker-compose.yml                                   |  2 ++
 .../configuration/OrionRedisAutoConfiguration.java   | 12 ++++++++++++
 .../additional-spring-configuration-metadata.json    |  6 ++++++
 .../src/main/resources/application-dev.yaml          |  2 ++
 .../src/main/resources/application-prod.yaml         |  2 ++
 6 files changed, 26 insertions(+)

diff --git a/.env.example b/.env.example
index 5979522a..886ce7a2 100644
--- a/.env.example
+++ b/.env.example
@@ -15,6 +15,8 @@ MYSQL_ROOT_PASSWORD=Data@123456
 
 REDIS_HOST=redis
 REDIS_PASSWORD=Data@123456
+REDIS_DATABASE=0
+REDIS_DATA_VERSION=1
 
 GUACD_HOST=guacd
 GUACD_PORT=4822
diff --git a/docker-compose.yml b/docker-compose.yml
index a1f6fd61..24736576 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,8 @@ services:
       MYSQL_PASSWORD: ${MYSQL_PASSWORD:-Data@123456}
       REDIS_HOST: ${REDIS_HOST:-redis}
       REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
+      REDIS_DATABASE: ${REDIS_DATABASE:-0}
+      REDIS_DATA_VERSION: ${REDIS_DATA_VERSION:-1}
       GUACD_HOST: ${GUACD_HOST:-guacd}
       GUACD_PORT: ${GUACD_PORT:-4822}
       GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive}
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
index 96652341..55ca9b83 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
@@ -22,6 +22,7 @@
  */
 package org.dromara.visor.framework.redis.configuration;
 
+import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine;
 import org.dromara.visor.common.constant.AutoConfigureOrderConst;
 import org.dromara.visor.common.interfaces.Locker;
 import org.dromara.visor.common.utils.LockerUtils;
@@ -31,6 +32,7 @@ import org.dromara.visor.framework.redis.core.utils.RedisUtils;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -101,5 +103,15 @@ public class OrionRedisAutoConfiguration {
         return redisLocker;
     }
 
+    /**
+     * 设置 redis 数据版本
+     *
+     * @param dataVersion dataVersion
+     */
+    @Value("${spring.redis.data-version}")
+    public void setDataVersion(String dataVersion) {
+        CacheKeyDefine.setGlobalPrefix("v" + dataVersion + ":");
+    }
+
 }
 
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 51558866..6164f65c 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -25,6 +25,12 @@
       "description": "最小空闲连接数.",
       "defaultValue": "16"
     },
+    {
+      "name": "spring.redis.data-version",
+      "type": "java.lang.String",
+      "description": "redis 数据版本.",
+      "defaultValue": "1"
+    },
     {
       "name": "no.redis",
       "type": "java.lang.Boolean",
diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml
index 1d3509f1..84d61baa 100644
--- a/orion-visor-launch/src/main/resources/application-dev.yaml
+++ b/orion-visor-launch/src/main/resources/application-dev.yaml
@@ -13,6 +13,8 @@ spring:
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:Data@123456}
+    database: ${REDIS_DATABASE:10}
+    data-version: ${REDIS_DATA_VERSION:1}
   redisson:
     threads: 2
     netty-threads: 2
diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml
index 244f939c..c86b4f11 100644
--- a/orion-visor-launch/src/main/resources/application-prod.yaml
+++ b/orion-visor-launch/src/main/resources/application-prod.yaml
@@ -24,6 +24,8 @@ spring:
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:Data@123456}
+    database: ${REDIS_DATABASE:0}
+    data-version: ${REDIS_DATA_VERSION:1}
   redisson:
     threads: 4
     netty-threads: 4

From 0b4e42ee89387babd507b07a9242c2f463272f05 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 2 Jul 2025 23:50:27 +0800
Subject: [PATCH 03/31] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E6=97=A0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-visor-spring-boot-starter-redis/pom.xml           | 2 +-
 ...figuration.java => OrionMockRedisAutoConfiguration.java} | 6 +++---
 .../META-INF/additional-spring-configuration-metadata.json  | 4 ++--
 ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 2 +-
 orion-visor-launch/src/main/resources/application-dev.yaml  | 4 +---
 5 files changed, 8 insertions(+), 10 deletions(-)
 rename orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/{OrionNoRedisAutoConfiguration.java => OrionMockRedisAutoConfiguration.java} (95%)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
index a33a408a..10fa2ffc 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml
@@ -37,7 +37,7 @@
             <artifactId>netty-all</artifactId>
         </dependency>
 
-        <!-- test redis noRedis -->
+        <!-- test redis MockRedis -->
         <dependency>
             <groupId>com.github.fppt</groupId>
             <artifactId>jedis-mock</artifactId>
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java
similarity index 95%
rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java
rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java
index c5d2303b..be3188ec 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java
@@ -38,17 +38,17 @@ import java.net.InetAddress;
 import java.util.function.Supplier;
 
 /**
- * noRedis 配置
+ * MockRedis
  * 仅用于本地调试无 redis 的情况
  *
  * @author Jiahang Li
  * @version 1.0.0
  * @since 2024/12/26 10:02
  */
-@ConditionalOnProperty(value = "no.redis", havingValue = "true")
+@ConditionalOnProperty(value = "spring.redis.mock", havingValue = "true")
 @AutoConfiguration
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS - 10)
-public class OrionNoRedisAutoConfiguration {
+public class OrionMockRedisAutoConfiguration {
 
     /**
      * @return mocked redis server
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 6164f65c..c4acc2b4 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -32,9 +32,9 @@
       "defaultValue": "1"
     },
     {
-      "name": "no.redis",
+      "name": "spring.redis.mock",
       "type": "java.lang.Boolean",
-      "description": "是否无 redis.",
+      "description": "是否使用 mock redis, 一般用于无 redis 调试时使用.",
       "defaultValue": false
     }
   ]
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index cccc4c8f..62154a02 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,3 @@
-org.dromara.visor.framework.redis.configuration.OrionNoRedisAutoConfiguration
+org.dromara.visor.framework.redis.configuration.OrionMockRedisAutoConfiguration
 org.dromara.visor.framework.redis.configuration.OrionRedisAutoConfiguration
 org.dromara.visor.framework.redis.configuration.OrionCacheAutoConfiguration
\ No newline at end of file
diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml
index 84d61baa..2c59d903 100644
--- a/orion-visor-launch/src/main/resources/application-dev.yaml
+++ b/orion-visor-launch/src/main/resources/application-dev.yaml
@@ -15,6 +15,7 @@ spring:
     password: ${REDIS_PASSWORD:Data@123456}
     database: ${REDIS_DATABASE:10}
     data-version: ${REDIS_DATA_VERSION:1}
+    mock: false
   redisson:
     threads: 2
     netty-threads: 2
@@ -42,6 +43,3 @@ mybatis-plus:
   configuration:
     # 日志打印
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-no:
-  redis: false

From 6fa2d65e1883c324675ed8861748d7ed363c8992 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Thu, 3 Jul 2025 00:01:41 +0800
Subject: [PATCH 04/31] =?UTF-8?q?:hammer:=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/user/index.ts           |  2 +-
 .../src/views/asset/grant/index.vue           |  4 +-
 .../src/views/asset/host-identity/index.vue   |  4 +-
 .../host-list/components/host-card-list.vue   | 37 +++++++++++++------
 .../asset/host-list/components/host-table.vue |  1 -
 .../src/views/asset/host-list/index.vue       |  4 +-
 .../src/views/exec/batch-upload/index.vue     |  4 +-
 .../src/views/exec/exec-command/index.vue     |  4 +-
 8 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/orion-visor-ui/src/store/modules/user/index.ts b/orion-visor-ui/src/store/modules/user/index.ts
index 8db1ebaf..0a39d838 100644
--- a/orion-visor-ui/src/store/modules/user/index.ts
+++ b/orion-visor-ui/src/store/modules/user/index.ts
@@ -30,7 +30,7 @@ const checkForVersionUpdate = (serverVersion: string) => {
       return;
     }
     // 提示用户更新
-    if (window.confirm('检测到新版本, 是否刷新页面以获取最新内容?')) {
+    if (window.confirm('检测到新版本, 请强制刷新页面以获取最新内容!')) {
       window.location.reload();
     }
     // 更新 localStorage 记录
diff --git a/orion-visor-ui/src/views/asset/grant/index.vue b/orion-visor-ui/src/views/asset/grant/index.vue
index bfef9767..bf203965 100644
--- a/orion-visor-ui/src/views/asset/grant/index.vue
+++ b/orion-visor-ui/src/views/asset/grant/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container view-container">
+  <div class="layout-container view-container" v-if="render">
     <a-tabs v-model:active-key="activeKey"
             class="tabs-container simple-card"
             size="large"
@@ -32,12 +32,14 @@
 
   const route = useRoute();
 
+  const render = ref();
   const activeKey = ref();
 
   // 加载字典项
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转到指定页
diff --git a/orion-visor-ui/src/views/asset/host-identity/index.vue b/orion-visor-ui/src/views/asset/host-identity/index.vue
index 5b541f4c..418952c3 100644
--- a/orion-visor-ui/src/views/asset/host-identity/index.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container">
+  <div class="layout-container" v-if="render">
     <!-- 列表-表格 -->
     <host-identity-table v-if="renderTable"
                          ref="table"
@@ -36,6 +36,7 @@
   import HostIdentityFormModal from './components/host-identity-form-modal.vue';
   import HostKeyFormDrawer from '../host-key/components/host-key-form-drawer.vue';
 
+  const render = ref();
   const table = ref();
   const card = ref();
   const modal = ref();
@@ -57,6 +58,7 @@
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
 </script>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
index a2ad5317..d0740b5d 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -208,6 +208,31 @@
     <!-- 拓展操作 -->
     <template #extra="{ record }">
       <a-space>
+        <!-- 单协议连接 -->
+        <a-button v-if="record.types?.length === 1"
+                  size="mini"
+                  v-permission="['terminal:terminal:access']"
+                  @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: record.types[0] } })">
+          连接
+        </a-button>
+        <!-- 多协议连接 -->
+        <a-popover v-if="(record.types?.length || 0) > 1"
+                   :title="undefined"
+                   :content-style="{ padding: '8px' }">
+          <a-button v-permission="['terminal:terminal:access']" size="mini">
+            连接
+          </a-button>
+          <template #content>
+            <a-space>
+              <a-button v-for="type in record.types"
+                        :key="type"
+                        size="mini"
+                        @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type} })">
+                {{ type }}
+              </a-button>
+            </a-space>
+          </template>
+        </a-popover>
         <!-- 更多操作 -->
         <a-dropdown trigger="hover" :popup-max-height="false">
           <icon-more class="card-extra-icon" />
@@ -236,18 +261,6 @@
                        @click="deleteRow(record.id)">
               <span class="more-doption error">删除</span>
             </a-doption>
-            <!-- SSH -->
-            <a-doption v-if="record.types.includes(HostType.SSH.value)"
-                       v-permission="['terminal:terminal:access']"
-                       @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: 'SSH' } })">
-              <span class="more-doption normal">SSH</span>
-            </a-doption>
-            <!-- RDP -->
-            <a-doption v-if="record.types.includes(HostType.RDP.value)"
-                       v-permission="['terminal:terminal:access']"
-                       @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: 'RDP' } })">
-              <span class="more-doption normal">RDP</span>
-            </a-doption>
           </template>
         </a-dropdown>
       </a-space>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
index 477331c9..2952a165 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
@@ -274,7 +274,6 @@
               <a-space>
                 <a-button v-for="type in record.types"
                           :key="type"
-                          type="text"
                           size="mini"
                           @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type} })">
                   {{ type }}
diff --git a/orion-visor-ui/src/views/asset/host-list/index.vue b/orion-visor-ui/src/views/asset/host-list/index.vue
index 643059b2..fe024f11 100644
--- a/orion-visor-ui/src/views/asset/host-list/index.vue
+++ b/orion-visor-ui/src/views/asset/host-list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container">
+  <div class="layout-container" v-if="render">
     <!-- 列表-表格 -->
     <host-table v-if="renderTable"
                 ref="table"
@@ -36,6 +36,7 @@
   import HostFormDrawer from './components/host-form-drawer.vue';
   import HostGroupDrawer from '../host-group/drawer/index.vue';
 
+  const render = ref();
   const table = ref();
   const card = ref();
   const drawer = ref();
@@ -57,6 +58,7 @@
   // 加载字典配置
   onBeforeMount(() => {
     useDictStore().loadKeys(dictKeys);
+    render.value = true;
   });
 
 </script>
diff --git a/orion-visor-ui/src/views/exec/batch-upload/index.vue b/orion-visor-ui/src/views/exec/batch-upload/index.vue
index c31dfd75..f34e3c21 100644
--- a/orion-visor-ui/src/views/exec/batch-upload/index.vue
+++ b/orion-visor-ui/src/views/exec/batch-upload/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container upload-container">
+  <div class="layout-container upload-container" v-if="render">
     <!-- 上传面板 -->
     <upload-panel ref="panel" />
   </div>
@@ -20,12 +20,14 @@
 
   const route = useRoute();
 
+  const render = ref();
   const panel = ref();
 
   // 加载字典值
   onMounted(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转日志
diff --git a/orion-visor-ui/src/views/exec/exec-command/index.vue b/orion-visor-ui/src/views/exec/exec-command/index.vue
index 644c650e..9f2d175c 100644
--- a/orion-visor-ui/src/views/exec/exec-command/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container full">
+  <div class="layout-container full" v-if="render">
     <!-- 执行面板 -->
     <div v-show="!logVisible" class="panel-wrapper">
       <exec-command-panel @submit="openLog" />
@@ -34,6 +34,7 @@
   const { visible: logVisible, setVisible: setLogVisible } = useVisible();
   const route = useRoute();
 
+  const render = ref();
   const log = ref();
 
   // 打开日志
@@ -56,6 +57,7 @@
   onMounted(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转日志

From a546827432db5d54d89be149c399310e25394ca9 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Fri, 4 Jul 2025 17:36:45 +0800
Subject: [PATCH 05/31] =?UTF-8?q?:hammer:=20=E9=85=8D=E7=BD=AE=20vnc=20?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../session/config/VncConnectConfig.java      |  56 +++++++
 .../module/asset/api/HostConnectApi.java      |  27 ++++
 .../entity/dto/host/HostVncConfigDTO.java     |  88 +++++++++++
 .../module/asset/enums/HostTypeEnum.java      |   6 +
 .../asset/api/impl/HostConnectApiImpl.java    |  16 ++
 .../host/config/HostConfigStrategyEnum.java   |   5 +
 .../host/config/HostVncConfigStrategy.java    | 116 ++++++++++++++
 .../handler/host/extra/HostExtraItemEnum.java |  10 +-
 .../host/extra/model/HostVncExtraModel.java   |  54 +++++++
 .../extra/strategy/HostRdpExtraStrategy.java  |   1 +
 .../extra/strategy/HostVncExtraStrategy.java  |  50 ++++++
 .../asset/service/HostConnectService.java     |  27 ++++
 .../service/impl/HostConnectServiceImpl.java  | 145 +++++++++++++++---
 13 files changed, 573 insertions(+), 28 deletions(-)
 create mode 100644 orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
 create mode 100644 orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostVncConfigDTO.java
 create mode 100644 orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java
 create mode 100644 orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
 create mode 100644 orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java

diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java b/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
new file mode 100644
index 00000000..39317be0
--- /dev/null
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
@@ -0,0 +1,56 @@
+/*
+ * 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.common.session.config;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * VNC 连接参数
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/4/1 16:57
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "VncConnectConfig", description = "VNC 连接参数")
+public class VncConnectConfig extends BaseConnectConfig {
+
+    @Schema(description = "低带宽模式")
+    private Boolean lowBandwidthMode;
+
+    @Schema(description = "时区")
+    private String timezone;
+
+    @Schema(description = "剪切板编码")
+    private String clipboardEncoding;
+
+}
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java
index 02764b9a..c94db8b4 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java
@@ -24,6 +24,7 @@ package org.dromara.visor.module.asset.api;
 
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.module.asset.entity.dto.host.HostDTO;
 
 /**
@@ -87,4 +88,30 @@ public interface HostConnectApi {
      */
     RdpConnectConfig getRdpConnectConfig(HostDTO host, Long userId);
 
+    /**
+     * 获取 VNC 连接配置
+     *
+     * @param hostId hostId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(Long hostId);
+
+    /**
+     * 使用用户配置获取 VNC 连接配置
+     *
+     * @param hostId hostId
+     * @param userId userId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(Long hostId, Long userId);
+
+    /**
+     * 使用用户配置获取 VNC 连接配置
+     *
+     * @param host   host
+     * @param userId userId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(HostDTO host, Long userId);
+
 }
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostVncConfigDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostVncConfigDTO.java
new file mode 100644
index 00000000..3f3c4be5
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostVncConfigDTO.java
@@ -0,0 +1,88 @@
+/*
+ * 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.asset.entity.dto.host;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.visor.common.handler.data.model.GenericsDataModel;
+import org.dromara.visor.common.security.UpdatePasswordAction;
+
+import javax.validation.constraints.*;
+
+/**
+ * 主机 VNC 配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/13 16:18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "HostVncConfigDTO", description = "主机 VNC 配置业务对象")
+public class HostVncConfigDTO implements GenericsDataModel, UpdatePasswordAction {
+
+    @NotNull
+    @Min(value = 1)
+    @Max(value = 65535)
+    @Schema(description = "主机端口")
+    private Integer port;
+
+    @Size(max = 128)
+    @Schema(description = "用户名")
+    private String username;
+
+    @NotBlank
+    @Size(max = 12)
+    @Schema(description = "认证方式")
+    private String authType;
+
+    @Schema(description = "密码")
+    private String password;
+
+    @Schema(description = "身份id")
+    private Long identityId;
+
+    @Schema(description = "无用户名")
+    private Boolean noUsername;
+
+    @Schema(description = "无密码")
+    private Boolean noPassword;
+
+    @Schema(description = "时区")
+    private String timezone;
+
+    @Schema(description = "剪切板编码")
+    private String clipboardEncoding;
+
+    @Schema(description = "是否使用新密码 仅参数")
+    private Boolean useNewPassword;
+
+    @Schema(description = "是否已设置密码 仅返回")
+    private Boolean hasPassword;
+
+}
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java
index 206ba242..e4bf6760 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java
@@ -27,6 +27,7 @@ import lombok.AllArgsConstructor;
 import org.dromara.visor.common.constant.Const;
 import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO;
 import org.dromara.visor.module.asset.entity.dto.host.HostSshConfigDTO;
+import org.dromara.visor.module.asset.entity.dto.host.HostVncConfigDTO;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,6 +55,11 @@ public enum HostTypeEnum {
      */
     RDP(HostRdpConfigDTO.class),
 
+    /**
+     * VNC
+     */
+    VNC(HostVncConfigDTO.class),
+
     ;
 
     private final Class<?> clazz;
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/HostConnectApiImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/HostConnectApiImpl.java
index 6ffcc687..4f13662f 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/HostConnectApiImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/HostConnectApiImpl.java
@@ -25,6 +25,7 @@ package org.dromara.visor.module.asset.api.impl;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.module.asset.api.HostConnectApi;
 import org.dromara.visor.module.asset.convert.HostProviderConvert;
 import org.dromara.visor.module.asset.entity.dto.host.HostDTO;
@@ -77,4 +78,19 @@ public class HostConnectApiImpl implements HostConnectApi {
         return hostConnectService.getRdpConnectConfig(HostProviderConvert.MAPPER.to(host), userId);
     }
 
+    @Override
+    public VncConnectConfig getVncConnectConfig(Long hostId) {
+        return hostConnectService.getVncConnectConfig(hostId);
+    }
+
+    @Override
+    public VncConnectConfig getVncConnectConfig(Long hostId, Long userId) {
+        return hostConnectService.getVncConnectConfig(hostId, userId);
+    }
+
+    @Override
+    public VncConnectConfig getVncConnectConfig(HostDTO host, Long userId) {
+        return hostConnectService.getVncConnectConfig(HostProviderConvert.MAPPER.to(host), userId);
+    }
+
 }
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostConfigStrategyEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostConfigStrategyEnum.java
index 17018a08..e479fe2b 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostConfigStrategyEnum.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostConfigStrategyEnum.java
@@ -49,6 +49,11 @@ public enum HostConfigStrategyEnum implements GenericsStrategyDefinition {
      */
     RDP(HostRdpConfigStrategy.class),
 
+    /**
+     * VNC
+     */
+    VNC(HostVncConfigStrategy.class),
+
     ;
 
     private final Class<? extends GenericsDataStrategy<? extends GenericsDataModel>> strategyClass;
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java
new file mode 100644
index 00000000..290e64f0
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java
@@ -0,0 +1,116 @@
+/*
+ * 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.asset.handler.host.config;
+
+import cn.orionsec.kit.lang.utils.Booleans;
+import cn.orionsec.kit.lang.utils.Strings;
+import org.dromara.visor.common.constant.Const;
+import org.dromara.visor.common.constant.ErrorMessage;
+import org.dromara.visor.common.utils.Valid;
+import org.dromara.visor.module.asset.dao.HostIdentityDAO;
+import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
+import org.dromara.visor.module.asset.entity.dto.host.HostVncConfigDTO;
+import org.dromara.visor.module.asset.enums.HostAuthTypeEnum;
+import org.dromara.visor.module.asset.enums.HostIdentityTypeEnum;
+import org.dromara.visor.module.asset.enums.HostTypeEnum;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 主机 VNC 配置策略
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/19 14:26
+ */
+@Component
+public class HostVncConfigStrategy extends AbstractHostConfigStrategy<HostVncConfigDTO> {
+
+    @Resource
+    private HostIdentityDAO hostIdentityDAO;
+
+    public HostVncConfigStrategy() {
+        super(HostVncConfigDTO.class);
+    }
+
+    @Override
+    public HostVncConfigDTO getDefault() {
+        return HostVncConfigDTO.builder()
+                .port(5900)
+                .username(Const.ROOT)
+                .authType(HostAuthTypeEnum.PASSWORD.name())
+                .noUsername(false)
+                .noPassword(false)
+                .clipboardEncoding(Const.UTF_8)
+                .build();
+    }
+
+    @Override
+    protected void preValid(HostVncConfigDTO model) {
+        // 验证剪切板编码格式
+        String clipboardEncoding = model.getClipboardEncoding();
+        if (!Strings.isBlank(clipboardEncoding)) {
+            this.validCharset(clipboardEncoding);
+        }
+        // 检查主机身份是否存在
+        Long identityId = model.getIdentityId();
+        if (identityId != null) {
+            HostIdentityDO identity = Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
+            Valid.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
+        }
+    }
+
+    @Override
+    protected void valid(HostVncConfigDTO model) {
+        // 验证填充后的参数
+        Valid.valid(model);
+    }
+
+    @Override
+    protected void updateFill(HostVncConfigDTO beforeModel, HostVncConfigDTO afterModel) {
+        // 无密码设置认证方式为密码验证
+        if (Booleans.isTrue(afterModel.getNoPassword())) {
+            afterModel.setAuthType(HostAuthTypeEnum.PASSWORD.name());
+        }
+        // 加密密码
+        this.checkEncryptPassword(afterModel.getAuthType(), beforeModel, afterModel);
+        afterModel.setHasPassword(null);
+        afterModel.setUseNewPassword(null);
+    }
+
+    @Override
+    public HostVncConfigDTO parse(String serialModel) {
+        return HostTypeEnum.VNC.parse(serialModel);
+    }
+
+    @Override
+    public void toView(HostVncConfigDTO model) {
+        if (model == null) {
+            return;
+        }
+        model.setHasPassword(Strings.isNotBlank(model.getPassword()));
+        model.setPassword(null);
+    }
+
+}
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/HostExtraItemEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/HostExtraItemEnum.java
index 2f8b6db9..dd855591 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/HostExtraItemEnum.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/HostExtraItemEnum.java
@@ -27,10 +27,7 @@ import lombok.Getter;
 import org.dromara.visor.common.handler.data.GenericsStrategyDefinition;
 import org.dromara.visor.common.handler.data.model.GenericsDataModel;
 import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy;
-import org.dromara.visor.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy;
-import org.dromara.visor.module.asset.handler.host.extra.strategy.HostRdpExtraStrategy;
-import org.dromara.visor.module.asset.handler.host.extra.strategy.HostSpecExtraStrategy;
-import org.dromara.visor.module.asset.handler.host.extra.strategy.HostSshExtraStrategy;
+import org.dromara.visor.module.asset.handler.host.extra.strategy.*;
 
 /**
  * 主机额外配置项策略枚举
@@ -58,6 +55,11 @@ public enum HostExtraItemEnum implements GenericsStrategyDefinition {
      */
     RDP(HostRdpExtraStrategy.class, true),
 
+    /**
+     * VNC 额外配置
+     */
+    VNC(HostVncExtraStrategy.class, true),
+
     /**
      * 规格信息配置
      */
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
new file mode 100644
index 00000000..183f51bd
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
@@ -0,0 +1,54 @@
+/*
+ * 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.asset.handler.host.extra.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.visor.common.handler.data.model.GenericsDataModel;
+
+/**
+ * 主机拓展信息 - vnc 模型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/20 21:36
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HostVncExtraModel implements GenericsDataModel {
+
+    /**
+     * 端口号
+     */
+    private Integer port;
+
+    /**
+     * 低带宽模式
+     */
+    private Boolean lowBandwidthMode;
+
+}
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostRdpExtraStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostRdpExtraStrategy.java
index fbda5570..709270a2 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostRdpExtraStrategy.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostRdpExtraStrategy.java
@@ -59,6 +59,7 @@ public class HostRdpExtraStrategy extends AbstractGenericsDataStrategy<HostRdpEx
     public HostRdpExtraModel getDefault() {
         return HostRdpExtraModel.builder()
                 .authType(HostExtraAuthTypeEnum.DEFAULT.name())
+                .lowBandwidthMode(false)
                 .build();
     }
 
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java
new file mode 100644
index 00000000..f8053dc5
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java
@@ -0,0 +1,50 @@
+/*
+ * 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.asset.handler.host.extra.strategy;
+
+import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
+import org.dromara.visor.module.asset.handler.host.extra.model.HostVncExtraModel;
+import org.springframework.stereotype.Component;
+
+/**
+ * 主机拓展信息 - rdp 模型处理策略
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/20 22:17
+ */
+@Component
+public class HostVncExtraStrategy extends AbstractGenericsDataStrategy<HostVncExtraModel> {
+
+    public HostVncExtraStrategy() {
+        super(HostVncExtraModel.class);
+    }
+
+    @Override
+    public HostVncExtraModel getDefault() {
+        return HostVncExtraModel.builder()
+                .lowBandwidthMode(false)
+                .build();
+    }
+
+}
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConnectService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConnectService.java
index fee71a48..d9e93c85 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConnectService.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConnectService.java
@@ -24,6 +24,7 @@ package org.dromara.visor.module.asset.service;
 
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.module.asset.entity.domain.HostDO;
 import org.dromara.visor.module.asset.entity.request.host.HostTestConnectRequest;
 
@@ -95,4 +96,30 @@ public interface HostConnectService {
      */
     RdpConnectConfig getRdpConnectConfig(HostDO host, Long userId);
 
+    /**
+     * 获取 VNC 连接配置
+     *
+     * @param hostId hostId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(Long hostId);
+
+    /**
+     * 使用用户配置获取 VNC 连接配置
+     *
+     * @param hostId hostId
+     * @param userId userId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(Long hostId, Long userId);
+
+    /**
+     * 使用用户配置获取 VNC 连接配置
+     *
+     * @param host   host
+     * @param userId userId
+     * @return session
+     */
+    VncConnectConfig getVncConnectConfig(HostDO host, Long userId);
+
 }
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
index 93240932..117cf04b 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
@@ -22,6 +22,7 @@
  */
 package org.dromara.visor.module.asset.service.impl;
 
+import cn.orionsec.kit.lang.utils.Booleans;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.io.Streams;
 import cn.orionsec.kit.net.host.SessionStore;
@@ -30,6 +31,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
 import org.dromara.visor.common.session.config.BaseConnectConfig;
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.common.session.ssh.SessionStores;
 import org.dromara.visor.common.utils.Valid;
 import org.dromara.visor.module.asset.dao.HostDAO;
@@ -40,6 +42,7 @@ import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
 import org.dromara.visor.module.asset.entity.domain.HostKeyDO;
 import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO;
 import org.dromara.visor.module.asset.entity.dto.host.HostSshConfigDTO;
+import org.dromara.visor.module.asset.entity.dto.host.HostVncConfigDTO;
 import org.dromara.visor.module.asset.entity.request.host.HostTestConnectRequest;
 import org.dromara.visor.module.asset.enums.HostAuthTypeEnum;
 import org.dromara.visor.module.asset.enums.HostExtraAuthTypeEnum;
@@ -48,6 +51,7 @@ import org.dromara.visor.module.asset.enums.HostTypeEnum;
 import org.dromara.visor.module.asset.handler.host.extra.HostExtraItemEnum;
 import org.dromara.visor.module.asset.handler.host.extra.model.HostRdpExtraModel;
 import org.dromara.visor.module.asset.handler.host.extra.model.HostSshExtraModel;
+import org.dromara.visor.module.asset.handler.host.extra.model.HostVncExtraModel;
 import org.dromara.visor.module.asset.service.AssetAuthorizedDataService;
 import org.dromara.visor.module.asset.service.HostConfigService;
 import org.dromara.visor.module.asset.service.HostConnectService;
@@ -189,6 +193,41 @@ public class HostConnectServiceImpl implements HostConnectService {
         return this.getRdpConnectConfig(host, config, extra);
     }
 
+    @Override
+    public VncConnectConfig getVncConnectConfig(Long hostId) {
+        log.info("HostConnectService.getVncConnectConfig-withHost hostId: {}", hostId);
+        // 查询主机
+        HostDO host = hostDAO.selectById(hostId);
+        // 查询主机配置
+        HostVncConfigDTO config = hostConfigService.getHostConfig(hostId, HostTypeEnum.VNC.name());
+        // 获取配置
+        return this.getVncConnectConfig(host, config, null);
+    }
+
+    @Override
+    public VncConnectConfig getVncConnectConfig(Long hostId, Long userId) {
+        // 查询主机
+        HostDO host = hostDAO.selectById(hostId);
+        Valid.notNull(host, ErrorMessage.HOST_ABSENT);
+        // 获取配置
+        return this.getVncConnectConfig(host, userId);
+    }
+
+    @Override
+    public VncConnectConfig getVncConnectConfig(HostDO host, Long userId) {
+        Long hostId = host.getId();
+        log.info("HostConnectService.getVncConnectConfig hostId: {}, userId: {}", hostId, userId);
+        // 验证权限
+        this.validHostAuthorized(userId, hostId);
+        // 获取主机配置
+        HostVncConfigDTO config = hostConfigService.getHostConfig(hostId, HostTypeEnum.VNC.name());
+        Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
+        // 查询主机额外配置
+        HostVncExtraModel extra = hostExtraService.getHostExtra(userId, hostId, HostExtraItemEnum.VNC);
+        // 获取连接配置
+        return this.getVncConnectConfig(host, config, extra);
+    }
+
     /**
      * 获取主机 SSH 连接配置
      *
@@ -254,14 +293,7 @@ public class HostConnectServiceImpl implements HostConnectService {
             connectConfig.setPassword(config.getPassword());
         } else if (HostAuthTypeEnum.KEY.equals(authType)) {
             // 密钥认证
-            Long keyId = config.getKeyId();
-            Valid.notNull(keyId, ErrorMessage.KEY_ABSENT);
-            HostKeyDO key = hostKeyDAO.selectById(keyId);
-            Valid.notNull(key, ErrorMessage.KEY_ABSENT);
-            connectConfig.setKeyId(keyId);
-            connectConfig.setPublicKey(key.getPublicKey());
-            connectConfig.setPrivateKey(key.getPrivateKey());
-            connectConfig.setPrivateKeyPassword(key.getPassword());
+            this.setSshKey(config.getKeyId(), connectConfig);
         }
         return connectConfig;
     }
@@ -279,6 +311,8 @@ public class HostConnectServiceImpl implements HostConnectService {
         // 填充认证信息
         RdpConnectConfig connectConfig = RdpConnectConfig.builder()
                 .hostPort(config.getPort())
+                .username(config.getUsername())
+                .password(config.getPassword())
                 .versionGt81(config.getVersionGt81())
                 .timezone(config.getTimezone())
                 .keyboardLayout(config.getKeyboardLayout())
@@ -304,25 +338,53 @@ public class HostConnectServiceImpl implements HostConnectService {
                 config.setIdentityId(extra.getIdentityId());
             }
         }
-
-        // 身份认证
-        HostAuthTypeEnum authType = HostAuthTypeEnum.of(config.getAuthType());
-        if (HostAuthTypeEnum.IDENTITY.equals(authType)) {
-            // 身份认证 - 仅密码
-            authType = HostAuthTypeEnum.PASSWORD;
-            Valid.notNull(config.getIdentityId(), ErrorMessage.IDENTITY_ABSENT);
-            HostIdentityDO identity = hostIdentityDAO.selectById(config.getIdentityId());
-            Valid.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
-            // 设置身份信息
-            config.setUsername(identity.getUsername());
-            config.setPassword(identity.getPassword());
+        // 填充身份认证信息
+        if (HostAuthTypeEnum.IDENTITY.name().equals(config.getAuthType())) {
+            this.setIdentityPasswordAuthorization(config.getIdentityId(), connectConfig);
         }
+        return connectConfig;
+    }
 
+    /**
+     * 获取 VNC 连接信息
+     *
+     * @param host   host
+     * @param config config
+     * @return info
+     */
+    private VncConnectConfig getVncConnectConfig(HostDO host,
+                                                 HostVncConfigDTO config,
+                                                 HostVncExtraModel extra) {
         // 填充认证信息
-        connectConfig.setUsername(config.getUsername());
-        if (HostAuthTypeEnum.PASSWORD.equals(authType)) {
-            // 密码认证
-            connectConfig.setPassword(config.getPassword());
+        VncConnectConfig connectConfig = VncConnectConfig.builder()
+                .hostPort(config.getPort())
+                .username(config.getUsername())
+                .password(config.getPassword())
+                .timezone(config.getTimezone())
+                .clipboardEncoding(config.getClipboardEncoding())
+                .build();
+        // 填充基础主机信息
+        this.setBaseConnectConfig(connectConfig, host);
+        if (extra != null) {
+            // 设置额外配置信息
+            connectConfig.setLowBandwidthMode(extra.getLowBandwidthMode());
+            // 设置自定义端口
+            Integer extraPort = extra.getPort();
+            if (extraPort != null) {
+                connectConfig.setHostPort(extraPort);
+            }
+        }
+        // 填充身份认证信息
+        if (HostAuthTypeEnum.IDENTITY.name().equals(config.getAuthType())) {
+            this.setIdentityPasswordAuthorization(config.getIdentityId(), connectConfig);
+        }
+        // 无用户名
+        if (Booleans.isTrue(config.getNoUsername())) {
+            connectConfig.setUsername(null);
+        }
+        // 无密码
+        if (Booleans.isTrue(config.getNoPassword())) {
+            connectConfig.setPassword(null);
         }
         return connectConfig;
     }
@@ -366,6 +428,41 @@ public class HostConnectServiceImpl implements HostConnectService {
         }
     }
 
+    /**
+     * 设置密码认证
+     *
+     * @param identityId    identityId
+     * @param connectConfig connectConfig
+     */
+    private void setIdentityPasswordAuthorization(Long identityId, BaseConnectConfig connectConfig) {
+        if (identityId == null) {
+            return;
+        }
+        // 查询身份信息
+        HostIdentityDO identity = hostIdentityDAO.selectById(identityId);
+        Valid.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
+        // 设置身份信息
+        connectConfig.setUsername(identity.getUsername());
+        connectConfig.setPassword(identity.getPassword());
+    }
+
+    /**
+     * 设置 SSH 密钥信息
+     *
+     * @param keyId         keyId
+     * @param connectConfig connectConfig
+     */
+    private void setSshKey(Long keyId, SshConnectConfig connectConfig) {
+        Valid.notNull(keyId, ErrorMessage.KEY_ABSENT);
+        // 查询密钥信息
+        HostKeyDO key = hostKeyDAO.selectById(keyId);
+        Valid.notNull(key, ErrorMessage.KEY_ABSENT);
+        connectConfig.setKeyId(keyId);
+        connectConfig.setPublicKey(key.getPublicKey());
+        connectConfig.setPrivateKey(key.getPrivateKey());
+        connectConfig.setPrivateKeyPassword(key.getPassword());
+    }
+
     /**
      * 设置基础主机信息
      *

From 9e9c390baf4f5d31846548ae361f3faaed789af0 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Fri, 4 Jul 2025 17:43:59 +0800
Subject: [PATCH 06/31] =?UTF-8?q?:hammer:=20=E9=85=8D=E7=BD=AE=20vnc=20?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-visor-ui/src/api/asset/host-config.ts   |  10 ++
 orion-visor-ui/src/api/asset/host-extra.ts    |   6 +
 orion-visor-ui/src/api/asset/host.ts          |   2 +-
 .../host-list/components/host-form-drawer.vue |  30 +++-
 .../host-list/components/host-form-rdp.vue    | 141 ++-------------
 .../host-list/components/host-form-ssh.vue    | 132 ++------------
 .../host-list/components/host-form-vnc.vue    | 168 ++++++++++++++++++
 .../src/views/asset/host-list/types/const.ts  |   4 +
 .../views/asset/host-list/types/form.rules.ts |  71 +++++++-
 .../asset/host-list/types/use-host-config.ts  |  99 +++++++++++
 10 files changed, 417 insertions(+), 246 deletions(-)
 create mode 100644 orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
 create mode 100644 orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts

diff --git a/orion-visor-ui/src/api/asset/host-config.ts b/orion-visor-ui/src/api/asset/host-config.ts
index 7a089263..281d34a0 100644
--- a/orion-visor-ui/src/api/asset/host-config.ts
+++ b/orion-visor-ui/src/api/asset/host-config.ts
@@ -51,6 +51,16 @@ export interface HostRdpConfig extends HostBaseConfig {
   remoteAppArgs?: string;
 }
 
+// 主机 VNC 配置
+export interface HostVncConfig extends HostBaseConfig {
+  identityId?: number;
+  noUsername?: boolean;
+  noPassword?: boolean;
+  portForwardId?: number;
+  timezone?: string;
+  clipboardEncoding?: string;
+}
+
 /**
  * 更新主机配置
  */
diff --git a/orion-visor-ui/src/api/asset/host-extra.ts b/orion-visor-ui/src/api/asset/host-extra.ts
index 9fb2b142..08ebbbca 100644
--- a/orion-visor-ui/src/api/asset/host-extra.ts
+++ b/orion-visor-ui/src/api/asset/host-extra.ts
@@ -33,6 +33,12 @@ export interface HostRdpExtraSettingModel {
   initialProgram: string;
 }
 
+// VNC 额外配置
+export interface HostVncExtraSettingModel {
+  port: number;
+  lowBandwidthMode: boolean;
+}
+
 // 标签额外配置
 export interface HostLabelExtraSettingModel {
   alias: string;
diff --git a/orion-visor-ui/src/api/asset/host.ts b/orion-visor-ui/src/api/asset/host.ts
index 08320dd9..a01dd48e 100644
--- a/orion-visor-ui/src/api/asset/host.ts
+++ b/orion-visor-ui/src/api/asset/host.ts
@@ -5,7 +5,7 @@ import axios from 'axios';
 import qs from 'query-string';
 
 // 主机类型
-export type HostType = 'SSH' | string | undefined;
+export type HostType = 'SSH' | 'RDP' | 'VNC' | string | undefined;
 
 /**
  * 主机创建请求
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue
index 85dc3ed0..03ea8519 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-drawer.vue
@@ -51,6 +51,15 @@
                          class="form-panel"
                          :hostId="hostId" />
         </a-tab-pane>
+        <!-- VNC 配置 -->
+        <a-tab-pane v-permission="['asset:host:update-config']"
+                    key="vnc"
+                    title="VNC"
+                    :disabled="!hostId || !types.includes(HostType.VNC.value)">
+          <host-form-vnc v-if="hostId"
+                         class="form-panel"
+                         :hostId="hostId" />
+        </a-tab-pane>
       </a-tabs>
     </div>
   </a-drawer>
@@ -64,14 +73,15 @@
 
 <script lang="ts" setup>
   import { ref, nextTick } from 'vue';
-  import useVisible from '@/hooks/visible';
   import { Message } from '@arco-design/web-vue';
   import { useCacheStore } from '@/store';
   import { HostType } from '../types/const';
+  import useVisible from '@/hooks/visible';
   import HostFormInfo from './host-form-info.vue';
   import HostFormSpec from './host-form-spec.vue';
   import HostFormSsh from './host-form-ssh.vue';
   import HostFormRdp from './host-form-rdp.vue';
+  import HostFormVnc from './host-form-vnc.vue';
 
   const { visible, setVisible } = useVisible();
 
@@ -115,8 +125,8 @@
     hostId.value = id;
     hostViewUpdated.value = false;
     types.value = [];
-    checkHostGroup();
     setVisible(true);
+    checkHostGroup();
   };
 
   // 检查是否有主机分组
@@ -187,5 +197,21 @@
     width: 100%;
     height: 100%;
     padding: 0 24px;
+
+    :deep(.password-switch) {
+      width: 148px;
+      margin-left: 8px;
+    }
+
+    :deep(.password-auth-type-group) {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+
+      .arco-radio-button {
+        width: 50%;
+        text-align: center;
+      }
+    }
   }
 </style>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
index eadea2fd..f4f58da0 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
@@ -6,7 +6,7 @@
             label-align="right"
             :label-col-props="{ span: 6 }"
             :wrapper-col-props="{ span: 18 }"
-            :rules="rdpFormRules">
+            :rules="formRules">
       <!-- 端口 -->
       <a-form-item field="port"
                    label="端口"
@@ -18,7 +18,6 @@
       <!-- 用户名 -->
       <a-form-item field="username"
                    label="用户名"
-                   :rules="usernameRules"
                    :help="HostAuthType.IDENTITY === formModel.authType ? '将使用主机身份的用户名' : undefined"
                    hide-asterisk>
         <a-input v-model="formModel.username"
@@ -30,7 +29,7 @@
                    label="认证方式"
                    hide-asterisk>
         <a-radio-group type="button"
-                       class="auth-type-group usn"
+                       class="password-auth-type-group usn"
                        v-model="formModel.authType"
                        :options="toRadioOptions(passwordAuthTypeKey)" />
       </a-form-item>
@@ -38,7 +37,6 @@
       <a-form-item v-if="HostAuthType.PASSWORD === formModel.authType"
                    field="password"
                    label="主机密码"
-                   :rules="passwordRules"
                    hide-asterisk>
         <a-input-password v-model="formModel.password"
                           :disabled="!formModel.useNewPassword && formModel.hasPassword"
@@ -160,7 +158,6 @@
                    mini>
           <a-button class="extra-button"
                     type="primary"
-                    :loading="connectLoading"
                     long
                     @click="testConnect">
             测试连接
@@ -178,7 +175,6 @@
 </script>
 
 <script lang="ts" setup>
-  import type { FieldRule } from '@arco-design/web-vue';
   import type { HostRdpConfig } from '@/api/asset/host-config';
   import { ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
@@ -186,10 +182,7 @@
   import { passwordAuthTypeKey, HostAuthType, HostType, timezoneKey, keyboardLayoutKey, clipboardNormalizeKey } from '../types/const';
   import { IdentityType } from '@/views/asset/host-identity/types/const';
   import { rdpFormRules } from '../types/form.rules';
-  import { Message } from '@arco-design/web-vue';
-  import { encrypt } from '@/utils/rsa';
-  import { testHostConnect } from '@/api/asset/host';
-  import { getHostConfig, updateHostConfig } from '@/api/asset/host-config';
+  import useHostConfigForm from '../types/use-host-config';
   import HostIdentitySelector from '@/components/asset/host-identity/selector/index.vue';
 
   const props = defineProps<{
@@ -197,130 +190,29 @@
   }>();
 
   const { loading, setLoading } = useLoading();
-  const { loading: connectLoading, setLoading: setConnectLoading } = useLoading();
   const { toOptions, toRadioOptions } = useDictStore();
 
-  const formRef = ref();
   const formModel = ref<HostRdpConfig>({} as HostRdpConfig);
 
-  // 用户名验证
-  const usernameRules = [{
-    validator: (value, cb) => {
-      if (value && value.length > 128) {
-        cb('用户名长度不能大于128位');
-        return;
-      }
-      if (formModel.value.authType !== HostAuthType.IDENTITY && !value) {
-        cb('请输入用户名');
-        return;
-      }
-    }
-  }] as FieldRule[];
-
-  // 密码验证
-  const passwordRules = [{
-    validator: (value, cb) => {
-      if (value && value.length > 256) {
-        cb('密码长度不能大于256位');
-        return;
-      }
-      if (formModel.value.useNewPassword && !value) {
-        cb('请输入密码');
-        return;
-      }
-    }
-  }] as FieldRule[];
-
-  // 加载配置
-  const fetchHostConfig = async () => {
-    try {
-      setLoading(true);
-      // 加载配置
-      const { data } = await getHostConfig<HostRdpConfig>({
-        hostId: props.hostId,
-        type: HostType.RDP.value,
-      });
-      formModel.value = data;
-      // 使用新密码默认为不包含密码
-      formModel.value.useNewPassword = !formModel.value.hasPassword;
-    } catch ({ message }) {
-      Message.error(`配置加载失败 ${message}`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  // 测试连接
-  const testConnect = async () => {
-    // 验证参数
-    const error = await formRef.value.validate();
-    if (error) {
-      return;
-    }
-    try {
-      setConnectLoading(true);
-      // 测试连接
-      await testHostConnect({
-        id: props.hostId,
-        type: HostType.RDP.value,
-      });
-      Message.success('连接成功');
-    } catch (e) {
-    } finally {
-      setConnectLoading(false);
-    }
-  };
-
-  // 保存配置
-  const saveConfig = async () => {
-    // 验证参数
-    const error = await formRef.value.validate();
-    if (error) {
-      return;
-    }
-    // 加密参数
-    const requestData = { ...formModel.value };
-    try {
-      requestData.password = await encrypt(formModel.value.password);
-    } catch (e) {
-      return;
-    }
-    try {
-      setLoading(true);
-      // 更新
-      await updateHostConfig({
-        hostId: props.hostId,
-        type: HostType.RDP.value,
-        config: JSON.stringify(requestData),
-      });
-      Message.success('修改成功');
-    } catch (e) {
-    } finally {
-      setLoading(false);
-    }
-  };
+  const {
+    formRef,
+    formRules,
+    fetchHostConfig,
+    testConnect,
+    saveConfig,
+  } = useHostConfigForm({
+    type: HostType.RDP.value,
+    hostId: props.hostId,
+    rules: rdpFormRules,
+    formModel,
+    setLoading,
+  });
 
   onMounted(fetchHostConfig);
 
 </script>
 
 <style lang="less" scoped>
-  .auth-type-group {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-
-    :deep(.arco-radio-button) {
-      width: 50%;
-      text-align: center;
-    }
-  }
-
-  .password-switch {
-    width: 148px;
-    margin-left: 8px;
-  }
-
   .advanced-settings {
     margin-bottom: 16px;
 
@@ -339,5 +231,4 @@
       }
     }
   }
-
 </style>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
index 301fbcc1..33367941 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
@@ -4,8 +4,9 @@
     <a-form :model="formModel"
             ref="formRef"
             label-align="right"
-            :auto-label-width="true"
-            :rules="sshFormRules">
+            :label-col-props="{ span: 6 }"
+            :wrapper-col-props="{ span: 18 }"
+            :rules="formRules">
       <!-- 端口 -->
       <a-form-item field="port"
                    label="端口"
@@ -17,7 +18,6 @@
       <!-- 用户名 -->
       <a-form-item field="username"
                    label="用户名"
-                   :rules="usernameRules"
                    :help="HostAuthType.IDENTITY === formModel.authType ? '将使用主机身份的用户名' : undefined">
         <a-input v-model="formModel.username"
                  :disabled="HostAuthType.IDENTITY === formModel.authType"
@@ -35,8 +35,7 @@
       <!-- 主机密码 -->
       <a-form-item v-if="HostAuthType.PASSWORD === formModel.authType"
                    field="password"
-                   label="主机密码"
-                   :rules="passwordRules">
+                   label="主机密码">
         <a-input-password v-model="formModel.password"
                           :disabled="!formModel.useNewPassword && formModel.hasPassword"
                           placeholder="主机密码" />
@@ -105,7 +104,6 @@
                    mini>
           <a-button class="extra-button"
                     type="primary"
-                    :loading="connectLoading"
                     long
                     @click="testConnect">
             测试连接
@@ -123,17 +121,13 @@
 </script>
 
 <script lang="ts" setup>
-  import type { FieldRule } from '@arco-design/web-vue';
   import type { HostSshConfig } from '@/api/asset/host-config';
   import { ref, onMounted } from 'vue';
   import useLoading from '@/hooks/loading';
   import { useDictStore } from '@/store';
   import { sshAuthTypeKey, HostAuthType, HostType } from '../types/const';
   import { sshFormRules } from '../types/form.rules';
-  import { Message } from '@arco-design/web-vue';
-  import { encrypt } from '@/utils/rsa';
-  import { testHostConnect } from '@/api/asset/host';
-  import { getHostConfig, updateHostConfig } from '@/api/asset/host-config';
+  import useHostConfigForm from '../types/use-host-config';
   import HostIdentitySelector from '@/components/asset/host-identity/selector/index.vue';
   import HostKeySelector from '@/components/asset/host-key/selector/index.vue';
 
@@ -142,108 +136,23 @@
   }>();
 
   const { loading, setLoading } = useLoading();
-  const { loading: connectLoading, setLoading: setConnectLoading } = useLoading();
   const { toRadioOptions } = useDictStore();
 
-  const formRef = ref();
   const formModel = ref<HostSshConfig>({} as HostSshConfig);
 
-  // 用户名验证
-  const usernameRules = [{
-    validator: (value, cb) => {
-      if (value && value.length > 128) {
-        cb('用户名长度不能大于128位');
-        return;
-      }
-      if (formModel.value.authType !== HostAuthType.IDENTITY && !value) {
-        cb('请输入用户名');
-        return;
-      }
-    }
-  }] as FieldRule[];
-
-  // 密码验证
-  const passwordRules = [{
-    validator: (value, cb) => {
-      if (value && value.length > 256) {
-        cb('密码长度不能大于256位');
-        return;
-      }
-      if (formModel.value.useNewPassword && !value) {
-        cb('请输入密码');
-        return;
-      }
-    }
-  }] as FieldRule[];
-
-  // 加载配置
-  const fetchHostConfig = async () => {
-    try {
-      setLoading(true);
-      // 加载配置
-      const { data } = await getHostConfig<HostSshConfig>({
-        hostId: props.hostId,
-        type: HostType.SSH.value,
-      });
-      formModel.value = data;
-      // 使用新密码默认为不包含密码
-      formModel.value.useNewPassword = !formModel.value.hasPassword;
-    } catch ({ message }) {
-      Message.error(`配置加载失败 ${message}`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  // 测试连接
-  const testConnect = async () => {
-    // 验证参数
-    const error = await formRef.value.validate();
-    if (error) {
-      return;
-    }
-    try {
-      setConnectLoading(true);
-      // 测试连接
-      await testHostConnect({
-        id: props.hostId,
-        type: HostType.SSH.value,
-      });
-      Message.success('连接成功');
-    } catch (e) {
-    } finally {
-      setConnectLoading(false);
-    }
-  };
-
-  // 保存配置
-  const saveConfig = async () => {
-    // 验证参数
-    const error = await formRef.value.validate();
-    if (error) {
-      return;
-    }
-    // 加密参数
-    const requestData = { ...formModel.value };
-    try {
-      requestData.password = await encrypt(formModel.value.password);
-    } catch (e) {
-      return;
-    }
-    try {
-      setLoading(true);
-      // 更新
-      await updateHostConfig({
-        hostId: props.hostId,
-        type: HostType.SSH.value,
-        config: JSON.stringify(requestData),
-      });
-      Message.success('修改成功');
-    } catch (e) {
-    } finally {
-      setLoading(false);
-    }
-  };
+  const {
+    formRef,
+    formRules,
+    fetchHostConfig,
+    testConnect,
+    saveConfig,
+  } = useHostConfigForm({
+    type: HostType.SSH.value,
+    hostId: props.hostId,
+    rules: sshFormRules,
+    formModel,
+    setLoading,
+  });
 
   onMounted(fetchHostConfig);
 
@@ -261,9 +170,4 @@
     }
   }
 
-  .password-switch {
-    width: 148px;
-    margin-left: 8px;
-  }
-
 </style>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
new file mode 100644
index 00000000..330bb6df
--- /dev/null
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
@@ -0,0 +1,168 @@
+<template>
+  <a-spin :loading="loading">
+    <!-- 表单 -->
+    <a-form :model="formModel"
+            ref="formRef"
+            label-align="right"
+            :label-col-props="{ span: 6 }"
+            :wrapper-col-props="{ span: 18 }"
+            :rules="formRules">
+      <!-- 端口 -->
+      <a-form-item field="port"
+                   label="端口"
+                   hide-asterisk>
+        <a-input-number v-model="formModel.port"
+                        placeholder="请输入 VNC 端口"
+                        hide-button />
+      </a-form-item>
+      <a-row>
+        <a-col :span="8">
+          <!-- 无用户名 -->
+          <a-form-item field="noUsername"
+                       label="无用户名"
+                       :label-col-props="{ span: 18 }"
+                       :wrapper-col-props="{ span: 6 }"
+                       hide-asterisk>
+            <a-switch v-model="formModel.noUsername" type="round" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <!-- 无密码 -->
+          <a-form-item field="noPassword"
+                       label="无密码"
+                       :label-col-props="{ span: 18 }"
+                       :wrapper-col-props="{ span: 6 }"
+                       hide-asterisk>
+            <a-switch v-model="formModel.noPassword" type="round" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <!-- 用户名 -->
+      <a-form-item v-if="formModel.noUsername !== true"
+                   field="username"
+                   label="用户名"
+                   :help="HostAuthType.IDENTITY === formModel.authType ? '将使用主机身份的用户名' : undefined"
+                   hide-asterisk>
+        <a-input v-model="formModel.username"
+                 :disabled="HostAuthType.IDENTITY === formModel.authType"
+                 placeholder="请输入用户名" />
+      </a-form-item>
+      <!-- 认证方式 -->
+      <a-form-item v-if="formModel.noPassword !== true"
+                   field="authType"
+                   label="认证方式"
+                   hide-asterisk>
+        <a-radio-group type="button"
+                       class="password-auth-type-group usn"
+                       v-model="formModel.authType"
+                       :options="toRadioOptions(passwordAuthTypeKey)" />
+      </a-form-item>
+      <!-- 主机密码 -->
+      <a-form-item v-if="formModel.noPassword !== true && HostAuthType.PASSWORD === formModel.authType"
+                   field="password"
+                   label="主机密码"
+                   hide-asterisk>
+        <a-input-password v-model="formModel.password"
+                          :disabled="!formModel.useNewPassword && formModel.hasPassword"
+                          placeholder="主机密码" />
+        <a-switch v-if="formModel.hasPassword"
+                  v-model="formModel.useNewPassword"
+                  class="password-switch"
+                  type="round"
+                  checked-text="使用新密码"
+                  unchecked-text="使用原密码" />
+      </a-form-item>
+      <!-- 主机身份 -->
+      <a-form-item v-if="HostAuthType.IDENTITY === formModel.authType"
+                   field="identityId"
+                   label="主机身份"
+                   hide-asterisk>
+        <host-identity-selector v-model="formModel.identityId"
+                                :type="IdentityType.PASSWORD" />
+      </a-form-item>
+      <!-- 系统时区 -->
+      <a-form-item field="timezone"
+                   label="系统时区"
+                   hide-asterisk>
+        <a-select v-model="formModel.timezone"
+                  placeholder="请选择系统时区"
+                  :options="toOptions(timezoneKey)" />
+      </a-form-item>
+      <!-- 剪切板编码 -->
+      <a-form-item field="clipboardEncoding"
+                   label="剪切板编码"
+                   hide-asterisk>
+        <a-select v-model="formModel.clipboardEncoding"
+                  placeholder="请选择剪切板编码"
+                  :options="toOptions(clipboardEncodingKey)" />
+      </a-form-item>
+      <!-- 操作 -->
+      <a-form-item style="margin-bottom: 0;">
+        <!-- 保存 -->
+        <a-button type="primary"
+                  long
+                  @click="saveConfig">
+          保存
+        </a-button>
+        <!-- 测试连接 -->
+        <a-tooltip position="tr"
+                   content="请先保存后测试连接"
+                   mini>
+          <a-button class="extra-button"
+                    type="primary"
+                    long
+                    @click="testConnect">
+            测试连接
+          </a-button>
+        </a-tooltip>
+      </a-form-item>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'hostFormVnc'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { HostVncConfig } from '@/api/asset/host-config';
+  import { ref, onMounted } from 'vue';
+  import useLoading from '@/hooks/loading';
+  import { useDictStore } from '@/store';
+  import { passwordAuthTypeKey, HostAuthType, HostType, clipboardEncodingKey, timezoneKey } from '../types/const';
+  import { IdentityType } from '@/views/asset/host-identity/types/const';
+  import { vncFormRules } from '../types/form.rules';
+  import useHostConfigForm from '../types/use-host-config';
+  import HostIdentitySelector from '@/components/asset/host-identity/selector/index.vue';
+
+  const props = defineProps<{
+    hostId: number;
+  }>();
+
+  const { loading, setLoading } = useLoading();
+  const { toOptions, toRadioOptions } = useDictStore();
+
+  const formModel = ref<HostVncConfig>({} as HostVncConfig);
+
+  const {
+    formRef,
+    formRules,
+    fetchHostConfig,
+    testConnect,
+    saveConfig,
+  } = useHostConfigForm({
+    type: HostType.VNC.value,
+    hostId: props.hostId,
+    rules: vncFormRules,
+    formModel,
+    setLoading,
+  });
+
+  onMounted(fetchHostConfig);
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/asset/host-list/types/const.ts b/orion-visor-ui/src/views/asset/host-list/types/const.ts
index d06b91c2..7883334a 100644
--- a/orion-visor-ui/src/views/asset/host-list/types/const.ts
+++ b/orion-visor-ui/src/views/asset/host-list/types/const.ts
@@ -24,6 +24,10 @@ export const HostType = {
     value: 'RDP',
     port: 3389,
   },
+  VNC: {
+    value: 'VNC',
+    port: 5900,
+  },
 };
 
 // 系统类型
diff --git a/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts b/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts
index da956171..3903c283 100644
--- a/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts
+++ b/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts
@@ -1,4 +1,7 @@
 import type { FieldRule } from '@arco-design/web-vue';
+import type { Ref } from 'vue';
+import type { HostBaseConfig } from '@/api/asset/host-config';
+import { HostAuthType } from './const';
 
 // 主机表单规则
 export const hostFormRules = {
@@ -62,11 +65,11 @@ export const hostFormRules = {
 export const sshFormRules = {
   port: [{
     required: true,
-    message: '请输入 SSH 端口'
+    message: '请输入端口'
   }, {
     min: 1,
     max: 65535,
-    message: 'SSH 端口不合法'
+    message: '端口不合法'
   }],
   authType: [{
     required: true,
@@ -116,11 +119,11 @@ export const sshFormRules = {
 export const rdpFormRules = {
   port: [{
     required: true,
-    message: '请输入 RDP 端口'
+    message: '请输入端口'
   }, {
     min: 1,
     max: 65535,
-    message: 'RDP 端口不合法'
+    message: '端口不合法'
   }],
   authType: [{
     required: true,
@@ -132,4 +135,64 @@ export const rdpFormRules = {
   }],
 } as Record<string, FieldRule | FieldRule[]>;
 
+// vnc 表单规则
+export const vncFormRules = {
+  port: [{
+    required: true,
+    message: '请输入端口'
+  }, {
+    min: 1,
+    max: 65535,
+    message: '端口不合法'
+  }],
+  authType: [{
+    required: true,
+    message: '请选择认证方式'
+  }],
+  identityId: [{
+    required: true,
+    message: '请选择主机身份'
+  }],
+  clipboardEncoding: [{
+    required: true,
+    message: '请选择剪切板编码'
+  }],
+} as Record<string, FieldRule | FieldRule[]>;
+
+// 基础规则
+export const baseFormRules = {
+  // 用户名验证规则
+  username(formModel: Ref<HostBaseConfig>) {
+    return [{
+      validator: (value: string, cb: (msg?: string) => void) => {
+        if (value && value.length > 128) {
+          cb('用户名长度不能大于128位');
+          return;
+        }
+        if (formModel.value.authType !== HostAuthType.IDENTITY && !value) {
+          cb('请输入用户名');
+          return;
+        }
+        cb();
+      }
+    }] as FieldRule[];
+  },
+  // 密码验证规则
+  password(formModel: Ref<HostBaseConfig>) {
+    return [{
+      validator: (value: string, cb: (msg?: string) => void) => {
+        if (value && value.length > 256) {
+          cb('密码长度不能大于256位');
+          return;
+        }
+        if (formModel.value.useNewPassword && !value) {
+          cb('请输入密码');
+          return;
+        }
+        cb();
+      }
+    }] as FieldRule[];
+  }
+};
+
 export default null;
diff --git a/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts b/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts
new file mode 100644
index 00000000..34ff1af4
--- /dev/null
+++ b/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts
@@ -0,0 +1,99 @@
+import type { Ref } from 'vue';
+import { ref } from 'vue';
+import type { HostBaseConfig } from '@/api/asset/host-config';
+import { getHostConfig, updateHostConfig } from '@/api/asset/host-config';
+import type { FieldRule } from '@arco-design/web-vue';
+import { Message } from '@arco-design/web-vue';
+import { baseFormRules } from './form.rules';
+import { encrypt } from '@/utils/rsa';
+import { testHostConnect } from '@/api/asset/host';
+
+// 主机配置表单信息
+export interface UseHostConfigFormOptions<T extends HostBaseConfig> {
+  type: string;
+  hostId: number;
+  formModel: Ref<T>;
+  rules?: Record<string, FieldRule | FieldRule[]>;
+  setLoading: (loading: boolean) => void;
+}
+
+// 使用主机配置表单
+export default function useHostConfigForm<T extends HostBaseConfig>(options: UseHostConfigFormOptions<T>) {
+  const { type, hostId, formModel, rules, setLoading } = options;
+
+  const formRef = ref();
+  const formRules = ref({ ...rules, username: baseFormRules.username(formModel), password: baseFormRules.password(formModel) });
+
+  // 加载配置
+  const fetchHostConfig = async () => {
+    try {
+      setLoading(true);
+      const { data } = await getHostConfig<T>({ hostId, type });
+      data.useNewPassword = !data.hasPassword;
+      formModel.value = data;
+    } catch (err: any) {
+      Message.error('配置加载失败');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 测试连接
+  const testConnect = async () => {
+    if (!formRef?.value) {
+      return;
+    }
+    const error = await formRef.value.validate();
+    if (error) {
+      return;
+    }
+    try {
+      setLoading(true);
+      // 测试连接
+      await testHostConnect({ id: hostId, type });
+      Message.success('连接成功');
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 保存配置
+  const saveConfig = async () => {
+    if (!formRef?.value) {
+      return;
+    }
+    const error = await formRef.value.validate();
+    if (error) {
+      return;
+    }
+    // 加密密码
+    const data = { ...formModel.value };
+    try {
+      data.password = await encrypt(data.password);
+    } catch (e) {
+      return;
+    }
+    try {
+      setLoading(true);
+      // 更新
+      await updateHostConfig({
+        hostId,
+        type,
+        config: JSON.stringify(data),
+      });
+      Message.success('修改成功');
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return {
+    formRef,
+    formRules,
+    fetchHostConfig,
+    testConnect,
+    saveConfig,
+  };
+}

From ca8c5b53d221a791de4fffaf853c7ad3f4fa7fa9 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Fri, 4 Jul 2025 17:44:17 +0800
Subject: [PATCH 07/31] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-upgrade.sh       | 2 +-
 docker/adminer/build.sh | 2 +-
 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 +-
 pull.sh                 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-upgrade.sh b/docker-upgrade.sh
index 5d6b09cb..12a18087 100644
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -8,7 +8,7 @@ if [ "$1" == "demo" ]; then
     export DEMO_MODE=true
     echo "Starting services for demo mode..."
     # 启动指定的服务
-    docker compose up -d --remove-orphans mysql redis ui service  adminer
+    docker compose up -d --remove-orphans mysql redis ui service guacd adminer
 else
     echo "Starting all services..."
     # 正常启动所有服务
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
index 714410f5..06a7bb84 100644
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 docker build -t orion-visor-adminer:${version} .
diff --git a/docker/guacd/build.sh b/docker/guacd/build.sh
index 0597bab2..cc3e3072 100644
--- a/docker/guacd/build.sh
+++ b/docker/guacd/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 docker build -t orion-visor-guacd:${version} .
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
index 37bf3f45..c43db3ed 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 cp -r ../../sql ./sql
diff --git a/docker/push.sh b/docker/push.sh
index 2de73c74..c8ed73d3 100644
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
index f0a54c46..4c58396c 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 docker build -t orion-visor-redis:${version} .
diff --git a/docker/service/build.sh b/docker/service/build.sh
index f8dd6b97..26274f55 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
diff --git a/docker/ui/build.sh b/docker/ui/build.sh
index 471297e2..e8ed2ae5 100644
--- a/docker/ui/build.sh
+++ b/docker/ui/build.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -e
 version=2.4.1
 mv ../../orion-visor-ui/dist ./dist
diff --git a/pull.sh b/pull.sh
index 457127c2..89d34433 100644
--- a/pull.sh
+++ b/pull.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 git clean -df
 git reset --hard HEAD
 git pull

From 47a14dec6a33a3473ea718136274bce3e7fadf8b Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 01:22:59 +0800
Subject: [PATCH 08/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-build.sh | 40 ++++++++++++++++++++++++++++++++++++++++
 docker/build.sh | 40 ----------------------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 docker-build.sh
 delete mode 100644 docker/build.sh

diff --git a/docker-build.sh b/docker-build.sh
new file mode 100644
index 00000000..57a93baf
--- /dev/null
+++ b/docker-build.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+
+# 版本
+version=2.4.1
+# 是否推送
+push_images=false
+# 命令空间
+namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
+
+# 解析参数
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --push)
+            push_images=true
+            shift
+            ;;
+        *)
+            echo "未知参数: $1"
+            exit 1
+            ;;
+    esac
+done
+
+docker build -f ./docker/ui/Dockerfile -t orion-visor-ui:${version} -t ${namespace}/orion-visor-ui:${version} -t ${namespace}/orion-visor-ui:${version} . && \
+docker build -f ./docker/service/Dockerfile -t orion-visor-service:${version} -t ${namespace}/orion-visor-service:${version} -t ${namespace}/orion-visor-service:${version} . && \
+docker build -f ./docker/mysql/Dockerfile -t orion-visor-mysql:${version} -t ${namespace}/orion-visor-mysql:${version} -t ${namespace}/orion-visor-mysql:${version} . && \
+docker build -f ./docker/redis/Dockerfile -t orion-visor-redis:${version} -t ${namespace}/orion-visor-redis:${version} -t ${namespace}/orion-visor-redis:${version} . && \
+docker build -f ./docker/adminer/Dockerfile -t orion-visor-adminer:${version} -t ${namespace}/orion-visor-adminer:${version} -t ${namespace}/orion-visor-adminer:${version} . && \
+docker build -f ./docker/guacd/Dockerfile -t orion-visor-guacd:${version} -t ${namespace}/orion-visor-guacd:${version} -t ${namespace}/orion-visor-guacd:${version} .
+
+# 推送镜像
+if [ "$push_images" = true ]; then
+    docker push ${namespace}/orion-visor-adminer:${version}
+    docker push ${namespace}/orion-visor-mysql:${version}
+    docker push ${namespace}/orion-visor-redis:${version}
+    docker push ${namespace}/orion-visor-guacd:${version}
+    docker push ${namespace}/orion-visor-service:${version}
+    docker push ${namespace}/orion-visor-ui:${version}
+fi
diff --git a/docker/build.sh b/docker/build.sh
deleted file mode 100644
index 36ba142d..00000000
--- a/docker/build.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-
-# 版本
-version=2.4.1
-# 是否推送
-push_images=false
-# 命令空间
-namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
-
-# 解析参数
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --push)
-            push_images=true
-            shift
-            ;;
-        *)
-            echo "未知参数: $1"
-            exit 1
-            ;;
-    esac
-done
-
-docker build -f ./ui/Dockerfile -t orion-visor-ui:${version} -t ${namespace}/orion-visor-ui:${version} . && \
-docker build -f ./service/Dockerfile -t orion-visor-service:${version} -t ${namespace}/orion-visor-service:${version} . && \
-docker build -f ./mysql/Dockerfile -t orion-visor-mysql:${version} -t ${namespace}/orion-visor-mysql:${version} . && \
-docker build -f ./redis/Dockerfile -t orion-visor-redis:${version} -t ${namespace}/orion-visor-redis:${version} . && \
-docker build -f ./adminer/Dockerfile -t orion-visor-adminer:${version} -t ${namespace}/orion-visor-adminer:${version} . && \
-docker build -f ./guacd/Dockerfile -t orion-visor-guacd:${version} -t ${namespace}/orion-visor-guacd:${version} .
-
-# 推送镜像
-if [ "$push_images" = true ]; then
-    docker push ${namespace}/orion-visor-adminer:${version}
-    docker push ${namespace}/orion-visor-mysql:${version}
-    docker push ${namespace}/orion-visor-redis:${version}
-    docker push ${namespace}/orion-visor-guacd:${version}
-    docker push ${namespace}/orion-visor-service:${version}
-    docker push ${namespace}/orion-visor-ui:${version}
-fi

From 65771f0b4163cf9fce12070243ec12ae3878812d Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 17:44:33 +0800
Subject: [PATCH 09/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-publish.yml          |  34 ++-
 docker-build.sh                               |  40 ---
 docker/build.sh                               | 289 ++++++++++++++++++
 docker/mysql/Dockerfile                       |   6 +-
 docker/redis/Dockerfile                       |   2 +-
 docker/service/Builder.Dockerfile             |  16 +
 docker/service/Dockerfile                     |  22 +-
 docker/ui/Builder.Dockerfile                  |  25 ++
 docker/ui/Dockerfile                          |  32 +-
 .../main/resources/mapper/DataExtraMapper.xml |   2 +-
 10 files changed, 371 insertions(+), 97 deletions(-)
 delete mode 100644 docker-build.sh
 create mode 100644 docker/build.sh
 create mode 100644 docker/service/Builder.Dockerfile
 create mode 100644 docker/ui/Builder.Dockerfile

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 01398dc3..351cdd21 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -27,6 +27,36 @@ jobs:
       - name: 🌱 Checkout repository
         uses: actions/checkout@v4
 
+      - name: ⚙️ Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: ⚙️ Set up Node.js 18
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: 🔧 Install pnpm
+        run: npm i -g pnpm
+
+      - name: 📦 Build Java
+        run: mvn -U clean install -DskipTests
+
+      - name: 📦️ Build UI
+        working-directory: ./orion-visor-ui
+        run: |
+          pnpm install
+          pnpm build
+
+      - name: 📁 Prepare build context
+        run: |
+          cp -r ./sql ./docker/mysql
+          cp -r ./orion-visor-ui/dist ./docker/ui/dist
+          cp ./orion-visor-launch/target/orion-visor-launch.jar ./docker/service/orion-visor-launch.jar
+
       - name: ⚙️ Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -67,7 +97,7 @@ jobs:
       - name: 🛠️ Build and push Docker image for orion-visor-${{ matrix.service }}
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ./docker
           file: ./docker/${{ matrix.service }}/Dockerfile
           push: true
           tags: |
@@ -78,4 +108,4 @@ jobs:
             ${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}:${{ steps.meta.outputs.version }}
             ${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}:latest
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
\ No newline at end of file
+          platforms: linux/amd64,linux/arm64
diff --git a/docker-build.sh b/docker-build.sh
deleted file mode 100644
index 57a93baf..00000000
--- a/docker-build.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-
-# 版本
-version=2.4.1
-# 是否推送
-push_images=false
-# 命令空间
-namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
-
-# 解析参数
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --push)
-            push_images=true
-            shift
-            ;;
-        *)
-            echo "未知参数: $1"
-            exit 1
-            ;;
-    esac
-done
-
-docker build -f ./docker/ui/Dockerfile -t orion-visor-ui:${version} -t ${namespace}/orion-visor-ui:${version} -t ${namespace}/orion-visor-ui:${version} . && \
-docker build -f ./docker/service/Dockerfile -t orion-visor-service:${version} -t ${namespace}/orion-visor-service:${version} -t ${namespace}/orion-visor-service:${version} . && \
-docker build -f ./docker/mysql/Dockerfile -t orion-visor-mysql:${version} -t ${namespace}/orion-visor-mysql:${version} -t ${namespace}/orion-visor-mysql:${version} . && \
-docker build -f ./docker/redis/Dockerfile -t orion-visor-redis:${version} -t ${namespace}/orion-visor-redis:${version} -t ${namespace}/orion-visor-redis:${version} . && \
-docker build -f ./docker/adminer/Dockerfile -t orion-visor-adminer:${version} -t ${namespace}/orion-visor-adminer:${version} -t ${namespace}/orion-visor-adminer:${version} . && \
-docker build -f ./docker/guacd/Dockerfile -t orion-visor-guacd:${version} -t ${namespace}/orion-visor-guacd:${version} -t ${namespace}/orion-visor-guacd:${version} .
-
-# 推送镜像
-if [ "$push_images" = true ]; then
-    docker push ${namespace}/orion-visor-adminer:${version}
-    docker push ${namespace}/orion-visor-mysql:${version}
-    docker push ${namespace}/orion-visor-redis:${version}
-    docker push ${namespace}/orion-visor-guacd:${version}
-    docker push ${namespace}/orion-visor-service:${version}
-    docker push ${namespace}/orion-visor-ui:${version}
-fi
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100644
index 00000000..fe8bacaa
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,289 @@
+#!/bin/bash
+set -e
+
+# 版本号
+version=2.4.1
+# 是否推送镜像
+push_images=false
+# 是否本地构建
+locally_build=false
+# 是否预构建 service
+pre_build_service=false
+# 是否预构建 ui
+pre_build_ui=false
+# 备份后缀
+backup_suffix=".bak"
+# 镜像命名空间
+namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
+
+# 解析命令行参数
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -p|--push)
+      push_images=true
+      shift
+      ;;
+    -l|--locally)
+      locally_build=true
+      shift
+      ;;
+    -pre-service|--prebuild-service)
+      pre_build_service=true
+      shift
+      ;;
+    -pre-ui|--prebuild-ui)
+      pre_build_ui=true
+      shift
+      ;;
+    *)
+      echo "未知参数: $1"
+      exit 1
+      ;;
+  esac
+done
+
+# 要处理的 Dockerfile 列表及对应的镜像名称
+declare -A images=(
+  ["./ui/Dockerfile"]="orion-visor-ui"
+  ["./service/Dockerfile"]="orion-visor-service"
+  ["./mysql/Dockerfile"]="orion-visor-mysql"
+  ["./redis/Dockerfile"]="orion-visor-redis"
+  ["./adminer/Dockerfile"]="orion-visor-adminer"
+  ["./guacd/Dockerfile"]="orion-visor-guacd"
+)
+
+# 准备 service app.jar
+function prepare_app_jar() {
+  local source_file="../orion-visor-launch/target/orion-visor-launch.jar"
+  local target_file="./service/app.jar"
+  if [ ! -f "$target_file" ]; then
+    echo "警告: $target_file 不存在, 正在尝试从 $source_file 复制..."
+    if [ -f "$source_file" ]; then
+      cp "$source_file" "$target_file"
+      echo "✅ 已成功复制 $source_file 至 $target_file"
+    else
+      echo "❌ 错误: $source_file 不存在, 无法继续构建."
+      exit 1
+    fi
+  else
+    echo "✅ $target_file 已存在, 无需复制."
+  fi
+}
+
+# 准备前端 dist 目录
+function prepare_dist_directory() {
+  local source_dir="../orion-visor-ui/dist"
+  local target_dir="./ui/dist"
+  if [ ! -d "$target_dir" ]; then
+    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
+    if [ -d "$source_dir" ]; then
+      cp -r "$source_dir" "$target_dir"
+      echo "✅ 已成功复制 $source_dir 至 $target_dir"
+    else
+      echo "❌ 错误: $source_dir 不存在, 无法继续构建."
+      exit 1
+    fi
+  else
+    echo "✅ $target_dir 已存在, 无需复制."
+  fi
+}
+
+# 准备 mysql sql 目录
+function prepare_sql_directory() {
+  local source_dir="../sql"
+  local target_dir="./mysql/sql"
+  if [ ! -d "$target_dir" ]; then
+    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
+    if [ -d $source_dir ]; then
+      cp -r $source_dir "$target_dir"
+      echo "✅ 已成功复制 ../sql 至 $target_dir"
+    else
+      echo "❌ 错误: $source_dir 不存在！根据预期它应该存在, 请确认路径或项目结构是否正确。"
+      exit 1
+    fi
+  else
+    echo "✅ $target_dir 已存在, 无需复制."
+  fi
+}
+
+# 修改 Dockerfile 前的备份
+function modify_dockerfiles() {
+  if [ "$locally_build" = true ]; then
+    echo "跳过 Dockerfile 修改"
+    return
+  fi
+  for file in "${!images[@]}"; do
+    if [ -f "$file" ]; then
+      echo "备份并修改: $file"
+      cp "$file" "$file$backup_suffix"
+      sed -i 's/--platform=\$BUILDPLATFORM//g' "$file"
+    else
+      echo "文件不存在 -> $file"
+    fi
+  done
+}
+
+# 恢复原始 Dockerfile
+function restore_dockerfiles() {
+  if [ "$locally_build" = true ]; then
+    return
+  fi
+  for file in "${!images[@]}"; do
+    if [ -f "$file$backup_suffix" ]; then
+      echo "恢复: $file"
+      rm -rf "$file"
+      mv "$file$backup_suffix" "$file"
+    fi
+  done
+}
+
+# 构建镜像
+function build_images() {
+  for dockerfile in "${!images[@]}"; do
+    image_name="${images[$dockerfile]}"
+    echo "Building $image_name with version $version and latest tag."
+    docker build -f "$dockerfile" \
+      -t "${image_name}:${version}" \
+      -t "${image_name}:latest" \
+      -t "${namespace}/${image_name}:${version}" \
+      -t "${namespace}/${image_name}:latest" .
+  done
+}
+
+# 推送镜像
+function push_images_to_registry() {
+  if [ "$push_images" = true ]; then
+    echo "📤 正在推送镜像..."
+    for image_name in "${images[@]}"; do
+      docker push "${namespace}/${image_name}:${version}"
+      docker push "${namespace}/${image_name}:latest"
+    done
+  fi
+}
+
+# 执行预构建 service
+function run_prebuild_service() {
+  if [ "$pre_build_service" = false ]; then
+    return
+  fi
+  echo "🛠️ 开始执行 service 预构建流程..."
+
+  local builder_dockerfile="./service/Builder.Dockerfile"
+  local builder_image="orion-visor-service-builder"
+  local builder_container="orion-visor-service-prebuilder"
+  local target_dir="../orion-visor-launch/target"
+  local target_jar="$target_dir/orion-visor-launch.jar"
+
+  # 确保目标目录存在
+  if [ ! -d "$target_dir" ]; then
+    echo "📁 创建目标目录: $target_dir"
+    mkdir -p "$target_dir"
+  else
+    # 如果 jar 已存在, 先删除
+    if [ -f "$target_jar" ]; then
+      echo "🗑️ 删除已有文件: $target_jar"
+      rm -f "$target_jar"
+    fi
+  fi
+
+  # 清理旧容器
+  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
+  if [ -n "$container_id" ]; then
+    echo "🧹 删除旧容器: $builder_container"
+    docker rm -f "$container_id"
+  fi
+
+  # 构建预构建镜像
+  echo "🏗️ 正在构建预构建镜像..."
+  docker build \
+    -f "$builder_dockerfile" \
+    -t "$builder_image" .
+
+  # 创建一个临时容器用于拷贝文件
+  echo "📁 创建临时容器以提取 jar 文件..."
+  docker create --name "$builder_container" "$builder_image" > /dev/null
+
+  # 拷贝构建好的 jar 文件到目标路径
+  echo "📂 正在从容器中拷贝 jar 文件..."
+  docker cp "$builder_container":/build/target/orion-visor-launch.jar "$target_jar"
+
+  # 清理临时容器
+  docker rm -f "$builder_container" > /dev/null
+  echo "✅ 后端预构建完成, jar 文件已保存至: $target_jar"
+}
+
+# 执行预构建 ui
+function run_prebuild_ui() {
+  if [ "$pre_build_ui" = false ]; then
+    return
+  fi
+  echo "🛠️ 开始执行 ui 预构建流程..."
+
+  local builder_dockerfile="./ui/Builder.Dockerfile"
+  local builder_image="orion-visor-ui-builder"
+  local builder_container="orion-visor-ui-prebuilder"
+  local target_dir="../orion-visor-ui/dist"
+
+  # 如果 dist 已存在, 先删除
+  if [ -d "$target_dir" ]; then
+    echo "🗑️ 删除已有目录: $target_dir"
+    rm -rf "$target_dir"
+  fi
+
+  # 清理旧容器
+  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
+  if [ -n "$container_id" ]; then
+    echo "🧹 删除旧容器: $builder_container"
+    docker rm -f "$container_id"
+  fi
+
+  # 构建前端镜像
+  echo "🏗️ 正在构建前端预构建镜像..."
+  docker build \
+    -f "$builder_dockerfile" \
+    -t "$builder_image" .
+
+  # 创建临时容器用于拷贝文件
+  echo "📁 创建临时容器以提取 dist 文件..."
+  docker create --name "$builder_container" "$builder_image" > /dev/null
+
+  # 拷贝 dist 目录
+  echo "📂 正在从容器中拷贝 dist 文件..."
+  docker cp "$builder_container":/app/dist "$target_dir"
+
+  # 清理临时容器
+  docker rm "$builder_container" > /dev/null
+
+  echo "✅ 前端预构建完成, dist 已保存至: $target_dir"
+}
+
+# 预构建
+run_prebuild_service
+run_prebuild_ui
+
+# 检查资源
+echo "🔍 正在检查并准备必要的构建资源..."
+prepare_app_jar
+prepare_dist_directory
+prepare_sql_directory
+echo "✅ 所有前置资源已准备完毕。"
+
+# 修改镜像文件
+echo "✅ 正在备份并修改 Dockerfile..."
+modify_dockerfiles
+
+# 设置异常捕获, 确保失败时恢复 Dockerfile
+trap 'restore_dockerfiles; echo "❌ 构建失败, 已恢复原始 Dockerfile"; exit 1' ERR INT
+
+# 构建镜像
+echo "🏗️ 正在构建镜像..."
+build_images
+
+# 推送镜像
+echo "📦 正在推送镜像..."
+push_images_to_registry
+
+# 恢复原始 Dockerfile
+restore_dockerfiles
+trap - ERR INT
+echo "✅ 构建完成, Dockerfile 已恢复为原始版本"
\ No newline at end of file
diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
index 7b37afb9..185e2137 100644
--- a/docker/mysql/Dockerfile
+++ b/docker/mysql/Dockerfile
@@ -7,11 +7,11 @@ ARG TZ=Asia/Shanghai
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
     echo "${TZ}" > /etc/timezone
 
-# 复制配置
-COPY ./docker/mysql/my.cnf /etc/mysql/conf.d/my.cnf
+# 复制配置文件
+COPY ./mysql/my.cnf /etc/mysql/conf.d/my.cnf
 
 # 复制初始化脚本
-COPY ./sql /tmp
+COPY ./mysql/sql /tmp
 
 # 设置初始化脚本
 RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \
diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
index 42947dc9..251240a3 100644
--- a/docker/redis/Dockerfile
+++ b/docker/redis/Dockerfile
@@ -16,7 +16,7 @@ RUN \
   rm -f /usr/local/redis.conf
 
 # 复制配置文件
-COPY ./docker/redis/redis.conf /usr/local/redis.conf
+COPY ./redis/redis.conf /usr/local/redis.conf
 
 # 启动 Redis 并加载自定义配置
 CMD ["redis-server", "/usr/local/redis.conf"]
\ No newline at end of file
diff --git a/docker/service/Builder.Dockerfile b/docker/service/Builder.Dockerfile
new file mode 100644
index 00000000..50b1e753
--- /dev/null
+++ b/docker/service/Builder.Dockerfile
@@ -0,0 +1,16 @@
+FROM maven:3.9.10-eclipse-temurin-8-alpine AS builder
+
+# 设置阿里云镜像加速
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+# 拷贝 settings.xml
+COPY ./service/settings.xml /root/.m2/
+
+# 复制 POM 文件先进行依赖下载 (利用 Docker 缓存)
+WORKDIR /build
+COPY ../pom.xml .
+RUN mvn dependency:resolve
+
+# 构建
+COPY ../ .
+RUN mvn clean package -DskipTests
diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile
index 5f82c964..5bddabf8 100644
--- a/docker/service/Dockerfile
+++ b/docker/service/Dockerfile
@@ -1,21 +1,3 @@
-# 构建应用
-FROM --platform=$BUILDPLATFORM maven:3.9.10-eclipse-temurin-8-alpine AS builder
-
-# 设置阿里云镜像加速
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-
-# 拷贝 settings.xml
-COPY ./docker/service/settings.xml /root/.m2/
-
-# 复制 POM 文件先进行依赖下载 (利用 Docker 缓存)
-WORKDIR /build
-COPY pom.xml .
-RUN mvn dependency:resolve
-
-# 构建
-COPY . .
-RUN mvn clean package -DskipTests
-
 FROM --platform=$BUILDPLATFORM openjdk:8-jdk-alpine
 
 USER root
@@ -35,8 +17,8 @@ RUN \
   ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
   echo "${TZ}" > /etc/timezone
 
-# 从构建阶段复制 jar 包
-COPY --from=builder /build/orion-visor-launch/target/orion-visor-launch.jar /app/app.jar
+# 复制 jar 包
+COPY ./service/orion-visor-launch.jar /app/app.jar
 
 # 启动
 CMD ["java", "-jar", "/app/app.jar"]
diff --git a/docker/ui/Builder.Dockerfile b/docker/ui/Builder.Dockerfile
new file mode 100644
index 00000000..c439b52d
--- /dev/null
+++ b/docker/ui/Builder.Dockerfile
@@ -0,0 +1,25 @@
+FROM node:18-alpine AS builder
+
+# 设置阿里云镜像加速
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+# 安装 pnpm
+RUN corepack enable && corepack prepare pnpm@latest --activate
+
+WORKDIR /app
+
+# 设置 pnpm 使用指定的 registry
+ARG REGISTRY_URL=https://registry.npmmirror.com
+RUN pnpm config set registry $REGISTRY_URL
+
+# 复制项目文件
+COPY ../orion-visor-ui/package.json ./orion-visor-ui/pnpm-lock.yaml* ./
+
+# 安装依赖 (利用 Docker 缓存层)
+RUN pnpm install --frozen-lockfile
+
+# 复制源代码
+COPY ../orion-visor-ui/ .
+
+# 构建项目
+RUN pnpm build
diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index 9a93db56..ce02e252 100644
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -1,31 +1,3 @@
-# 构建应用
-FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
-
-# 设置阿里云镜像加速
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-
-# 安装 pnpm
-RUN corepack enable && corepack prepare pnpm@latest --activate
-
-WORKDIR /app
-
-# 设置 pnpm 使用指定的 registry
-ARG REGISTRY_URL=https://registry.npmmirror.com
-RUN pnpm config set registry $REGISTRY_URL
-
-# 复制项目文件 (package.json等)
-COPY ./orion-visor-ui/package.json ./orion-visor-ui/pnpm-lock.yaml* ./
-
-# 安装依赖 (利用 Docker 缓存层)
-RUN pnpm install --frozen-lockfile
-
-# 复制源代码
-COPY ./orion-visor-ui/ .
-
-# 构建项目
-RUN pnpm build
-
-# 打包静态资源
 FROM --platform=$BUILDPLATFORM nginx:alpine
 
 # 系统时区
@@ -42,10 +14,10 @@ RUN \
   rm -rf /etc/nginx/conf.d/*
 
 # 复制包
-COPY --from=builder /app/dist /usr/share/nginx/html
+COPY ./ui/dist /usr/share/nginx/html
 
 # 复制配置
-COPY ./docker/ui/nginx.conf /etc/nginx/conf.d
+COPY ./ui/nginx.conf /etc/nginx/conf.d
 
 # 启动
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml
index fd6a0e7d..47c23387 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml
@@ -60,7 +60,7 @@
                                  )
         WHERE deleted = 0
         AND type = 'HOST'
-        AND item IN ('SSH', 'RDP')
+        AND item IN ('SSH', 'RDP', 'VNC')
         <foreach collection="identityIdList" item="item" separator="OR" open="AND (" close=")">
             JSON_CONTAINS(value, JSON_OBJECT('identityId', #{item}))
         </foreach>

From 4dc1364b1124307cbbd15ff2b180b84784b5cc73 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 17:45:24 +0800
Subject: [PATCH 10/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/visor/launch/ReplaceVersion.java     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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 56bc5286..ce19fec7 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
@@ -46,13 +46,7 @@ public class ReplaceVersion {
     private static final String PATH = new File("").getAbsolutePath();
 
     private static final String[] DOCKER_FILES = new String[]{
-            "docker/push.sh",
-            "docker/adminer/build.sh",
-            "docker/mysql/build.sh",
-            "docker/redis/build.sh",
-            "docker/guacd/build.sh",
-            "docker/service/build.sh",
-            "docker/ui/build.sh",
+            "docker/build.sh",
             "docker-compose.yml",
             "docker-compose-testing.yml"
     };

From 5c119deaf40d6c3c322c8914880cff96dea481f9 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 18:14:55 +0800
Subject: [PATCH 11/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-publish.yml | 46 ++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 351cdd21..d7b71efe 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -7,22 +7,12 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-push:
+  build-project:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
-    env:
-      GITHUB_REGISTRY: ghcr.io
-      ALIYUN_REGISTRY: registry.cn-hangzhou.aliyuncs.com
-      ALIYUN_NAMESPACE: ${{ vars.ALIYUN_NAMESPACE }}
-      DOCKERHUB_NAMESPACE: ${{ vars.DOCKERHUB_NAMESPACE }}
-
-    strategy:
-      matrix:
-        service: [ adminer, guacd, mysql, redis, service, ui ]
-
     steps:
       - name: 🌱 Checkout repository
         uses: actions/checkout@v4
@@ -57,6 +47,36 @@ jobs:
           cp -r ./orion-visor-ui/dist ./docker/ui/dist
           cp ./orion-visor-launch/target/orion-visor-launch.jar ./docker/service/orion-visor-launch.jar
 
+      - name: 📤 Upload build context
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-context
+          path: docker
+
+  build-and-push:
+    needs: build-project
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      matrix:
+        service: [ adminer, guacd, mysql, redis, service, ui ]
+
+    env:
+      GITHUB_REGISTRY: ghcr.io
+      ALIYUN_REGISTRY: registry.cn-hangzhou.aliyuncs.com
+      ALIYUN_NAMESPACE: ${{ vars.ALIYUN_NAMESPACE }}
+      DOCKERHUB_NAMESPACE: ${{ vars.DOCKERHUB_NAMESPACE }}
+
+    steps:
+      - name: 📥 Download build context
+        uses: actions/download-artifact@v4
+        with:
+          name: docker-context
+          path: docker
+
       - name: ⚙️ Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -88,7 +108,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            orion-visor-${{ matrix.service }}
+            ${{ env.DOCKERHUB_NAMESPACE }}/orion-visor-${{ matrix.service }}
+            ${{ env.GITHUB_REGISTRY }}/${{ github.repository_owner }}/orion-visor-${{ matrix.service }}
+            ${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}
           tags: |
             type=semver,pattern={{version}}         
             type=semver,pattern={{major}}.{{minor}} 

From 01d53dadd7a366aff648718d0f70c8282399580e Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 19:50:00 +0800
Subject: [PATCH 12/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d7b71efe..716a564b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -43,7 +43,7 @@ jobs:
 
       - name: 📁 Prepare build context
         run: |
-          cp -r ./sql ./docker/mysql
+          cp -r ./sql ./docker/mysql/sql
           cp -r ./orion-visor-ui/dist ./docker/ui/dist
           cp ./orion-visor-launch/target/orion-visor-launch.jar ./docker/service/orion-visor-launch.jar
 

From 97dddf01a78691ae3661849f1846d75954d59573 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 5 Jul 2025 23:43:46 +0800
Subject: [PATCH 13/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/build.sh                               | 289 ------------------
 .../Dockerfile.service}                       |  14 +-
 .../Dockerfile.ui}                            |   6 +-
 .../maven-settings.xml}                       |  11 +
 docker/docker-build.sh                        | 207 +++++++++++++
 docker/project-build.sh                       | 125 ++++++++
 .../dromara/visor/launch/ReplaceVersion.java  |   3 +-
 7 files changed, 355 insertions(+), 300 deletions(-)
 delete mode 100644 docker/build.sh
 rename docker/{service/Builder.Dockerfile => builder/Dockerfile.service} (57%)
 rename docker/{ui/Builder.Dockerfile => builder/Dockerfile.ui} (81%)
 rename docker/{service/settings.xml => builder/maven-settings.xml} (77%)
 create mode 100644 docker/docker-build.sh
 create mode 100644 docker/project-build.sh

diff --git a/docker/build.sh b/docker/build.sh
deleted file mode 100644
index fe8bacaa..00000000
--- a/docker/build.sh
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/bin/bash
-set -e
-
-# 版本号
-version=2.4.1
-# 是否推送镜像
-push_images=false
-# 是否本地构建
-locally_build=false
-# 是否预构建 service
-pre_build_service=false
-# 是否预构建 ui
-pre_build_ui=false
-# 备份后缀
-backup_suffix=".bak"
-# 镜像命名空间
-namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
-
-# 解析命令行参数
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -p|--push)
-      push_images=true
-      shift
-      ;;
-    -l|--locally)
-      locally_build=true
-      shift
-      ;;
-    -pre-service|--prebuild-service)
-      pre_build_service=true
-      shift
-      ;;
-    -pre-ui|--prebuild-ui)
-      pre_build_ui=true
-      shift
-      ;;
-    *)
-      echo "未知参数: $1"
-      exit 1
-      ;;
-  esac
-done
-
-# 要处理的 Dockerfile 列表及对应的镜像名称
-declare -A images=(
-  ["./ui/Dockerfile"]="orion-visor-ui"
-  ["./service/Dockerfile"]="orion-visor-service"
-  ["./mysql/Dockerfile"]="orion-visor-mysql"
-  ["./redis/Dockerfile"]="orion-visor-redis"
-  ["./adminer/Dockerfile"]="orion-visor-adminer"
-  ["./guacd/Dockerfile"]="orion-visor-guacd"
-)
-
-# 准备 service app.jar
-function prepare_app_jar() {
-  local source_file="../orion-visor-launch/target/orion-visor-launch.jar"
-  local target_file="./service/app.jar"
-  if [ ! -f "$target_file" ]; then
-    echo "警告: $target_file 不存在, 正在尝试从 $source_file 复制..."
-    if [ -f "$source_file" ]; then
-      cp "$source_file" "$target_file"
-      echo "✅ 已成功复制 $source_file 至 $target_file"
-    else
-      echo "❌ 错误: $source_file 不存在, 无法继续构建."
-      exit 1
-    fi
-  else
-    echo "✅ $target_file 已存在, 无需复制."
-  fi
-}
-
-# 准备前端 dist 目录
-function prepare_dist_directory() {
-  local source_dir="../orion-visor-ui/dist"
-  local target_dir="./ui/dist"
-  if [ ! -d "$target_dir" ]; then
-    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
-    if [ -d "$source_dir" ]; then
-      cp -r "$source_dir" "$target_dir"
-      echo "✅ 已成功复制 $source_dir 至 $target_dir"
-    else
-      echo "❌ 错误: $source_dir 不存在, 无法继续构建."
-      exit 1
-    fi
-  else
-    echo "✅ $target_dir 已存在, 无需复制."
-  fi
-}
-
-# 准备 mysql sql 目录
-function prepare_sql_directory() {
-  local source_dir="../sql"
-  local target_dir="./mysql/sql"
-  if [ ! -d "$target_dir" ]; then
-    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
-    if [ -d $source_dir ]; then
-      cp -r $source_dir "$target_dir"
-      echo "✅ 已成功复制 ../sql 至 $target_dir"
-    else
-      echo "❌ 错误: $source_dir 不存在！根据预期它应该存在, 请确认路径或项目结构是否正确。"
-      exit 1
-    fi
-  else
-    echo "✅ $target_dir 已存在, 无需复制."
-  fi
-}
-
-# 修改 Dockerfile 前的备份
-function modify_dockerfiles() {
-  if [ "$locally_build" = true ]; then
-    echo "跳过 Dockerfile 修改"
-    return
-  fi
-  for file in "${!images[@]}"; do
-    if [ -f "$file" ]; then
-      echo "备份并修改: $file"
-      cp "$file" "$file$backup_suffix"
-      sed -i 's/--platform=\$BUILDPLATFORM//g' "$file"
-    else
-      echo "文件不存在 -> $file"
-    fi
-  done
-}
-
-# 恢复原始 Dockerfile
-function restore_dockerfiles() {
-  if [ "$locally_build" = true ]; then
-    return
-  fi
-  for file in "${!images[@]}"; do
-    if [ -f "$file$backup_suffix" ]; then
-      echo "恢复: $file"
-      rm -rf "$file"
-      mv "$file$backup_suffix" "$file"
-    fi
-  done
-}
-
-# 构建镜像
-function build_images() {
-  for dockerfile in "${!images[@]}"; do
-    image_name="${images[$dockerfile]}"
-    echo "Building $image_name with version $version and latest tag."
-    docker build -f "$dockerfile" \
-      -t "${image_name}:${version}" \
-      -t "${image_name}:latest" \
-      -t "${namespace}/${image_name}:${version}" \
-      -t "${namespace}/${image_name}:latest" .
-  done
-}
-
-# 推送镜像
-function push_images_to_registry() {
-  if [ "$push_images" = true ]; then
-    echo "📤 正在推送镜像..."
-    for image_name in "${images[@]}"; do
-      docker push "${namespace}/${image_name}:${version}"
-      docker push "${namespace}/${image_name}:latest"
-    done
-  fi
-}
-
-# 执行预构建 service
-function run_prebuild_service() {
-  if [ "$pre_build_service" = false ]; then
-    return
-  fi
-  echo "🛠️ 开始执行 service 预构建流程..."
-
-  local builder_dockerfile="./service/Builder.Dockerfile"
-  local builder_image="orion-visor-service-builder"
-  local builder_container="orion-visor-service-prebuilder"
-  local target_dir="../orion-visor-launch/target"
-  local target_jar="$target_dir/orion-visor-launch.jar"
-
-  # 确保目标目录存在
-  if [ ! -d "$target_dir" ]; then
-    echo "📁 创建目标目录: $target_dir"
-    mkdir -p "$target_dir"
-  else
-    # 如果 jar 已存在, 先删除
-    if [ -f "$target_jar" ]; then
-      echo "🗑️ 删除已有文件: $target_jar"
-      rm -f "$target_jar"
-    fi
-  fi
-
-  # 清理旧容器
-  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
-  if [ -n "$container_id" ]; then
-    echo "🧹 删除旧容器: $builder_container"
-    docker rm -f "$container_id"
-  fi
-
-  # 构建预构建镜像
-  echo "🏗️ 正在构建预构建镜像..."
-  docker build \
-    -f "$builder_dockerfile" \
-    -t "$builder_image" .
-
-  # 创建一个临时容器用于拷贝文件
-  echo "📁 创建临时容器以提取 jar 文件..."
-  docker create --name "$builder_container" "$builder_image" > /dev/null
-
-  # 拷贝构建好的 jar 文件到目标路径
-  echo "📂 正在从容器中拷贝 jar 文件..."
-  docker cp "$builder_container":/build/target/orion-visor-launch.jar "$target_jar"
-
-  # 清理临时容器
-  docker rm -f "$builder_container" > /dev/null
-  echo "✅ 后端预构建完成, jar 文件已保存至: $target_jar"
-}
-
-# 执行预构建 ui
-function run_prebuild_ui() {
-  if [ "$pre_build_ui" = false ]; then
-    return
-  fi
-  echo "🛠️ 开始执行 ui 预构建流程..."
-
-  local builder_dockerfile="./ui/Builder.Dockerfile"
-  local builder_image="orion-visor-ui-builder"
-  local builder_container="orion-visor-ui-prebuilder"
-  local target_dir="../orion-visor-ui/dist"
-
-  # 如果 dist 已存在, 先删除
-  if [ -d "$target_dir" ]; then
-    echo "🗑️ 删除已有目录: $target_dir"
-    rm -rf "$target_dir"
-  fi
-
-  # 清理旧容器
-  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
-  if [ -n "$container_id" ]; then
-    echo "🧹 删除旧容器: $builder_container"
-    docker rm -f "$container_id"
-  fi
-
-  # 构建前端镜像
-  echo "🏗️ 正在构建前端预构建镜像..."
-  docker build \
-    -f "$builder_dockerfile" \
-    -t "$builder_image" .
-
-  # 创建临时容器用于拷贝文件
-  echo "📁 创建临时容器以提取 dist 文件..."
-  docker create --name "$builder_container" "$builder_image" > /dev/null
-
-  # 拷贝 dist 目录
-  echo "📂 正在从容器中拷贝 dist 文件..."
-  docker cp "$builder_container":/app/dist "$target_dir"
-
-  # 清理临时容器
-  docker rm "$builder_container" > /dev/null
-
-  echo "✅ 前端预构建完成, dist 已保存至: $target_dir"
-}
-
-# 预构建
-run_prebuild_service
-run_prebuild_ui
-
-# 检查资源
-echo "🔍 正在检查并准备必要的构建资源..."
-prepare_app_jar
-prepare_dist_directory
-prepare_sql_directory
-echo "✅ 所有前置资源已准备完毕。"
-
-# 修改镜像文件
-echo "✅ 正在备份并修改 Dockerfile..."
-modify_dockerfiles
-
-# 设置异常捕获, 确保失败时恢复 Dockerfile
-trap 'restore_dockerfiles; echo "❌ 构建失败, 已恢复原始 Dockerfile"; exit 1' ERR INT
-
-# 构建镜像
-echo "🏗️ 正在构建镜像..."
-build_images
-
-# 推送镜像
-echo "📦 正在推送镜像..."
-push_images_to_registry
-
-# 恢复原始 Dockerfile
-restore_dockerfiles
-trap - ERR INT
-echo "✅ 构建完成, Dockerfile 已恢复为原始版本"
\ No newline at end of file
diff --git a/docker/service/Builder.Dockerfile b/docker/builder/Dockerfile.service
similarity index 57%
rename from docker/service/Builder.Dockerfile
rename to docker/builder/Dockerfile.service
index 50b1e753..3ca3d34e 100644
--- a/docker/service/Builder.Dockerfile
+++ b/docker/builder/Dockerfile.service
@@ -4,13 +4,13 @@ FROM maven:3.9.10-eclipse-temurin-8-alpine AS builder
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 # 拷贝 settings.xml
-COPY ./service/settings.xml /root/.m2/
+COPY ./docker/builder/maven-settings.xml /root/.m2/settings.xml
+
+WORKDIR /build
+
+COPY . .
 
 # 复制 POM 文件先进行依赖下载 (利用 Docker 缓存)
-WORKDIR /build
-COPY ../pom.xml .
-RUN mvn dependency:resolve
-
+RUN mvn dependency:go-offline --settings=/root/.m2/settings.xml
 # 构建
-COPY ../ .
-RUN mvn clean package -DskipTests
+RUN mvn clean package -DskipTests --settings=/root/.m2/settings.xml
diff --git a/docker/ui/Builder.Dockerfile b/docker/builder/Dockerfile.ui
similarity index 81%
rename from docker/ui/Builder.Dockerfile
rename to docker/builder/Dockerfile.ui
index c439b52d..cc458006 100644
--- a/docker/ui/Builder.Dockerfile
+++ b/docker/builder/Dockerfile.ui
@@ -6,20 +6,20 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 # 安装 pnpm
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
-WORKDIR /app
+WORKDIR /build
 
 # 设置 pnpm 使用指定的 registry
 ARG REGISTRY_URL=https://registry.npmmirror.com
 RUN pnpm config set registry $REGISTRY_URL
 
 # 复制项目文件
-COPY ../orion-visor-ui/package.json ./orion-visor-ui/pnpm-lock.yaml* ./
+COPY ./orion-visor-ui/package.json ./orion-visor-ui/pnpm-lock.yaml* ./
 
 # 安装依赖 (利用 Docker 缓存层)
 RUN pnpm install --frozen-lockfile
 
 # 复制源代码
-COPY ../orion-visor-ui/ .
+COPY ./orion-visor-ui/ .
 
 # 构建项目
 RUN pnpm build
diff --git a/docker/service/settings.xml b/docker/builder/maven-settings.xml
similarity index 77%
rename from docker/service/settings.xml
rename to docker/builder/maven-settings.xml
index b79392eb..11432b16 100644
--- a/docker/service/settings.xml
+++ b/docker/builder/maven-settings.xml
@@ -32,6 +32,17 @@
                     </snapshots>
                 </repository>
             </repositories>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>aliyun-plugin</id>
+                    <url>https://maven.aliyun.com/repository/public</url>
+                </pluginRepository>
+                <pluginRepository>
+                    <id>central-plugin</id>
+                    <url>https://repo.maven.apache.org/maven2</url>
+                </pluginRepository>
+            </pluginRepositories>
         </profile>
     </profiles>
 
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
new file mode 100644
index 00000000..a1d5e6fa
--- /dev/null
+++ b/docker/docker-build.sh
@@ -0,0 +1,207 @@
+#!/bin/bash
+set -e
+
+# DockerContext: orion-visor/docker
+
+# 加载项目构建
+source ./project-build.sh "$@"
+
+# 版本号
+version=2.test
+# 是否推送镜像
+push_image=false
+# 是否构建 latest
+latest_image=false
+# 是否本地构建
+locally_build=false
+# 备份后缀
+backup_suffix=".bak"
+# 镜像命名空间
+namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
+
+# 解析命令行参数
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -l|--locally)
+      locally_build=true
+      shift
+      ;;
+    -latest|latest-image)
+      latest_image=true
+      shift
+      ;;
+    -push|--push-image)
+      push_image=true
+      shift
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+
+# 要处理的 Dockerfile 列表及对应的镜像名称
+declare -A images=(
+  ["./ui/Dockerfile"]="orion-visor-ui"
+  ["./service/Dockerfile"]="orion-visor-service"
+  ["./mysql/Dockerfile"]="orion-visor-mysql"
+  ["./redis/Dockerfile"]="orion-visor-redis"
+  ["./adminer/Dockerfile"]="orion-visor-adminer"
+  ["./guacd/Dockerfile"]="orion-visor-guacd"
+)
+
+# 准备 service jar
+function prepare_app_jar() {
+  local source_file="../orion-visor-launch/target/orion-visor-launch.jar"
+  local target_file="./service/orion-visor-launch.jar"
+  if [ ! -f "$target_file" ]; then
+    echo "警告: $target_file 不存在, 正在尝试从 $source_file 复制..."
+    if [ -f "$source_file" ]; then
+      cp "$source_file" "$target_file"
+      echo "已成功复制 $source_file 至 $target_file"
+    else
+      echo "错误: $source_file 不存在, 无法继续构建."
+      exit 1
+    fi
+  else
+    echo "$target_file 已存在, 无需复制."
+  fi
+}
+
+# 准备前端 dist 目录
+function prepare_dist_directory() {
+  local source_dir="../orion-visor-ui/dist"
+  local target_dir="./ui/dist"
+  if [ ! -d "$target_dir" ]; then
+    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
+    if [ -d "$source_dir" ]; then
+      cp -r "$source_dir" "$target_dir"
+      echo "已成功复制 $source_dir 至 $target_dir"
+    else
+      echo "错误: $source_dir 不存在, 无法继续构建."
+      exit 1
+    fi
+  else
+    echo "$target_dir 已存在, 无需复制."
+  fi
+}
+
+# 准备 mysql sql 目录
+function prepare_sql_directory() {
+  local source_dir="../sql"
+  local target_dir="./mysql/sql"
+  if [ ! -d "$target_dir" ]; then
+    echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
+    if [ -d $source_dir ]; then
+      cp -r $source_dir "$target_dir"
+      echo "已成功复制 ../sql 至 $target_dir"
+    else
+      echo "错误: $source_dir 不存在！根据预期它应该存在, 请确认路径或项目结构是否正确"
+      exit 1
+    fi
+  else
+    echo "$target_dir 已存在, 无需复制."
+  fi
+}
+
+# 修改 Dockerfile 前的备份
+function modify_dockerfiles() {
+  if [ "$locally_build" = false ]; then
+    echo "跳过 Dockerfile 修改"
+    return
+  fi
+  echo "正在备份并修改 Dockerfile..."
+  for file in "${!images[@]}"; do
+    if [ -f "$file" ]; then
+      echo "备份并修改: $file"
+      cp "$file" "$file$backup_suffix"
+      sed -i 's/--platform=\$BUILDPLATFORM//g' "$file"
+    else
+      echo "文件不存在 -> $file"
+    fi
+  done
+}
+
+# 恢复原始 Dockerfile
+function restore_dockerfiles() {
+  if [ "$locally_build" = false ]; then
+    return
+  fi
+  echo "开始恢复 Dockerfile"
+  for file in "${!images[@]}"; do
+    if [ -f "$file$backup_suffix" ]; then
+      echo "恢复: $file"
+      rm -rf "$file"
+      mv "$file$backup_suffix" "$file"
+    fi
+  done
+  echo "Dockerfile 已恢复为原始版本"
+}
+
+# 构建镜像
+function build_images() {
+  echo "构建镜像开始..."
+  for dockerfile in "${!images[@]}"; do
+    image_name="${images[$dockerfile]}"
+    echo "Building $image_name with version $version."
+    # 构建 Docker 镜像
+    docker build -f "$dockerfile" -t "${image_name}:${version}" -t "${namespace}/${image_name}:${version}" .
+    # 添加 latest 标签
+    if [ "$latest_image" = true ]; then
+      echo "Tag $image_name with latest version."
+      docker tag "${image_name}:${version}" "${image_name}:latest"
+      docker tag "${namespace}/${image_name}:${version}" "${namespace}/${image_name}:latest"
+    fi
+  done
+  echo "构建镜像结束..."
+}
+
+# 推送镜像
+function push_image_to_registry() {
+  if [ "$push_image" = true ]; then
+    echo "推送镜像开始..."
+    for image_name in "${images[@]}"; do
+      # 推送版本
+      docker push "${namespace}/${image_name}:${version}"
+      # 推送 latest
+      if [ "latest_image" = true ]; then
+        docker push "${namespace}/${image_name}:latest"
+      fi
+    done
+    echo "推送镜像结束..."
+  fi
+}
+
+# 构建项目-service
+if [ "$build_service" = true ]; then
+  run_build_service
+fi
+
+# 构建项目-ui
+if [ "$build_ui" = true ]; then
+  run_build_ui
+fi
+
+# 检查资源
+echo "正在检查并准备必要的构建资源..."
+prepare_app_jar
+prepare_dist_directory
+prepare_sql_directory
+echo "所有前置资源已准备完毕"
+
+# 修改镜像文件
+modify_dockerfiles
+
+# 设置异常捕获, 确保失败时恢复 Dockerfile
+trap 'restore_dockerfiles; echo "构建失败, 已恢复原始 Dockerfile"; exit 1' ERR INT
+
+# 构建镜像
+build_images
+
+# 推送镜像
+push_image_to_registry
+
+# 恢复原始 Dockerfile
+restore_dockerfiles
+trap - ERR INT
+echo "构建完成"
\ No newline at end of file
diff --git a/docker/project-build.sh b/docker/project-build.sh
new file mode 100644
index 00000000..d264304a
--- /dev/null
+++ b/docker/project-build.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+set -e
+
+# DockerContext: orion-visor
+
+# 版本号
+version=2.test
+# 是否构建 service
+export build_service=false
+# 是否构建 ui
+export build_ui=false
+
+# 解析命令行参数
+for arg in "$@"; do
+  case "$arg" in
+    -service|--build-service)
+      export build_service=true
+      ;;
+    -ui|--build-ui)
+      export build_ui=true
+      ;;
+  esac
+done
+
+# 执行构建 service
+function run_build_service() {
+  echo "开始执行 service 构建流程..."
+
+  local builder_dockerfile="./builder/Dockerfile.service"
+  local builder_image="orion-visor-service-builder"
+  local builder_container="orion-visor-service-builder-ctn"
+  local builder_output="/build/orion-visor-launch/target/orion-visor-launch.jar"
+  local target_dir="../orion-visor-launch/target"
+  local target_jar="$target_dir/orion-visor-launch.jar"
+
+  # 确保目标目录存在
+  if [ ! -d "$target_dir" ]; then
+    echo "创建目标目录: $target_dir"
+    mkdir -p "$target_dir"
+  else
+    # 如果 jar 已存在, 先删除
+    if [ -f "$target_jar" ]; then
+      echo "删除已有文件: $target_jar"
+      rm -f "$target_jar"
+    fi
+  fi
+
+  # 清理旧容器
+  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
+  if [ -n "$container_id" ]; then
+    echo "删除旧容器: $builder_container"
+    docker rm -f "$container_id"
+  fi
+
+  # 构建构建镜像
+  echo "正在构建 service builder image..."
+  docker build \
+    -f "$builder_dockerfile" \
+    -t "$builder_image:$version" ../
+
+  # 创建一个临时容器用于拷贝文件
+  echo "创建临时容器以提取 jar 文件..."
+  docker create --name "$builder_container" "$builder_image:$version" > /dev/null
+
+  # 拷贝构建好的 jar 文件到目标路径
+  echo "正在从容器中拷贝 jar 文件..."
+  docker cp "$builder_container:$builder_output" "$target_jar"
+
+  # 清理临时容器
+  docker rm -f "$builder_container" > /dev/null
+  echo "后端构建完成, jar 文件已保存至: $target_jar"
+}
+
+# 执行构建 ui
+function run_build_ui() {
+  echo "开始执行 ui 构建流程..."
+
+  local builder_dockerfile="./builder/Dockerfile.ui"
+  local builder_image="orion-visor-ui-builder"
+  local builder_container="orion-visor-ui-builder-ctn"
+  local builder_output="/build/dist"
+  local target_dir="../orion-visor-ui/dist"
+
+  # 如果 dist 已存在, 先删除
+  if [ -d "$target_dir" ]; then
+    echo "删除已有目录: $target_dir"
+    rm -rf "$target_dir"
+  fi
+
+  # 清理旧容器
+  local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
+  if [ -n "$container_id" ]; then
+    echo "删除旧容器: $builder_container"
+    docker rm -f "$container_id"
+  fi
+
+  # 构建前端镜像
+  echo "正在构建 ui builder image..."
+  docker build \
+    -f "$builder_dockerfile" \
+    -t "$builder_image:$version" ../
+
+  # 创建临时容器用于拷贝文件
+  echo "创建临时容器以提取 dist 文件..."
+  docker create --name "$builder_container" "$builder_image:$version" > /dev/null
+
+  # 拷贝 dist 目录
+  echo "正在从容器中拷贝 dist 文件..."
+  docker cp "$builder_container:$builder_output" "$target_dir"
+
+  # 清理临时容器
+  docker rm "$builder_container" > /dev/null
+
+  echo "前端构建完成, dist 已保存至: $target_dir"
+}
+
+# 构建项目-service
+if [ "$build_service" = true ]; then
+  run_build_service
+fi
+
+# 构建项目-ui
+if [ "$build_ui" = true ]; then
+  run_build_ui
+fi
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 ce19fec7..4be3d63b 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
@@ -46,7 +46,8 @@ public class ReplaceVersion {
     private static final String PATH = new File("").getAbsolutePath();
 
     private static final String[] DOCKER_FILES = new String[]{
-            "docker/build.sh",
+            "docker/docker-build.sh",
+            "docker/project-build.sh",
             "docker-compose.yml",
             "docker-compose-testing.yml"
     };

From e72a9d97cdcdfc832d5eba906e06386c244ac52c Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 6 Jul 2025 23:35:35 +0800
Subject: [PATCH 14/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml     | 6 ++++++
 docker/docker-build.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 24736576..c354536b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,12 @@
 version: '3.3'
 
 # latest = 2.4.1
+
+# 支持以下源
+# lijiahangmax/*
+# ghcr.io/dromara/*
+# registry.cn-hangzhou.aliyuncs.com/orionsec/*
+
 services:
   ui:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index a1d5e6fa..2b686207 100644
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -26,7 +26,7 @@ while [[ $# -gt 0 ]]; do
       locally_build=true
       shift
       ;;
-    -latest|latest-image)
+    -latest|--latest-image)
       latest_image=true
       shift
       ;;

From 4b25de3811639749349a3e9b1c08b815fdf55beb Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 7 Jul 2025 00:03:45 +0800
Subject: [PATCH 15/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=20vnc=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

---
 docs/README.md                                |   5 +
 .../model/TerminalPreferenceModel.java        | 106 ++++++++++++++++++
 .../strategy/TerminalPreferenceStrategy.java  |  42 +++++++
 .../convert/TerminalSessionConvert.java       |   4 +
 .../enums/TerminalConnectTypeEnum.java        |   2 +-
 .../terminal/model/TerminalChannelExtra.java  |  20 ++++
 .../config/TerminalSessionVncConfig.java      |  62 ++++++++++
 7 files changed, 240 insertions(+), 1 deletion(-)
 create mode 100644 docs/README.md
 create mode 100644 orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java

diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..279cf091
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,5 @@
+## 文档已迁移至网页端
+
+* https://visor.dromara.org
+* https://visor.dromara.org.cn
+* https://visor.orionsec.cn
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
index b57614ca..091402fb 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
@@ -95,6 +95,16 @@ public class TerminalPreferenceModel implements GenericsDataModel {
      */
     private JSONObject rdpActionBarSetting;
 
+    /**
+     * vnc 图形化设置
+     */
+    private JSONObject vncGraphSetting;
+
+    /**
+     * vnc 操作栏设置
+     */
+    private JSONObject vncActionBarSetting;
+
     /**
      * 快捷键设置
      */
@@ -297,6 +307,11 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private Integer scrollBackLine;
 
+        /**
+         * 替换退格符
+         */
+        private Boolean replaceBackspace;
+
     }
 
     @Data
@@ -481,6 +496,97 @@ public class TerminalPreferenceModel implements GenericsDataModel {
 
     }
 
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class VncGraphSettingModel implements IJsonObject {
+
+        /**
+         * 显示大小
+         */
+        private String displaySize;
+
+        /**
+         * 显示宽度
+         */
+        private Integer displayWidth;
+
+        /**
+         * 显示高度
+         */
+        private Integer displayHeight;
+
+        /**
+         * 颜色深度
+         */
+        private Integer colorDepth;
+
+        /**
+         * 无损压缩
+         */
+        private Boolean forceLossless;
+
+        /**
+         * 交换红蓝
+         */
+        private Boolean swapRedBlue;
+
+        /**
+         * 光标
+         */
+        private String cursor;
+
+        /**
+         * 质量等级
+         */
+        private Integer compressLevel;
+
+        /**
+         * 压缩等级
+         */
+        private Integer qualityLevel;
+
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class VncActionBarSettingModel implements IJsonObject {
+
+        /**
+         * 位置
+         */
+        private String position;
+
+        /**
+         * 显示设置
+         */
+        private Boolean display;
+
+        /**
+         * 组合键
+         */
+        private Boolean combinationKey;
+
+        /**
+         * 剪切板
+         */
+        private Boolean clipboard;
+
+        /**
+         * 断开连接
+         */
+        private Boolean disconnect;
+
+        /**
+         * 关闭
+         */
+        private Boolean close;
+
+    }
+
     @Data
     @Builder
     @NoArgsConstructor
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
index 68458b26..e757f7d7 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
@@ -68,6 +68,10 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
                 .rdpActionBarSetting(JSONObject.parseObject(this.getDefaultRdpActionBarSetting()))
                 // rdp 会话设置
                 .rdpSessionSetting(JSONObject.parseObject(this.getDefaultRdpSessionSetting()))
+                // vnc 图形化设置
+                .vncGraphSetting(JSONObject.parseObject(this.getDefaultVncGraphSetting()))
+                // vnc 图形化设置
+                .vncActionBarSetting(JSONObject.parseObject(this.getDefaultVncSessionSetting()))
                 // 快捷键设置
                 .shortcutSetting(JSONObject.parseObject(this.getDefaultShortcutSetting()))
                 .build();
@@ -148,6 +152,7 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
                 .wordSeparator("/\\()\"'` -.,:;<>~!@#$%^&*|+=[]{}~?│")
                 .terminalEmulationType(TerminalType.XTERM.getType())
                 .scrollBackLine(1000)
+                .replaceBackspace(false)
                 .build()
                 .toJsonString();
     }
@@ -226,6 +231,43 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
                 .toJsonString();
     }
 
+    /**
+     * 获取 vnc 图形化默认设置
+     *
+     * @return setting
+     */
+    private String getDefaultVncGraphSetting() {
+        return TerminalPreferenceModel.VncGraphSettingModel.builder()
+                .displaySize("fit")
+                .displayWidth(0)
+                .displayHeight(0)
+                .colorDepth(24)
+                .forceLossless(true)
+                .swapRedBlue(false)
+                .cursor("local")
+                .compressLevel(5)
+                .qualityLevel(5)
+                .build()
+                .toJsonString();
+    }
+
+    /**
+     * 获取 vnc 工具栏默认设置
+     *
+     * @return setting
+     */
+    private String getDefaultVncSessionSetting() {
+        return TerminalPreferenceModel.VncActionBarSettingModel.builder()
+                .position("top")
+                .display(true)
+                .combinationKey(true)
+                .clipboard(true)
+                .disconnect(true)
+                .close(true)
+                .build()
+                .toJsonString();
+    }
+
     /**
      * 获取默认快捷键设置
      *
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/convert/TerminalSessionConvert.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/convert/TerminalSessionConvert.java
index e9738a42..cd601995 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/convert/TerminalSessionConvert.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/convert/TerminalSessionConvert.java
@@ -24,9 +24,11 @@ package org.dromara.visor.module.terminal.convert;
 
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionRdpConfig;
 import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionSftpConfig;
 import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionSshConfig;
+import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionVncConfig;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -48,4 +50,6 @@ public interface TerminalSessionConvert {
 
     TerminalSessionRdpConfig toRdp(RdpConnectConfig domain);
 
+    TerminalSessionVncConfig toVnc(VncConnectConfig domain);
+
 }
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/enums/TerminalConnectTypeEnum.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/enums/TerminalConnectTypeEnum.java
index cb57c60c..b6b58989 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/enums/TerminalConnectTypeEnum.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/enums/TerminalConnectTypeEnum.java
@@ -49,7 +49,7 @@ public enum TerminalConnectTypeEnum {
     /**
      * vnc
      */
-    // VNC,
+    VNC,
 
     ;
 
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/model/TerminalChannelExtra.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
index 92c39b95..24c072b7 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
@@ -138,4 +138,24 @@ public class TerminalChannelExtra {
 
     // -------------------- vnc --------------------
 
+    /**
+     * 交换红蓝
+     */
+    private Boolean swapRedBlue;
+
+    /**
+     * 光标
+     */
+    private String cursor;
+
+    /**
+     * 压缩等级
+     */
+    private Integer compressLevel;
+
+    /**
+     * 质量等级
+     */
+    private Integer qualityLevel;
+
 }
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/model/config/TerminalSessionVncConfig.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java
new file mode 100644
index 00000000..315ee928
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java
@@ -0,0 +1,62 @@
+/*
+ * 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.model.config;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.dromara.visor.common.session.config.VncConnectConfig;
+
+/**
+ * 终端会话配置 VNC
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/6/24 17:08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class TerminalSessionVncConfig extends VncConnectConfig implements ITerminalSessionConfig {
+
+    @Schema(description = "logId")
+    private Long logId;
+
+    @Schema(description = "录屏文件路径")
+    private String recordPath;
+
+    @Schema(description = "宽")
+    private Integer width;
+
+    @Schema(description = "高")
+    private Integer height;
+
+    @Schema(description = "dpi")
+    private Integer dpi;
+
+}

From aed5d10eedf8dfb755a07698f8baf2f2263643e1 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 7 Jul 2025 00:04:29 +0800
Subject: [PATCH 16/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=20vnc=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TerminalWebSocketConfiguration.java       |  8 ++
 .../terminal/handler/guacd/GuacdTunnel.java   |  8 +-
 .../terminal/handler/guacd/IGuacdTunnel.java  | 10 ++-
 .../handler/guacd/constant/GuacdConst.java    | 10 +++
 .../terminal/TerminalAccessVncHandler.java    | 44 ++++++++++
 .../handler/GuacdInstructionHandler.java      | 18 +---
 .../handler/TerminalConnectHandler.java       | 17 ++--
 .../handler/TerminalResizeHandler.java        | 13 +--
 .../session/AbstractGuacdSession.java         | 52 +++++++++++-
 .../terminal/session/IGuacdSession.java       |  2 +-
 .../handler/terminal/session/IRdpSession.java |  9 --
 .../terminal/session/IResizeableSession.java  | 42 +++++++++
 .../handler/terminal/session/ISshSession.java | 10 +--
 .../handler/terminal/session/IVncSession.java | 33 +++++++
 .../handler/terminal/session/RdpSession.java  | 43 ++--------
 .../handler/terminal/session/VncSession.java  | 85 +++++++++++++++++++
 16 files changed, 311 insertions(+), 93 deletions(-)
 create mode 100644 orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/TerminalAccessVncHandler.java
 create mode 100644 orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IResizeableSession.java
 create mode 100644 orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IVncSession.java
 create mode 100644 orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java

diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/configuration/TerminalWebSocketConfiguration.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/configuration/TerminalWebSocketConfiguration.java
index 95120ff5..ebc01ec6 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/configuration/TerminalWebSocketConfiguration.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/configuration/TerminalWebSocketConfiguration.java
@@ -25,6 +25,7 @@ package org.dromara.visor.module.terminal.configuration;
 import org.dromara.visor.module.terminal.handler.terminal.TerminalAccessRdpHandler;
 import org.dromara.visor.module.terminal.handler.terminal.TerminalAccessSftpHandler;
 import org.dromara.visor.module.terminal.handler.terminal.TerminalAccessSshHandler;
+import org.dromara.visor.module.terminal.handler.terminal.TerminalAccessVncHandler;
 import org.dromara.visor.module.terminal.handler.transfer.TransferMessageDispatcher;
 import org.dromara.visor.module.terminal.interceptor.TerminalAccessInterceptor;
 import org.dromara.visor.module.terminal.interceptor.TerminalTransferInterceptor;
@@ -63,6 +64,9 @@ public class TerminalWebSocketConfiguration implements WebSocketConfigurer {
     @Resource
     private TerminalAccessRdpHandler terminalAccessRdpHandler;
 
+    @Resource
+    private TerminalAccessVncHandler terminalAccessVncHandler;
+
     @Resource
     private TransferMessageDispatcher transferMessageDispatcher;
 
@@ -80,6 +84,10 @@ public class TerminalWebSocketConfiguration implements WebSocketConfigurer {
         registry.addHandler(terminalAccessRdpHandler, prefix + "/terminal/access/rdp/{accessToken}")
                 .addInterceptors(terminalAccessInterceptor)
                 .setAllowedOrigins("*");
+        // VNC 终端会话
+        registry.addHandler(terminalAccessVncHandler, prefix + "/terminal/access/vnc/{accessToken}")
+                .addInterceptors(terminalAccessInterceptor)
+                .setAllowedOrigins("*");
         // 文件传输
         registry.addHandler(transferMessageDispatcher, prefix + "/terminal/transfer/{transferToken}")
                 .addInterceptors(terminalTransferInterceptor)
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
index 2c08d300..53034461 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
@@ -192,12 +192,16 @@ public class GuacdTunnel implements IGuacdTunnel {
     }
 
     @Override
-    public void size(int width, int height, int dpi) {
+    public void size(int width, int height) {
         clientConfig.setOptimalScreenWidth(width);
         clientConfig.setOptimalScreenHeight(height);
-        clientConfig.setOptimalResolution(dpi);
         this.setParameter(GuacdConst.WIDTH, width);
         this.setParameter(GuacdConst.HEIGHT, height);
+    }
+
+    @Override
+    public void dpi(int dpi) {
+        clientConfig.setOptimalResolution(dpi);
         this.setParameter(GuacdConst.DPI, dpi);
     }
 
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/IGuacdTunnel.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/IGuacdTunnel.java
index be72804e..8eff3c20 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/IGuacdTunnel.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/IGuacdTunnel.java
@@ -64,9 +64,15 @@ public interface IGuacdTunnel extends Runnable, Executable, SafeCloseable {
      *
      * @param width  width
      * @param height height
-     * @param dpi    dpi
      */
-    void size(int width, int height, int dpi);
+    void size(int width, int height);
+
+    /**
+     * dpi
+     *
+     * @param dpi dpi
+     */
+    void dpi(int dpi);
 
     /**
      * 设置时区
diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/constant/GuacdConst.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/constant/GuacdConst.java
index c0edfb9e..99d5cdb5 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/constant/GuacdConst.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/constant/GuacdConst.java
@@ -392,6 +392,16 @@ public interface GuacdConst {
      */
     String CLIPBOARD_ENCODING = "clipboard-encoding";
 
+    /**
+     * 压缩等级
+     */
+    String COMPRESS_LEVEL = "compress-level";
+
+    /**
+     * 质量等级
+     */
+    String QUALITY_LEVEL = "quality-level";
+
     // -------------------- const --------------------
 
     String RESIZE_METHOD_DISPLAY_UPDATE = "display-update";
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
new file mode 100644
index 00000000..fe772f4d
--- /dev/null
+++ 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
@@ -0,0 +1,44 @@
+package org.dromara.visor.module.terminal.handler.terminal;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.module.terminal.handler.terminal.enums.InputProtocolEnum;
+import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
+import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender;
+import org.dromara.visor.module.terminal.handler.terminal.sender.WebsocketGuacdTerminalSender;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+/**
+ * VNC 终端处理器
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/28 14:33
+ */
+@Slf4j
+@Component
+public class TerminalAccessVncHandler extends AbstractTerminalAccessHandler<IGuacdTerminalSender> {
+
+    @Override
+    protected IGuacdTerminalSender createSender(WebSocketSession channel) {
+        return new WebsocketGuacdTerminalSender(channel);
+    }
+
+    @Override
+    protected void handleMessage(WebSocketSession channel, TextMessage message, TerminalChannelProps props, IGuacdTerminalSender sender) {
+        String payload = message.getPayload();
+        try {
+            // 解析类型
+            InputProtocolEnum type = InputProtocolEnum.of(payload);
+            if (type == null) {
+                return;
+            }
+            // 解析并处理消息
+            type.getHandler().handle(props, sender, type.parse(payload));
+        } catch (Exception e) {
+            log.error("TerminalAccessVncHandler-handleMessage-error id: {}, msg: {}", channel.getId(), payload, e);
+        }
+    }
+
+}
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/handler/GuacdInstructionHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java
index 854bc582..0787e012 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java
@@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
 import org.dromara.visor.module.terminal.handler.terminal.model.request.GuacdInstructionRequest;
 import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender;
-import org.dromara.visor.module.terminal.handler.terminal.session.IRdpSession;
+import org.dromara.visor.module.terminal.handler.terminal.session.IGuacdSession;
 import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession;
 import org.springframework.stereotype.Component;
 
@@ -45,20 +45,10 @@ public class GuacdInstructionHandler extends AbstractTerminalHandler<IGuacdTermi
     public void handle(TerminalChannelProps props, IGuacdTerminalSender sender, GuacdInstructionRequest payload) {
         // 获取会话
         ITerminalSession session = terminalManager.getSession(props.getId());
-        if (session instanceof IRdpSession) {
-            // 处理 rdp 指令
-            this.processRdpInstruction((IRdpSession) session, payload.getInstruction());
+        // 发送指令
+        if (session instanceof IGuacdSession) {
+            ((IGuacdSession) session).write(payload.getInstruction());
         }
     }
 
-    /**
-     * 处理 rdp 指令
-     *
-     * @param session     session
-     * @param instruction instruction
-     */
-    private void processRdpInstruction(IRdpSession session, String instruction) {
-        session.write(instruction);
-    }
-
 }
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/handler/TerminalConnectHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java
index 14555223..ac1059ef 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java
@@ -35,6 +35,7 @@ import org.dromara.visor.common.constant.ExtraFieldConst;
 import org.dromara.visor.common.session.config.BaseConnectConfig;
 import org.dromara.visor.common.session.config.RdpConnectConfig;
 import org.dromara.visor.common.session.config.SshConnectConfig;
+import org.dromara.visor.common.session.config.VncConnectConfig;
 import org.dromara.visor.common.session.ssh.SessionStores;
 import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
 import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
@@ -52,10 +53,7 @@ import org.dromara.visor.module.terminal.handler.terminal.constant.SessionCloseC
 import org.dromara.visor.module.terminal.handler.terminal.constant.TerminalMessage;
 import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelExtra;
 import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
-import org.dromara.visor.module.terminal.handler.terminal.model.config.ITerminalSessionConfig;
-import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionRdpConfig;
-import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionSftpConfig;
-import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionSshConfig;
+import org.dromara.visor.module.terminal.handler.terminal.model.config.*;
 import org.dromara.visor.module.terminal.handler.terminal.model.request.TerminalConnectRequest;
 import org.dromara.visor.module.terminal.handler.terminal.model.transport.TerminalConnectBody;
 import org.dromara.visor.module.terminal.handler.terminal.model.transport.TerminalSetInfo;
@@ -63,10 +61,7 @@ import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalS
 import org.dromara.visor.module.terminal.handler.terminal.sender.ISftpTerminalSender;
 import org.dromara.visor.module.terminal.handler.terminal.sender.ISshTerminalSender;
 import org.dromara.visor.module.terminal.handler.terminal.sender.ITerminalSender;
-import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession;
-import org.dromara.visor.module.terminal.handler.terminal.session.RdpSession;
-import org.dromara.visor.module.terminal.handler.terminal.session.SftpSession;
-import org.dromara.visor.module.terminal.handler.terminal.session.SshSession;
+import org.dromara.visor.module.terminal.handler.terminal.session.*;
 import org.dromara.visor.module.terminal.service.TerminalConnectLogService;
 import org.springframework.stereotype.Component;
 
@@ -238,6 +233,12 @@ public class TerminalConnectHandler extends AbstractTerminalHandler<ITerminalSen
                 config.setDpi(connectParams.getDpi());
                 this.setBaseSessionConfig(config, connectLog, connectParams);
                 session = new RdpSession(props, (IGuacdTerminalSender) sender, config, guacdConfig);
+            } else if (TerminalConnectTypeEnum.VNC.name().equals(connectType)) {
+                // 打开 vnc 会话
+                TerminalSessionVncConfig config = TerminalSessionConvert.MAPPER.toVnc((VncConnectConfig) connectConfig);
+                config.setDpi(connectParams.getDpi());
+                this.setBaseSessionConfig(config, connectLog, connectParams);
+                session = new VncSession(props, (IGuacdTerminalSender) sender, config, guacdConfig);
             } else {
                 throw Exceptions.unsupported();
             }
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/handler/TerminalResizeHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalResizeHandler.java
index 9705b592..fda299a5 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalResizeHandler.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalResizeHandler.java
@@ -26,8 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
 import org.dromara.visor.module.terminal.handler.terminal.model.request.TerminalResizeRequest;
 import org.dromara.visor.module.terminal.handler.terminal.sender.ITerminalSender;
-import org.dromara.visor.module.terminal.handler.terminal.session.IRdpSession;
-import org.dromara.visor.module.terminal.handler.terminal.session.ISshSession;
+import org.dromara.visor.module.terminal.handler.terminal.session.IResizeableSession;
 import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession;
 import org.springframework.stereotype.Component;
 
@@ -44,16 +43,10 @@ public class TerminalResizeHandler extends AbstractTerminalHandler<ITerminalSend
 
     @Override
     public void handle(TerminalChannelProps props, ITerminalSender sender, TerminalResizeRequest payload) {
-        Integer width = payload.getWidth();
-        Integer height = payload.getHeight();
         // 获取会话
         ITerminalSession session = terminalManager.getSession(props.getId());
-        if (session instanceof ISshSession) {
-            // SSH
-            ((ISshSession) session).resize(width, height);
-        } else if (session instanceof IRdpSession) {
-            // RDP
-            ((IRdpSession) session).resize(width, height);
+        if (session instanceof IResizeableSession) {
+            ((IResizeableSession) session).resize(payload.getWidth(), payload.getHeight());
         }
     }
 
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/session/AbstractGuacdSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java
index 9efc29a9..77be9a39 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java
@@ -23,9 +23,11 @@
 package org.dromara.visor.module.terminal.handler.terminal.session;
 
 import cn.orionsec.kit.lang.utils.Exceptions;
+import org.dromara.visor.common.utils.AesEncryptUtils;
 import org.dromara.visor.module.terminal.define.TerminalThreadPools;
 import org.dromara.visor.module.terminal.handler.guacd.IGuacdTunnel;
 import org.dromara.visor.module.terminal.handler.terminal.constant.TerminalMessage;
+import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelExtra;
 import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
 import org.dromara.visor.module.terminal.handler.terminal.model.config.ITerminalSessionConfig;
 import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender;
@@ -70,10 +72,51 @@ public abstract class AbstractGuacdSession<C extends ITerminalSessionConfig>
      */
     protected abstract IGuacdTunnel createTunnel();
 
+    /**
+     * 是否为低带宽模式
+     *
+     * @return is
+     */
+    protected abstract boolean isLowBandwidthMode();
+
     /**
      * 设置 tunnel 参数
      */
-    protected abstract void setTunnelParams();
+    protected void setTunnelParams() {
+        // 设置低带宽模式
+        if (this.isLowBandwidthMode()) {
+            this.setLowBandwidthMode();
+        }
+        // 主机信息
+        tunnel.remote(config.getHostAddress(), config.getHostPort());
+        // 身份信息
+        tunnel.auth(config.getUsername(), AesEncryptUtils.decryptAsString(config.getPassword()));
+        // 大小
+        tunnel.size(config.getWidth(), config.getHeight());
+    }
+
+    /**
+     * 设置低带宽模式
+     */
+    protected void setLowBandwidthMode() {
+        TerminalChannelExtra extra = props.getExtra();
+        extra.setColorDepth(8);
+        extra.setForceLossless(false);
+        extra.setEnableWallpaper(false);
+        extra.setEnableTheming(false);
+        extra.setEnableFontSmoothing(false);
+        extra.setEnableFullWindowDrag(false);
+        extra.setEnableDesktopComposition(false);
+        extra.setEnableMenuAnimations(false);
+        extra.setDisableBitmapCaching(false);
+        extra.setDisableOffscreenCaching(false);
+        extra.setDisableGlyphCaching(false);
+        extra.setDisableGfx(false);
+        extra.setEnableAudioInput(false);
+        extra.setEnableAudioOutput(false);
+        extra.setCompressLevel(9);
+        extra.setQualityLevel(1);
+    }
 
     /**
      * 执行连接
@@ -92,6 +135,13 @@ public abstract class AbstractGuacdSession<C extends ITerminalSessionConfig>
         tunnel.write(data);
     }
 
+    @Override
+    public void resize(int width, int height) {
+        config.setWidth(width);
+        config.setHeight(height);
+        tunnel.writeInstruction("size", String.valueOf(width), String.valueOf(height));
+    }
+
     @Override
     public void keepAlive() {
         // guacd 有内部实现
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/session/IGuacdSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IGuacdSession.java
index a9f79372..56c8249c 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IGuacdSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IGuacdSession.java
@@ -29,7 +29,7 @@ package org.dromara.visor.module.terminal.handler.terminal.session;
  * @version 1.0.0
  * @since 2025/3/30 17:42
  */
-public interface IGuacdSession extends ITerminalSession {
+public interface IGuacdSession extends ITerminalSession, IResizeableSession {
 
     /**
      * 写入数据
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/session/IRdpSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IRdpSession.java
index de2d5860..225316b9 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IRdpSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IRdpSession.java
@@ -30,13 +30,4 @@ package org.dromara.visor.module.terminal.handler.terminal.session;
  * @since 2025/3/30 17:42
  */
 public interface IRdpSession extends IGuacdSession {
-
-    /**
-     * 重置大小
-     *
-     * @param width  width
-     * @param height height
-     */
-    void resize(int width, int height);
-
 }
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/session/IResizeableSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IResizeableSession.java
new file mode 100644
index 00000000..cdc41edb
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IResizeableSession.java
@@ -0,0 +1,42 @@
+/*
+ * 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.session;
+
+/**
+ * 可修改大小的会话
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/7/3 2:16
+ */
+public interface IResizeableSession {
+
+    /**
+     * 修改大小
+     *
+     * @param width  width
+     * @param height height
+     */
+    void resize(int width, int height);
+
+}
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/session/ISshSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ISshSession.java
index 1f621fcc..d978900a 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ISshSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ISshSession.java
@@ -32,15 +32,7 @@ import org.dromara.visor.module.terminal.handler.terminal.sender.ISshTerminalSen
  * @version 1.0.0
  * @since 2024/2/4 16:47
  */
-public interface ISshSession extends ITerminalSession {
-
-    /**
-     * 重置大小
-     *
-     * @param width  width
-     * @param height height
-     */
-    void resize(int width, int height);
+public interface ISshSession extends ITerminalSession, IResizeableSession {
 
     /**
      * 写入内容
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/session/IVncSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IVncSession.java
new file mode 100644
index 00000000..e17bb388
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/IVncSession.java
@@ -0,0 +1,33 @@
+/*
+ * 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.session;
+
+/**
+ * vnc 会话
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/7/3 2:04
+ */
+public interface IVncSession extends IGuacdSession {
+}
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/session/RdpSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/RdpSession.java
index 165e8af8..c0e463bd 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/RdpSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/RdpSession.java
@@ -27,7 +27,6 @@ import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.io.Files1;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.visor.common.constant.AppConst;
-import org.dromara.visor.common.utils.AesEncryptUtils;
 import org.dromara.visor.module.common.config.GuacdConfig;
 import org.dromara.visor.module.terminal.enums.DriveMountModeEnum;
 import org.dromara.visor.module.terminal.handler.guacd.GuacdTunnel;
@@ -66,19 +65,13 @@ public class RdpSession extends AbstractGuacdSession<TerminalSessionRdpConfig> i
 
     @Override
     protected void setTunnelParams() {
+        super.setTunnelParams();
+        // 设置额外参数
         TerminalChannelExtra extra = props.getExtra();
         // 音频输入会导致无法连接先写死
         extra.setEnableAudioInput(false);
-        // 设置低带宽模式
-        if (Booleans.isTrue(config.getLowBandwidthMode())) {
-            this.setLowBandwidthMode(extra);
-        }
-        // 主机信息
-        tunnel.remote(config.getHostAddress(), config.getHostPort());
-        // 身份信息
-        tunnel.auth(config.getUsername(), AesEncryptUtils.decryptAsString(config.getPassword()));
-        // 大小
-        tunnel.size(config.getWidth(), config.getHeight(), config.getDpi());
+        // dpi
+        tunnel.dpi(config.getDpi());
         // 时区
         tunnel.timezone(config.getTimezone());
         // 忽略证书
@@ -140,32 +133,8 @@ public class RdpSession extends AbstractGuacdSession<TerminalSessionRdpConfig> i
     }
 
     @Override
-    public void resize(int width, int height) {
-        config.setWidth(width);
-        config.setHeight(height);
-        tunnel.writeInstruction("size", String.valueOf(width), String.valueOf(height));
-    }
-
-    /**
-     * 低带宽模式
-     *
-     * @param extra extra
-     */
-    private void setLowBandwidthMode(TerminalChannelExtra extra) {
-        extra.setColorDepth(8);
-        extra.setForceLossless(false);
-        extra.setEnableWallpaper(false);
-        extra.setEnableTheming(false);
-        extra.setEnableFontSmoothing(false);
-        extra.setEnableFullWindowDrag(false);
-        extra.setEnableDesktopComposition(false);
-        extra.setEnableMenuAnimations(false);
-        extra.setDisableBitmapCaching(false);
-        extra.setDisableOffscreenCaching(false);
-        extra.setDisableGlyphCaching(false);
-        extra.setDisableGfx(false);
-        extra.setEnableAudioInput(false);
-        extra.setEnableAudioOutput(false);
+    protected boolean isLowBandwidthMode() {
+        return Booleans.isTrue(config.getLowBandwidthMode());
     }
 
 }
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/session/VncSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java
new file mode 100644
index 00000000..f4a76b5e
--- /dev/null
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java
@@ -0,0 +1,85 @@
+/*
+ * 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.session;
+
+import cn.orionsec.kit.lang.utils.Booleans;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.visor.module.common.config.GuacdConfig;
+import org.dromara.visor.module.terminal.handler.guacd.GuacdTunnel;
+import org.dromara.visor.module.terminal.handler.guacd.IGuacdTunnel;
+import org.dromara.visor.module.terminal.handler.guacd.constant.GuacdConst;
+import org.dromara.visor.module.terminal.handler.guacd.constant.GuacdProtocol;
+import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelExtra;
+import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps;
+import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionVncConfig;
+import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender;
+
+/**
+ * vnc 会话
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/3/30 17:44
+ */
+@Slf4j
+public class VncSession extends AbstractGuacdSession<TerminalSessionVncConfig> implements IVncSession {
+
+    private final GuacdConfig guacdConfig;
+
+    public VncSession(TerminalChannelProps props,
+                      IGuacdTerminalSender sender,
+                      TerminalSessionVncConfig config,
+                      GuacdConfig guacdConfig) {
+        super(props, sender, config);
+        this.guacdConfig = guacdConfig;
+    }
+
+    @Override
+    protected IGuacdTunnel createTunnel() {
+        return new GuacdTunnel(GuacdProtocol.VNC, sessionId, guacdConfig.getHost(), guacdConfig.getPort());
+    }
+
+    @Override
+    protected void setTunnelParams() {
+        super.setTunnelParams();
+        // 设置额外参数
+        TerminalChannelExtra extra = props.getExtra();
+        // 时区
+        tunnel.timezone(config.getTimezone());
+        // 显示设置
+        tunnel.setParameter(GuacdConst.COLOR_DEPTH, extra.getColorDepth());
+        tunnel.setParameter(GuacdConst.FORCE_LOSSLESS, extra.getForceLossless());
+        tunnel.setParameter(GuacdConst.COMPRESS_LEVEL, extra.getCompressLevel());
+        tunnel.setParameter(GuacdConst.QUALITY_LEVEL, extra.getQualityLevel());
+        // 光标设置
+        tunnel.setParameter(GuacdConst.CURSOR, extra.getCursor());
+        // 编码设置
+        tunnel.setParameter(GuacdConst.CLIPBOARD_ENCODING, config.getClipboardEncoding());
+    }
+
+    @Override
+    protected boolean isLowBandwidthMode() {
+        return Booleans.isTrue(config.getLowBandwidthMode());
+    }
+
+}

From 4643c37a5af092133d3536e841b2eac2dce2daf5 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 7 Jul 2025 14:42:54 +0800
Subject: [PATCH 17/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E6=80=A7=E5=8C=96=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminal/handler/guacd/GuacdTunnel.java   |   1 -
 .../display/terminal-display-setting.vue      |   3 +
 .../display/terminal-rdp-action-bar-block.vue |  12 +-
 .../display/terminal-vnc-action-bar-block.vue | 112 ++++++++++++
 .../setting/extra/host-extra-modal.vue        |  23 ++-
 .../setting/extra/vnc-extra-form.vue          |  72 ++++++++
 .../general/terminal-general-setting.vue      |   3 +
 .../general/terminal-rdp-graph-block.vue      |   8 +-
 .../general/terminal-rdp-session-block.vue    |   2 +-
 .../general/terminal-ssh-interact-block.vue   |  12 +-
 .../general/terminal-vnc-graph-block.vue      | 133 ++++++++++++++
 .../src/views/terminal/types/const.ts         | 169 +++++++++++++++---
 12 files changed, 507 insertions(+), 43 deletions(-)
 create mode 100644 orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue

diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
index 53034461..0821bad4 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java
@@ -89,7 +89,6 @@ public class GuacdTunnel implements IGuacdTunnel {
     @Override
     public void connect() throws GuacdException {
         try {
-            // TODO 端口转发
             this.socket = new ConfiguredGuacamoleSocket(new InetGuacamoleSocket(serverAddress, serverPort), serverConfig, clientConfig);
             this.tunnel = new CustomGuacamoleTunnel(uuid, socket);
         } catch (GuacamoleException e) {
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-display-setting.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-display-setting.vue
index 2e52485d..9257f7c4 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-display-setting.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-display-setting.vue
@@ -9,6 +9,8 @@
       <terminal-ssh-action-bar-block />
       <!-- RDP 工具栏 -->
       <terminal-rdp-action-bar-block />
+      <!-- VNC 工具栏 -->
+      <terminal-vnc-action-bar-block />
       <!-- SSH 右键菜单 -->
       <terminal-ssh-right-menu-block />
     </div>
@@ -26,6 +28,7 @@
   import TerminalSshActionBarBlock from './terminal-ssh-action-bar-block.vue';
   import TerminalSshRightMenuBlock from './terminal-ssh-right-menu-block.vue';
   import TerminalRdpActionBarBlock from './terminal-rdp-action-bar-block.vue';
+  import TerminalVncActionBarBlock from './terminal-vnc-action-bar-block.vue';
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
index 66ac84d4..8a8c1d54 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
@@ -12,12 +12,6 @@
               :model="formModel"
               layout="vertical">
         <a-space size="large">
-          <!-- 工具栏按钮 -->
-          <a-form-item field="actions" label="工具栏按钮">
-            <icon-actions class="form-item-actions"
-                          :actions="actions"
-                          position="bottom" />
-          </a-form-item>
           <!-- 工具栏方向 -->
           <a-form-item field="position" label="工具栏方向">
             <a-select v-model="formModel.position"
@@ -25,6 +19,12 @@
                       placeholder="请选择工具栏方向"
                       :options="toOptions(graphActionBarPositionKey)" />
           </a-form-item>
+          <!-- 工具栏按钮 -->
+          <a-form-item field="actions" label="工具栏按钮">
+            <icon-actions class="form-item-actions"
+                          :actions="actions"
+                          position="bottom" />
+          </a-form-item>
         </a-space>
       </a-form>
     </div>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
new file mode 100644
index 00000000..5baf89e8
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
@@ -0,0 +1,112 @@
+<template>
+  <div class="terminal-setting-block">
+    <!-- 顶部 -->
+    <div class="terminal-setting-subtitle-wrapper">
+      <h3 class="terminal-setting-subtitle">
+        VNC 工具栏设置
+      </h3>
+    </div>
+    <!-- 内容区域 -->
+    <div class="terminal-setting-body block-body setting-body">
+      <a-form class="terminal-setting-form"
+              :model="formModel"
+              layout="vertical">
+        <a-space size="large">
+          <!-- 工具栏方向 -->
+          <a-form-item field="position" label="工具栏方向">
+            <a-select v-model="formModel.position"
+                      style="width: 148px;"
+                      placeholder="请选择工具栏方向"
+                      :options="toOptions(graphActionBarPositionKey)" />
+          </a-form-item>
+          <!-- 工具栏按钮 -->
+          <a-form-item field="actions" label="工具栏按钮">
+            <icon-actions class="form-item-actions"
+                          :actions="actions"
+                          position="bottom" />
+          </a-form-item>
+        </a-space>
+      </a-form>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'terminalVncActionBarBlock'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { TerminalVncActionBarSetting } from '@/store/modules/terminal/types';
+  import type { SidebarAction } from '@/views/terminal/types/define';
+  import { computed, ref, watch } from 'vue';
+  import { useTerminalStore, useDictStore } from '@/store';
+  import { TerminalPreferenceItem } from '@/store/modules/terminal';
+  import { VncActionBarItems, graphActionBarPositionKey } from '@/views/terminal/types/const';
+  import IconActions from '../../layout/icon-actions.vue';
+
+  const { toOptions } = useDictStore();
+  const { preference, updateTerminalPreference } = useTerminalStore();
+
+  const formModel = ref<TerminalVncActionBarSetting>({ ...preference.vncActionBarSetting });
+
+  // 监听同步
+  watch(formModel, (v) => {
+    if (!v) {
+      return;
+    }
+    // 同步
+    updateTerminalPreference(TerminalPreferenceItem.VNC_ACTION_BAR_SETTING, formModel.value, true);
+  }, { deep: true });
+
+  // 操作项
+  const actions = computed<Array<SidebarAction>>(() => {
+    return VncActionBarItems.map(s => {
+      return {
+        icon: s.icon,
+        content: (formModel.value[s.item] === false ? '显示 ' : '隐藏 ') + s.content,
+        checked: formModel.value[s.item] !== false,
+        click: () => {
+          formModel.value[s.item] = formModel.value[s.item] === false;
+        }
+      };
+    });
+  });
+
+</script>
+
+<style lang="less" scoped>
+  .form-item-actions {
+    display: flex;
+    background-color: var(--color-fill-2);
+    padding: 4px;
+    border-radius: 4px;
+
+    :deep(.terminal-sidebar-icon-wrapper) {
+      width: 40px;
+      height: 40px;
+    }
+
+    :deep(.terminal-sidebar-icon) {
+      width: 32px;
+      height: 32px;
+      font-size: 20px;
+    }
+  }
+
+  .form-item-actions {
+    margin-right: 24px;
+  }
+
+  :deep(.arco-form) {
+    .arco-form-item-label {
+      user-select: none;
+    }
+
+    .arco-form-item {
+      margin-bottom: 0;
+    }
+  }
+
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/extra/host-extra-modal.vue b/orion-visor-ui/src/views/terminal/components/setting/extra/host-extra-modal.vue
index 6c1940bd..20beb3e2 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/extra/host-extra-modal.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/extra/host-extra-modal.vue
@@ -14,7 +14,9 @@
            :cancel-button-props="{ disabled: loading }"
            :on-before-ok="handlerOk"
            @close="handleClose">
-    <a-spin class="full" :loading="loading">
+    <a-spin v-if="hostId"
+            class="full"
+            :loading="loading">
       <a-tabs v-model:active-key="activeItem"
               position="left"
               type="rounded"
@@ -22,7 +24,7 @@
         <!-- 标签配置 -->
         <a-tab-pane :key="ExtraSettingItems.LABEL" title="标签配置">
           <label-extra-form ref="labelForm"
-                            :host-id="hostId as number"
+                            :host-id="hostId"
                             :item="ExtraSettingItems.LABEL" />
         </a-tab-pane>
         <!-- SSH 配置 -->
@@ -30,7 +32,7 @@
                     :key="ExtraSettingItems.SSH"
                     title="SSH 配置">
           <ssh-extra-form ref="sshForm"
-                          :host-id="hostId as number"
+                          :host-id="hostId"
                           :item="ExtraSettingItems.SSH" />
         </a-tab-pane>
         <!-- RDP 配置 -->
@@ -38,9 +40,17 @@
                     :key="ExtraSettingItems.RDP"
                     title="RDP 配置">
           <rdp-extra-form ref="rdpForm"
-                          :host-id="hostId as number"
+                          :host-id="hostId"
                           :item="ExtraSettingItems.RDP" />
         </a-tab-pane>
+        <!-- VNC 配置 -->
+        <a-tab-pane v-if="host?.types.includes(HostType.VNC.value)"
+                    :key="ExtraSettingItems.VNC"
+                    title="VNC 配置">
+          <vnc-extra-form ref="vncForm"
+                          :host-id="hostId"
+                          :item="ExtraSettingItems.VNC" />
+        </a-tab-pane>
       </a-tabs>
     </a-spin>
   </a-modal>
@@ -64,6 +74,7 @@
   import LabelExtraForm from './label-extra-form.vue';
   import SshExtraForm from './ssh-extra-form.vue';
   import RdpExtraForm from './rdp-extra-form.vue';
+  import VncExtraForm from './vnc-extra-form.vue';
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
@@ -75,6 +86,7 @@
   const labelForm = ref();
   const sshForm = ref();
   const rdpForm = ref();
+  const vncForm = ref();
 
   // 打开配置
   const open = (record: HostQueryResponse) => {
@@ -101,6 +113,9 @@
       } else if (activeItem.value === ExtraSettingItems.RDP) {
         // RDP 配置
         value = await rdpForm.value.getValue();
+      } else if (activeItem.value === ExtraSettingItems.VNC) {
+        // VNC 配置
+        value = await vncForm.value.getValue();
       }
       if (!value) {
         return false;
diff --git a/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue b/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
new file mode 100644
index 00000000..33b45313
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
@@ -0,0 +1,72 @@
+<template>
+  <a-form :model="formModel"
+          ref="formRef"
+          label-align="right"
+          :label-col-props="{ span: 5 }"
+          :wrapper-col-props="{ span: 18 }">
+    <!-- 自定义端口 -->
+    <a-form-item field="port"
+                 label="自定义端口"
+                 style="margin-bottom: 8px;"
+                 help="通常情况下端口号为 5900 + N(屏幕)"
+                 :rules="{ min: 1, max: 65535, message: '输入的端口不合法' }">
+      <a-input-number v-model="formModel.port"
+                      placeholder="VNC 自定义端口"
+                      allow-clear />
+    </a-form-item>
+    <!-- 低带宽模式 -->
+    <a-form-item field="lowBandwidthMode"
+                 label="低带宽模式"
+                 help="调整图形化配置以及禁用音频, 提升慢速网络下的响应速度">
+      <a-switch v-model="formModel.lowBandwidthMode" type="round" />
+    </a-form-item>
+  </a-form>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'vncExtraForm'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { HostVncExtraSettingModel } from '@/api/asset/host-extra';
+  import { onMounted, ref } from 'vue';
+  import { getHostExtraItem } from '@/api/asset/host-extra';
+  import { useDictStore } from '@/store';
+
+  const props = defineProps<{
+    hostId: number;
+    item: string;
+  }>();
+
+  const { toRadioOptions } = useDictStore();
+
+  const formRef = ref();
+  const formModel = ref<Partial<HostVncExtraSettingModel>>({});
+
+  // 渲染表单
+  const renderForm = async () => {
+    const { data } = await getHostExtraItem<HostVncExtraSettingModel>({ hostId: props.hostId, item: props.item });
+    formModel.value = data;
+  };
+
+  // 获取值
+  const getValue = async () => {
+    // 验证参数
+    const error = await formRef.value.validate();
+    if (error) {
+      return false;
+    }
+    return JSON.stringify(formModel.value);
+  };
+
+  defineExpose({ getValue });
+
+  onMounted(renderForm);
+
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-general-setting.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-general-setting.vue
index 113659c3..0f7d8f38 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-general-setting.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-general-setting.vue
@@ -11,6 +11,8 @@
       <terminal-rdp-graph-block />
       <!-- RDP 会话设置 -->
       <terminal-rdp-session-block />
+      <!-- VNC 图形化设置 -->
+      <terminal-vnc-graph-block />
     </div>
   </div>
 </template>
@@ -26,6 +28,7 @@
   import TerminalSshPluginsBlock from './terminal-ssh-plugins-block.vue';
   import TerminalRdpGraphBlock from './terminal-rdp-graph-block.vue';
   import TerminalRdpSessionBlock from './terminal-rdp-session-block.vue';
+  import TerminalVncGraphBlock from './terminal-vnc-graph-block.vue';
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
index 1d588c2f..d8b4bd64 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
@@ -14,7 +14,7 @@
         <!-- 显示分辨率 -->
         <block-setting-item label="显示分辨率" desc="若选择为自适应, 则会根据窗口大小自动调整">
           <a-select v-model="formModel.displaySize"
-                    style="width: 198px;"
+                    style="width: 168px;"
                     size="small"
                     :options="toOptions(screenResolutionKey)"
                     allow-create />
@@ -22,14 +22,14 @@
         <!-- 颜色深度 -->
         <block-setting-item label="颜色深度" desc="显示的颜色深度, 越高显示效果越好">
           <a-select v-model="formModel.colorDepth"
-                    style="width: 198px;"
+                    style="width: 168px;"
                     size="small"
                     :options="toOptions(graphColorDepthKey)" />
         </block-setting-item>
       </a-row>
       <a-row class="mb16" align="stretch" :gutter="16">
         <!-- 无损压缩 -->
-        <block-setting-item label="无损压缩" desc="是否启用对图形更新的无损压缩">
+        <block-setting-item label="无损压缩" desc="是否启用对图像更新的无损压缩">
           <a-switch v-model="formModel.forceLossless" type="round" />
         </block-setting-item>
         <!-- 启用壁纸 -->
@@ -79,7 +79,7 @@
       </a-row>
       <a-row class="mb16" align="stretch" :gutter="16">
         <!-- 禁用图形加速 -->
-        <block-setting-item label="禁用图形加速" desc="禁用后将不再使用 GFX 进行数据编码">
+        <block-setting-item label="禁用图像加速" desc="禁用后将不再使用 GFX 进行数据编码">
           <a-switch v-model="formModel.disableGfx" type="round" />
         </block-setting-item>
       </a-row>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
index 763e604a..419645f3 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
@@ -16,7 +16,7 @@
         <!-- 驱动挂载模式 -->
         <block-setting-item label="驱动挂载模式">
           <a-select v-model="formModel.driveMountMode"
-                    style="width: 198px;"
+                    style="width: 168px;"
                     size="small"
                     :options="toOptions(driveMountModeKey)" />
           <template #desc>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
index 9d2bdfbe..27e2dfe3 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
@@ -67,7 +67,7 @@
         <block-setting-item label="单词分隔符" desc="在终端中双击文本将使用该分隔符进行分割 (一般不用修改)">
           <a-input v-model="formModel.wordSeparator"
                    size="small"
-                   style="width: 198px"
+                   style="width: 168px"
                    placeholder="单词分隔符"
                    allow-clear />
         </block-setting-item>
@@ -76,14 +76,14 @@
         <!-- 终端类型 -->
         <block-setting-item label="终端类型" desc="若显示异常请尝试切换此选项 兼容性 vt100 > xterm > 16color > 256color">
           <a-select v-model="formModel.terminalEmulationType"
-                    style="width: 198px;"
+                    style="width: 168px;"
                     size="small"
                     :options="toOptions(emulationTypeKey)" />
         </block-setting-item>
         <!-- 缓冲区行数 -->
         <block-setting-item label="缓冲区行数" desc="保存在缓冲区的行数, 多出的行数会被忽略, 此值越大占用内存的内存会更多">
           <a-input-number v-model="formModel.scrollBackLine"
-                          style="width: 198px"
+                          style="width: 168px"
                           size="small"
                           :min="1"
                           :max="100000"
@@ -92,6 +92,12 @@
                           hide-button />
         </block-setting-item>
       </a-row>
+      <a-row class="mb16" align="stretch" :gutter="16">
+        <!-- 替换退格符 -->
+        <block-setting-item label="替换退格符" desc="开启后会将退格符 (Backspace) 替换为 (Ctrl+H)">
+          <a-switch v-model="formModel.replaceBackspace" type="round" />
+        </block-setting-item>
+      </a-row>
     </div>
   </div>
 </template>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue
new file mode 100644
index 00000000..4ac5634a
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="terminal-setting-block">
+    <!-- 顶部 -->
+    <div class="terminal-setting-subtitle-wrapper">
+      <h3 class="terminal-setting-subtitle">
+        VNC 图形化设置
+      </h3>
+    </div>
+    <!-- 提示 -->
+    <a-alert class="mb16">修改后会立刻保存, 重新打开终端后生效. 配置调整后可能会占用更多的带宽, 若发生卡顿/无法加载请调整配置</a-alert>
+    <!-- 内容区域 -->
+    <div class="terminal-setting-body setting-body">
+      <a-row class="mb16" align="stretch" :gutter="16">
+        <!-- 显示分辨率 -->
+        <block-setting-item label="显示分辨率" desc="若选择为自适应, 则会根据窗口大小自动调整">
+          <a-select v-model="formModel.displaySize"
+                    style="width: 168px;"
+                    size="small"
+                    :options="toOptions(screenResolutionKey)"
+                    allow-create />
+        </block-setting-item>
+        <!-- 颜色深度 -->
+        <block-setting-item label="颜色深度" desc="显示的颜色深度, 越高显示效果越好">
+          <a-select v-model="formModel.colorDepth"
+                    style="width: 168px;"
+                    size="small"
+                    :options="toOptions(graphColorDepthKey)" />
+        </block-setting-item>
+      </a-row>
+      <a-row class="mb16" align="stretch" :gutter="16">
+        <!-- 无损压缩 -->
+        <block-setting-item label="无损压缩" desc="是否启用对图像更新的无损压缩">
+          <a-switch v-model="formModel.forceLossless" type="round" />
+        </block-setting-item>
+        <!-- 交换红蓝 -->
+        <block-setting-item label="交换红蓝" desc="若显示的颜色出现错误(蓝色显示为橙色或红色等) 则需要启用此选项">
+          <a-switch v-model="formModel.swapRedBlue" type="round" />
+        </block-setting-item>
+      </a-row>
+      <a-row class="mb16" align="stretch" :gutter="16">
+        <!-- 压缩等级 -->
+        <block-setting-item label="压缩等级" desc="设置服务器请求的压缩级别 0表示不压缩, 9表示最高压缩级别">
+          <a-input-number v-model="formModel.compressLevel"
+                          style="width: 168px;"
+                          size="small"
+                          mode="button"
+                          :min="0"
+                          :max="9"
+                          placeholder="图像压缩等级 0 ~ 9" />
+        </block-setting-item>
+        <!-- 质量等级 -->
+        <block-setting-item label="质量等级" desc="设置图像的质量等级 0表示最低的图像质量, 9表示最高的图像质量">
+          <a-input-number v-model="formModel.qualityLevel"
+                          style="width: 168px;"
+                          size="small"
+                          mode="button"
+                          :min="0"
+                          :max="9"
+                          placeholder="图像质量等级 0 ~ 9" />
+        </block-setting-item>
+      </a-row>
+      <a-row class="mb16" align="stretch" :gutter="16">
+        <!-- 光标 -->
+        <block-setting-item label="光标" desc="光标渲染方式, 远程光标会比本地光标慢">
+          <a-select v-model="formModel.cursor"
+                    style="width: 168px;"
+                    size="small"
+                    :options="toOptions(vcnCursorKey)" />
+        </block-setting-item>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'terminalVncGraphBlock'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { TerminalVncGraphSetting } from '@/store/modules/terminal/types';
+  import { ref, watch } from 'vue';
+  import { useTerminalStore, useDictStore } from '@/store';
+  import { TerminalPreferenceItem } from '@/store/modules/terminal';
+  import { graphColorDepthKey, vcnCursorKey, fitDisplayValue, screenResolutionKey } from '@/views/terminal/types/const';
+  import { getDisplaySize } from '@/views/terminal/types/utils';
+  import BlockSettingItem from '../block-setting-item.vue';
+
+  const { toOptions, getDictValue } = useDictStore();
+  const { preference, updateTerminalPreference } = useTerminalStore();
+
+  const formModel = ref<TerminalVncGraphSetting>({ ...preference.vncGraphSetting });
+
+  // 监听内容变化
+  watch(formModel, (v) => {
+    if (!v) {
+      return;
+    }
+    // 同步大小
+    if (v.displaySize) {
+      // 自适应大小
+      if (v.displaySize === fitDisplayValue) {
+        v.displayWidth = 0;
+        v.displayHeight = 0;
+      } else {
+        // 解析大小
+        try {
+          const [width, height] = getDisplaySize(v.displaySize, true);
+          v.displayWidth = width;
+          v.displayHeight = height;
+        } catch (e) {
+          return;
+        }
+      }
+    }
+    // 同步
+    updateTerminalPreference(TerminalPreferenceItem.VNC_GRAPH_SETTING, formModel.value, true);
+  }, { deep: true });
+
+</script>
+
+<style lang="less" scoped>
+  .setting-body {
+    flex-direction: column;
+  }
+
+  :deep(.arco-input-number) {
+    input {
+      text-align: center;
+    }
+  }
+</style>
diff --git a/orion-visor-ui/src/views/terminal/types/const.ts b/orion-visor-ui/src/views/terminal/types/const.ts
index ead8720a..9826c18d 100644
--- a/orion-visor-ui/src/views/terminal/types/const.ts
+++ b/orion-visor-ui/src/views/terminal/types/const.ts
@@ -44,18 +44,31 @@ export const TerminalTabs = {
 export const TerminalSessionTypes = {
   SSH: {
     type: 'SSH',
+    protocol: 'SSH',
     channel: 'ssh',
-    icon: 'icon-desktop'
+    icon: 'icon-desktop',
+    connectIcon: 'icon-thunderbolt',
   },
   SFTP: {
     type: 'SFTP',
+    protocol: 'SSH',
     channel: 'sftp',
-    icon: 'icon-folder'
+    icon: 'icon-folder',
+    connectIcon: 'icon-folder',
   },
   RDP: {
     type: 'RDP',
+    protocol: 'RDP',
     channel: 'rdp',
-    icon: 'icon-computer'
+    icon: 'icon-desktop',
+    connectIcon: 'icon-desktop',
+  },
+  VNC: {
+    type: 'VNC',
+    protocol: 'VNC',
+    channel: 'vnc',
+    icon: 'icon-computer',
+    connectIcon: 'icon-computer',
   },
 };
 
@@ -72,6 +85,7 @@ export const ExtraSettingItems = {
   LABEL: 'LABEL',
   SSH: 'SSH',
   RDP: 'RDP',
+  VNC: 'VNC',
 };
 
 // 主机额外配置认证方式
@@ -97,7 +111,7 @@ export const TerminalMessages = {
   sessionClosed: '会话已结束...',
   waitingReconnect: '输入回车重新连接...',
   loggedElsewhere: '该账号已在另一台设备登录',
-  rdpConnectTimeout: '请检查远程计算机网络及其他配置是否正常',
+  connectTimeout: '请检查远程计算机网络及其他配置是否正常',
   fileTransferError: '传输失败',
   fileSaveError: '保存失败',
   fileUploading: '已开始上传, 点击右侧传输列表查看进度',
@@ -214,8 +228,8 @@ export const SshActionBarItems = [
   }
 ];
 
-// 终端操作栏键 - RDP
-export const RdpActionItemKeys = {
+// guacd 终端操作栏键
+export const GuacdActionItemKeys = {
   DISPLAY: 'display',
   COMBINATION_KEY: 'combinationKey',
   CLIPBOARD: 'clipboard',
@@ -225,45 +239,71 @@ export const RdpActionItemKeys = {
   CLOSE: 'close',
 };
 
-// 终端操作栏 - RDP
-export const RdpActionBarItems = [
-  {
-    item: RdpActionItemKeys.DISPLAY,
+// guacd 终端操作栏
+export const GuacdActionBarItemMap = {
+  [GuacdActionItemKeys.DISPLAY]: {
+    item: GuacdActionItemKeys.DISPLAY,
     icon: 'icon-desktop',
     content: '显示设置',
   },
-  {
-    item: RdpActionItemKeys.COMBINATION_KEY,
+  [GuacdActionItemKeys.COMBINATION_KEY]: {
+    item: GuacdActionItemKeys.COMBINATION_KEY,
     icon: 'icon-command',
     content: '组合键',
   },
-  {
-    item: RdpActionItemKeys.CLIPBOARD,
+  [GuacdActionItemKeys.CLIPBOARD]: {
+    item: GuacdActionItemKeys.CLIPBOARD,
     icon: 'icon-paste',
     content: '剪切板',
   },
-  {
-    item: RdpActionItemKeys.UPLOAD,
+  [GuacdActionItemKeys.UPLOAD]: {
+    item: GuacdActionItemKeys.UPLOAD,
     icon: 'icon-upload',
     content: '文件上传',
   },
-  {
-    item: RdpActionItemKeys.SAVE_RDP,
+  [GuacdActionItemKeys.SAVE_RDP]: {
+    item: GuacdActionItemKeys.SAVE_RDP,
     icon: 'icon-save',
     content: '保存 rdp 文件',
   },
-  {
-    item: RdpActionItemKeys.DISCONNECT,
+  [GuacdActionItemKeys.DISCONNECT]: {
+    item: GuacdActionItemKeys.DISCONNECT,
     icon: 'icon-stop',
     content: '断开连接',
   },
-  {
-    item: RdpActionItemKeys.CLOSE,
+  [GuacdActionItemKeys.CLOSE]: {
+    item: GuacdActionItemKeys.CLOSE,
     icon: 'icon-close',
     content: '关闭工具栏',
   },
+};
+
+// 终端操作栏 - RDP
+export const RdpActionBarItems = [
+  GuacdActionBarItemMap[GuacdActionItemKeys.DISPLAY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.COMBINATION_KEY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.CLIPBOARD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.UPLOAD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.SAVE_RDP],
+  GuacdActionBarItemMap[GuacdActionItemKeys.DISCONNECT],
+  GuacdActionBarItemMap[GuacdActionItemKeys.CLOSE],
 ];
 
+// 终端操作栏 - VNC
+export const VncActionBarItems = [
+  GuacdActionBarItemMap[GuacdActionItemKeys.DISPLAY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.COMBINATION_KEY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.CLIPBOARD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.DISCONNECT],
+  GuacdActionBarItemMap[GuacdActionItemKeys.CLOSE],
+];
+
+// 终端操作栏方向
+export const ActionBarPosition = {
+  TOP: 'top',
+  RIGHT: 'right',
+};
+
 // 终端快捷键操作类型
 export const TerminalShortcutType = {
   GLOBAL: 1,
@@ -403,8 +443,8 @@ export const TerminalShortcutItems: Array<ShortcutKeyItem> = [
   },
 ];
 
-// RDP 组合键元素
-export const RdpCombinationKeyItems: Array<CombinationKeyItem> = [
+// Guacd 组合键元素
+export const GuacdCombinationKeyItems: Array<CombinationKeyItem> = [
   {
     keys: [65307],
     name: 'Esc'
@@ -444,9 +484,90 @@ export const RdpCombinationKeyItems: Array<CombinationKeyItem> = [
   {
     keys: [65515, 120],
     name: 'Windows+X'
+  }, {
+    keys: [65507, 99],
+    name: 'Ctrl+C'
   },
+  {
+    keys: [65507, 118],
+    name: 'Ctrl+V'
+  },
+  {
+    keys: [65507, 120],
+    name: 'Ctrl+X'
+  },
+  {
+    keys: [65507, 97],
+    name: 'Ctrl+A'
+  },
+  {
+    keys: [65507, 122],
+    name: 'Ctrl+Z'
+  },
+  {
+    keys: [65507, 65535],
+    name: 'Ctrl+Delete'
+  },
+  {
+    keys: [65507, 65288],
+    name: 'Ctrl+Backspace'
+  },
+  {
+    keys: [65507, 65513, 65470],
+    name: 'Ctrl+Alt+F1'
+  },
+  {
+    keys: [65507, 65513, 65471],
+    name: 'Ctrl+Alt+F2'
+  },
+  {
+    keys: [65507, 65513, 65472],
+    name: 'Ctrl+Alt+F3'
+  },
+  {
+    keys: [65507, 65513, 65473],
+    name: 'Ctrl+Alt+F4'
+  },
+  {
+    keys: [65507, 65513, 65474],
+    name: 'Ctrl+Alt+F5'
+  },
+  {
+    keys: [65507, 65513, 65475],
+    name: 'Ctrl+Alt+F6'
+  },
+  {
+    keys: [65507, 65513, 65476],
+    name: 'Ctrl+Alt+F7'
+  },
+  {
+    keys: [65507, 65513, 65477],
+    name: 'Ctrl+Alt+F8'
+  },
+  {
+    keys: [65507, 65513, 65478],
+    name: 'Ctrl+Alt+F9'
+  },
+  {
+    keys: [65507, 65513, 65479],
+    name: 'Ctrl+Alt+F10'
+  },
+  {
+    keys: [65507, 65513, 65480],
+    name: 'Ctrl+Alt+F11'
+  },
+  {
+    keys: [65507, 65513, 65481],
+    name: 'Ctrl+Alt+F12'
+  }
 ];
 
+// backspace 字符
+export const BACKSPACE_CHAR = String.fromCharCode(127);
+
+// ctrl^h 字符
+export const CTRL_H_CHAR = String.fromCharCode(8);
+
 // 传输状态
 export const TransferStatus = {
   WAITING: 'waiting',

From 1abc47bb56cb0a6eec82c205eceb5bc83d00c715 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 7 Jul 2025 14:47:18 +0800
Subject: [PATCH 18/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=20vnc=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/style/host-terminal-layout.less    | 186 ++++++++++++-
 .../src/store/modules/terminal/index.ts       |  12 +-
 .../src/store/modules/terminal/types.ts       |  28 ++
 .../components/layout/empty-recommend.vue     |  54 +---
 .../new-connection/host-list-modal.vue        |  56 ++--
 .../new-connection/host-list-view.vue         |  59 ++--
 .../new-connection/new-connection-view.vue    |   4 +-
 .../rdp-status.vue => guacd/guacd-status.vue} |  10 +-
 .../components/view/rdp/rdp-action-bar.vue    | 262 ++++--------------
 .../terminal/components/view/rdp/rdp-view.vue |  75 +----
 .../components/view/sftp/sftp-view.vue        |  18 +-
 .../terminal/components/view/ssh/ssh-view.vue |   8 +-
 .../src/views/terminal/interfaces/handler.ts  |   8 +-
 .../src/views/terminal/interfaces/session.ts  |  42 +--
 .../terminal/service/session/base-session.ts  |   7 +-
 .../terminal/types/use-guacd-action-bar.ts    |  84 ++++++
 16 files changed, 466 insertions(+), 447 deletions(-)
 rename orion-visor-ui/src/views/terminal/components/view/{rdp/rdp-status.vue => guacd/guacd-status.vue} (93%)
 create mode 100644 orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts

diff --git a/orion-visor-ui/src/assets/style/host-terminal-layout.less b/orion-visor-ui/src/assets/style/host-terminal-layout.less
index 090d5bf3..926c7f37 100644
--- a/orion-visor-ui/src/assets/style/host-terminal-layout.less
+++ b/orion-visor-ui/src/assets/style/host-terminal-layout.less
@@ -619,5 +619,189 @@ body[terminal-theme='dark'] .arco-modal-container {
     font-size: 16px;
     margin: 0 8px 0 4px;
   }
-
+}
+
+// guacd 容器
+.guacd-container {
+
+  // guacd 视口
+  .guacd-viewport {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    :deep(> div) {
+      position: relative;
+      z-index: 8;
+    }
+  }
+
+  // guacd 状态遮罩
+  .guacd-status-mask {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    backdrop-filter: blur(10px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+  }
+
+  // guacd 工具栏
+  .guacd-action-bar {
+    position: absolute;
+    cursor: pointer;
+    z-index: 9998;
+
+    &.top {
+      top: 4px;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+
+    &.right {
+      right: 4px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    // 工具栏触发器
+    .action-bar-trigger {
+      display: flex;
+      border-radius: 8px;
+      transition: .3s all;
+      background: var(--color-bg-rdp-toolbar);
+      filter: contrast(50%) brightness(50%);
+
+      &.top {
+        width: 240px;
+        height: 8px;
+
+        &:hover {
+          transform: translateY(2px);
+        }
+      }
+
+      &.right {
+        width: 8px;
+        height: 228px;
+
+        &:hover {
+          transform: translateX(-2px);
+        }
+      }
+
+      &:hover {
+        background: var(--color-bg-rdp-toolbar-hover);
+      }
+    }
+
+  }
+}
+
+// guacd 工具栏
+@guacd-action-size: 42px;
+
+.guacd-action-bar-popover {
+  --actions-width: calc(var(--action-count) * @guacd-action-size + (var(--action-count) - 1) * 16px);
+  background: var(--color-bg-2);
+
+  .arco-popover-content {
+    margin-top: 0;
+    display: flex;
+  }
+
+  .action-bar-button {
+    width: @guacd-action-size !important;
+    height: @guacd-action-size !important;
+    font-size: 20px;
+  }
+
+  .action-bar-content {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .action-bar-content-footer {
+    margin-top: 12px;
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .display-size-label {
+    padding-right: 6px;
+    user-select: none;
+    text-align: end;
+  }
+
+  .display-size-input {
+    width: 198px;
+  }
+
+  .action-bar-upload, .action-bar-clipboard {
+    display: flex;
+  }
+
+  .combination-key-item {
+    span {
+      display: block;
+      padding: 6px 12px;
+      cursor: pointer;
+      background: var(--color-fill-1);
+      border-radius: 2px;
+      user-select: none;
+      transition: 0.2s ALL;
+
+      &:hover {
+        background: var(--color-fill-2);
+      }
+    }
+  }
+}
+
+.guacd-action-bar-popover.top {
+  .arco-popover-content {
+    flex-direction: column;
+    width: var(--actions-width);
+  }
+
+  .action-bar-content {
+    margin-top: 16px;
+    max-height: 224px;
+    overflow-x: hidden;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .action-bar-upload, .action-bar-clipboard {
+    height: 186px;
+  }
+}
+
+.guacd-action-bar-popover.right {
+  .arco-popover-content {
+    flex-direction: row-reverse;
+    height: var(--actions-width);
+  }
+
+  .action-bar-content {
+    margin-right: 16px;
+    width: 344px;
+    overflow-x: hidden;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .action-bar-upload, .action-bar-clipboard {
+    height: calc(var(--actions-width) - 40px);
+  }
 }
diff --git a/orion-visor-ui/src/store/modules/terminal/index.ts b/orion-visor-ui/src/store/modules/terminal/index.ts
index a7faab8b..2d142b16 100644
--- a/orion-visor-ui/src/store/modules/terminal/index.ts
+++ b/orion-visor-ui/src/store/modules/terminal/index.ts
@@ -8,7 +8,9 @@ import type {
   TerminalSshDisplaySetting,
   TerminalSshInteractSetting,
   TerminalSshPluginsSetting,
-  TerminalState
+  TerminalState,
+  TerminalVncActionBarSetting,
+  TerminalVncGraphSetting
 } from './types';
 import type {
   IDomViewportHandler,
@@ -56,8 +58,12 @@ export const TerminalPreferenceItem = {
   RDP_GRAPH_SETTING: 'rdpGraphSetting',
   // rdp 操作栏设置
   RDP_ACTION_BAR_SETTING: 'rdpActionBarSetting',
-  // 会话设置
+  // rdp 会话设置
   RDP_SESSION_SETTING: 'rdpSessionSetting',
+  // vnc 图形化设置
+  VNC_GRAPH_SETTING: 'vncGraphSetting',
+  // vnc 工具栏设置
+  VNC_ACTION_BAR_SETTING: 'vncActionBarSetting',
   // 快捷键设置
   SHORTCUT_SETTING: 'shortcutSetting',
 };
@@ -77,6 +83,8 @@ export default defineStore('terminal', {
       rdpGraphSetting: {} as TerminalRdpGraphSetting,
       rdpSessionSetting: {} as TerminalRdpSessionSetting,
       rdpActionBarSetting: {} as TerminalRdpActionBarSetting,
+      vncGraphSetting: {} as TerminalVncGraphSetting,
+      vncActionBarSetting: {} as TerminalVncActionBarSetting,
       shortcutSetting: {
         enabled: false,
         keys: []
diff --git a/orion-visor-ui/src/store/modules/terminal/types.ts b/orion-visor-ui/src/store/modules/terminal/types.ts
index cb067a25..7bd40f11 100644
--- a/orion-visor-ui/src/store/modules/terminal/types.ts
+++ b/orion-visor-ui/src/store/modules/terminal/types.ts
@@ -23,6 +23,8 @@ export interface TerminalPreference {
   rdpGraphSetting: TerminalRdpGraphSetting;
   rdpActionBarSetting: TerminalRdpActionBarSetting;
   rdpSessionSetting: TerminalRdpSessionSetting;
+  vncGraphSetting: TerminalVncGraphSetting;
+  vncActionBarSetting: TerminalVncActionBarSetting;
   shortcutSetting: TerminalShortcutSetting;
 }
 
@@ -68,6 +70,7 @@ export interface TerminalSshInteractSetting {
   wordSeparator: string;
   terminalEmulationType: string;
   scrollBackLine: number;
+  replaceBackspace: boolean;
 }
 
 // RDP 图形化设置
@@ -111,6 +114,31 @@ export interface TerminalRdpSessionSetting {
   driveMountMode?: string;
 }
 
+// VNC 图形化设置
+export interface TerminalVncGraphSetting {
+  displaySize?: string;
+  displayWidth?: number;
+  displayHeight?: number;
+  colorDepth?: number;
+  forceLossless?: boolean;
+  swapRedBlue?: boolean;
+  cursor?: string;
+  compressLevel?: number;
+  qualityLevel?: number;
+}
+
+// VNC 操作栏设置
+export interface TerminalVncActionBarSetting {
+  position?: string;
+  display?: boolean;
+  combinationKey?: boolean;
+  clipboard?: boolean;
+  disconnect?: boolean;
+  close?: boolean;
+
+  [key: string]: unknown;
+}
+
 // 终端快捷键设置
 export interface TerminalShortcutSetting {
   enabled: boolean;
diff --git a/orion-visor-ui/src/views/terminal/components/layout/empty-recommend.vue b/orion-visor-ui/src/views/terminal/components/layout/empty-recommend.vue
index 796b0a06..159e9b47 100644
--- a/orion-visor-ui/src/views/terminal/components/layout/empty-recommend.vue
+++ b/orion-visor-ui/src/views/terminal/components/layout/empty-recommend.vue
@@ -31,45 +31,21 @@
                 <icon-right />
               </a-button>
             </a-tooltip>
-            <!-- 打开 SSH -->
-            <a-tooltip v-if="handler.host?.types?.includes(TerminalSessionTypes.SSH.type)"
-                       position="top"
-                       :mini="true"
-                       :auto-fix-position="false"
-                       content-class="terminal-tooltip-content"
-                       arrow-class="terminal-tooltip-content"
-                       content="打开 SSH">
-              <a-button class="combined-handler-action icon-button"
-                        @click="openSession(handler.host as any, TerminalSessionTypes.SSH)">
-                <icon-thunderbolt />
-              </a-button>
-            </a-tooltip>
-            <!-- 打开 SFTP -->
-            <a-tooltip v-if="handler.host?.types?.includes(TerminalSessionTypes.SSH.type)"
-                       position="top"
-                       :mini="true"
-                       :auto-fix-position="false"
-                       content-class="terminal-tooltip-content"
-                       arrow-class="terminal-tooltip-content"
-                       content="打开 SFTP">
-              <a-button class="combined-handler-action icon-button"
-                        @click="openSession(handler.host as any, TerminalSessionTypes.SFTP)">
-                <icon-folder />
-              </a-button>
-            </a-tooltip>
-            <!-- 打开 RDP -->
-            <a-tooltip v-if="handler.host?.types?.includes(TerminalSessionTypes.RDP.type)"
-                       position="top"
-                       :mini="true"
-                       :auto-fix-position="false"
-                       content-class="terminal-tooltip-content"
-                       arrow-class="terminal-tooltip-content"
-                       content="打开 RDP">
-              <a-button class="combined-handler-action icon-button"
-                        @click="openSession(handler.host as any, TerminalSessionTypes.RDP)">
-                <icon-computer />
-              </a-button>
-            </a-tooltip>
+            <!-- 打开会话 -->
+            <template v-for="type in TerminalSessionTypes">
+              <template v-if="handler.host?.types?.includes(type.protocol)">
+                <a-tooltip position="top"
+                           :mini="true"
+                           :auto-fix-position="false"
+                           :content="`打开 ${type.type}`"
+                           content-class="terminal-tooltip-content"
+                           arrow-class="terminal-tooltip-content">
+                  <a-button class="combined-handler-action icon-button" @click="openSession(handler.host as any, type)">
+                    <component :is="type.connectIcon || type.icon" />
+                  </a-button>
+                </a-tooltip>
+              </template>
+            </template>
           </div>
         </div>
       </div>
diff --git a/orion-visor-ui/src/views/terminal/components/new-connection/host-list-modal.vue b/orion-visor-ui/src/views/terminal/components/new-connection/host-list-modal.vue
index 14c3746a..33fb7b47 100644
--- a/orion-visor-ui/src/views/terminal/components/new-connection/host-list-modal.vue
+++ b/orion-visor-ui/src/views/terminal/components/new-connection/host-list-modal.vue
@@ -40,45 +40,21 @@
               </div>
               <!-- 操作 -->
               <div class="host-item-actions">
-                <!-- 打开 SSH -->
-                <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.SSH.type)"
-                           position="top"
-                           :mini="true"
-                           :auto-fix-position="false"
-                           content-class="terminal-tooltip-content"
-                           arrow-class="terminal-tooltip-content"
-                           content="打开 SSH">
-                  <a-button class="host-item-action icon-button"
-                            @click="clickHost(item, TerminalSessionTypes.SSH)">
-                    <icon-thunderbolt />
-                  </a-button>
-                </a-tooltip>
-                <!-- 打开 SFTP -->
-                <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.SSH.type)"
-                           position="top"
-                           :mini="true"
-                           :auto-fix-position="false"
-                           content-class="terminal-tooltip-content"
-                           arrow-class="terminal-tooltip-content"
-                           content="打开 SFTP">
-                  <a-button class="host-item-action icon-button"
-                            @click="clickHost(item, TerminalSessionTypes.SFTP)">
-                    <icon-folder />
-                  </a-button>
-                </a-tooltip>
-                <!-- 打开 RDP -->
-                <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.RDP.type)"
-                           position="top"
-                           :mini="true"
-                           :auto-fix-position="false"
-                           content-class="terminal-tooltip-content"
-                           arrow-class="terminal-tooltip-content"
-                           content="打开 RDP">
-                  <a-button class="host-item-action icon-button"
-                            @click="clickHost(item, TerminalSessionTypes.RDP)">
-                    <icon-computer />
-                  </a-button>
-                </a-tooltip>
+                <!-- 打开会话 -->
+                <template v-for="type in TerminalSessionTypes">
+                  <template v-if="item.types?.includes(type.protocol)">
+                    <a-tooltip position="top"
+                               :mini="true"
+                               :auto-fix-position="false"
+                               :content="`打开 ${type.type}`"
+                               content-class="terminal-tooltip-content"
+                               arrow-class="terminal-tooltip-content">
+                      <a-button class="host-item-action icon-button" @click="openHostSession(item, type)">
+                        <component :is="type.connectIcon || type.icon" />
+                      </a-button>
+                    </a-tooltip>
+                  </template>
+                </template>
               </div>
             </div>
           </a-list-item>
@@ -144,7 +120,7 @@
   defineExpose({ open });
 
   // 打开终端
-  const clickHost = (item: HostQueryResponse, tab: TerminalSessionType) => {
+  const openHostSession = (item: HostQueryResponse, tab: TerminalSessionType) => {
     openSession(item, tab, panelIndex.value);
     setVisible(false);
   };
diff --git a/orion-visor-ui/src/views/terminal/components/new-connection/host-list-view.vue b/orion-visor-ui/src/views/terminal/components/new-connection/host-list-view.vue
index 29144cec..ca67b2e6 100644
--- a/orion-visor-ui/src/views/terminal/components/new-connection/host-list-view.vue
+++ b/orion-visor-ui/src/views/terminal/components/new-connection/host-list-view.vue
@@ -111,48 +111,23 @@
             </div>
             <!-- 操作 -->
             <div class="host-item-right-actions">
-              <!-- 打开 SSH -->
-              <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.SSH.type)"
-                         position="top"
-                         :mini="true"
-                         :auto-fix-position="false"
-                         content-class="terminal-tooltip-content"
-                         arrow-class="terminal-tooltip-content"
-                         content="打开 SSH">
-                <div class="terminal-sidebar-icon-wrapper">
-                  <a-button class="terminal-sidebar-icon" @click="openSession(item, TerminalSessionTypes.SSH)">
-                    <icon-thunderbolt />
-                  </a-button>
-                </div>
-              </a-tooltip>
-              <!-- 打开 SFTP -->
-              <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.SSH.type)"
-                         position="top"
-                         :mini="true"
-                         :auto-fix-position="false"
-                         content-class="terminal-tooltip-content"
-                         arrow-class="terminal-tooltip-content"
-                         content="打开 SFTP">
-                <div class="terminal-sidebar-icon-wrapper">
-                  <a-button class="terminal-sidebar-icon" @click="openSession(item, TerminalSessionTypes.SFTP)">
-                    <icon-folder />
-                  </a-button>
-                </div>
-              </a-tooltip>
-              <!-- 打开 RDP -->
-              <a-tooltip v-if="item.types?.includes(TerminalSessionTypes.RDP.type)"
-                         position="top"
-                         :mini="true"
-                         :auto-fix-position="false"
-                         content-class="terminal-tooltip-content"
-                         arrow-class="terminal-tooltip-content"
-                         content="打开 RDP">
-                <div class="terminal-sidebar-icon-wrapper">
-                  <a-button class="terminal-sidebar-icon" @click="openSession(item, TerminalSessionTypes.RDP)">
-                    <icon-computer />
-                  </a-button>
-                </div>
-              </a-tooltip>
+              <!-- 打开会话 -->
+              <template v-for="type in TerminalSessionTypes">
+                <template v-if="item.types?.includes(type.protocol)">
+                  <a-tooltip position="top"
+                             :mini="true"
+                             :auto-fix-position="false"
+                             :content="`打开 ${type.type}`"
+                             content-class="terminal-tooltip-content"
+                             arrow-class="terminal-tooltip-content">
+                    <div class="terminal-sidebar-icon-wrapper">
+                      <a-button class="terminal-sidebar-icon" @click="openSession(item, type)">
+                        <component :is="type.connectIcon || type.icon" />
+                      </a-button>
+                    </div>
+                  </a-tooltip>
+                </template>
+              </template>
               <!-- 主机设置 -->
               <a-tooltip position="top"
                          :mini="true"
diff --git a/orion-visor-ui/src/views/terminal/components/new-connection/new-connection-view.vue b/orion-visor-ui/src/views/terminal/components/new-connection/new-connection-view.vue
index 314b9d52..9e9a2e22 100644
--- a/orion-visor-ui/src/views/terminal/components/new-connection/new-connection-view.vue
+++ b/orion-visor-ui/src/views/terminal/components/new-connection/new-connection-view.vue
@@ -68,7 +68,7 @@
 
 <script lang="ts" setup>
   import type { SelectOptionData } from '@arco-design/web-vue';
-  import { onBeforeMount, ref } from 'vue';
+  import { ref, onMounted } from 'vue';
   import { NewConnectionType, newConnectionTypeKey } from '../../types/const';
   import { useDictStore, useTerminalStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
@@ -86,7 +86,7 @@
   const filterOptions = ref<Array<SelectOptionData>>([]);
 
   // 初始化过滤器项
-  onBeforeMount(() => {
+  onMounted(() => {
     filterOptions.value = getAuthorizedHostOptions(hosts.hostList);
   });
 
diff --git a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-status.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/guacd-status.vue
similarity index 93%
rename from orion-visor-ui/src/views/terminal/components/view/rdp/rdp-status.vue
rename to orion-visor-ui/src/views/terminal/components/view/guacd/guacd-status.vue
index b6be3f58..7e0f8343 100644
--- a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-status.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/guacd-status.vue
@@ -6,7 +6,7 @@
             dot />
     <!-- 会话关闭 -->
     <a-card v-if="session.state.connectStatus === TerminalStatus.CLOSED"
-            class="rdp-status-wrapper"
+            class="status-wrapper"
             title="会话已关闭">
       <!-- 错误信息 -->
       <a-descriptions size="large"
@@ -51,12 +51,12 @@
 
 <script lang="ts">
   export default {
-    name: 'rdpStatus'
+    name: 'guacdStatus'
   };
 </script>
 
 <script lang="ts" setup>
-  import type { IRdpSession } from '@/views/terminal/interfaces';
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
   import { TerminalStatus, TerminalCloseCode, TerminalMessages } from '@/views/terminal/types/const';
   import { copy } from '@/hooks/copy';
   import { dateFormat } from '@/utils';
@@ -64,7 +64,7 @@
   import useVisible from '@/hooks/visible';
 
   const props = defineProps<{
-    session: IRdpSession;
+    session: IGuacdSession;
   }>();
 
   const { visible, setVisible } = useVisible(true);
@@ -73,7 +73,7 @@
 </script>
 
 <style lang="less" scoped>
-  .rdp-status-wrapper {
+  .status-wrapper {
     width: 520px;
     min-height: 180px;
     border-radius: 8px;
diff --git a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
index 631116ac..9408cb95 100644
--- a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
@@ -4,27 +4,27 @@
     <a-popover v-model:popup-visible="visible"
                :title="undefined"
                trigger="click"
-               :content-class="['tool-bar-popover', direction]"
-               :content-style="{ '--action-count': Math.max(actions.length, 6) }"
-               :position="direction === 'right' ? 'left' : 'bottom'"
+               :content-class="['guacd-action-bar-popover', direction]"
+               :content-style="{ '--action-count': Math.max(actions.length, direction === ActionBarPosition.RIGHT ? 5 : 6) }"
+               :position="direction === ActionBarPosition.RIGHT ? 'left' : 'bottom'"
                :show-arrow="false"
                :auto-fix-position="false">
       <!-- 触发器 -->
-      <div class="tool-bar" :class="[direction === 'right' ? 'right' : 'top']" />
+      <div class="action-bar-trigger" :class="[direction === ActionBarPosition.RIGHT ? 'right' : 'top']" />
       <!-- 工具内容 -->
       <template #content>
         <!-- 按钮 -->
-        <a-space class="tool-bar-actions"
-                 :direction="direction === 'right' ? 'vertical' : 'horizontal'"
+        <a-space class="action-bar-actions"
+                 :direction="direction === ActionBarPosition.RIGHT ? 'vertical' : 'horizontal'"
                  :size="16">
           <div v-for="action in actions" :key="action.item">
             <a-tooltip :mini="true"
                        :auto-fix-position="false"
-                       :position="direction === 'right' ? 'left' : 'bottom'"
+                       :position="direction === ActionBarPosition.RIGHT ? 'left' : 'bottom'"
                        content-class="terminal-tooltip-content"
                        :show-arrow="false"
                        :content="action.content">
-              <a-button class="tool-bar-button"
+              <a-button class="action-bar-button"
                         :disabled="action.disabled"
                         :type="action.active ? 'primary' : 'secondary'"
                         @click="toggleClickAction(action.item)">
@@ -36,7 +36,7 @@
           </div>
         </a-space>
         <!-- 显示设置 -->
-        <div v-if="current === RdpActionItemKeys.DISPLAY" class="tool-bar-content">
+        <div v-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
           <!-- 分辨率 -->
           <a-space>
             <span class="display-size-label">分辨率</span>
@@ -47,7 +47,7 @@
                       allow-create />
           </a-space>
           <!-- 按钮 -->
-          <a-space class="tool-bar-content-footer">
+          <a-space class="action-bar-content-footer">
             <a-button type="primary"
                       size="small"
                       @click="fitOnce">
@@ -61,9 +61,9 @@
           </a-space>
         </div>
         <!-- 组合键 -->
-        <div v-else-if="current === RdpActionItemKeys.COMBINATION_KEY" class="tool-bar-content">
+        <div v-else-if="current === GuacdActionItemKeys.COMBINATION_KEY" class="action-bar-content">
           <a-row :gutter="[12, 12]" wrap>
-            <a-col v-for="item in RdpCombinationKeyItems"
+            <a-col v-for="item in GuacdCombinationKeyItems"
                    :key="item.name"
                    :span="12"
                    class="combination-key-item"
@@ -73,14 +73,14 @@
           </a-row>
         </div>
         <!-- 剪切板 -->
-        <div v-else-if="current === RdpActionItemKeys.CLIPBOARD" class="tool-bar-content">
-          <a-textarea class="tool-bar-clipboard"
+        <div v-else-if="current === GuacdActionItemKeys.CLIPBOARD" class="action-bar-content">
+          <a-textarea class="action-bar-clipboard"
                       v-model="clipboardData"
                       :ref="setAutoFocus"
                       placeholder="远程剪切板"
                       allow-clear />
           <!-- 按钮 -->
-          <a-space class="tool-bar-content-footer">
+          <a-space class="action-bar-content-footer">
             <a-button size="small" @click="clearClipboardData">
               清空
             </a-button>
@@ -93,8 +93,8 @@
           </a-space>
         </div>
         <!-- 文件上传 -->
-        <div v-else-if="current === RdpActionItemKeys.UPLOAD" class="tool-bar-content">
-          <a-upload class="tool-bar-upload"
+        <div v-else-if="current === GuacdActionItemKeys.UPLOAD" class="action-bar-content">
+          <a-upload class="action-bar-upload"
                     v-model:file-list="fileList"
                     :auto-upload="false"
                     :show-file-list="false"
@@ -102,7 +102,7 @@
                     :tip="fileList.length ? fileList[0]?.name : '选择文件后会自动上传至驱动目录'"
                     @change="onSelectFile" />
           <!-- 按钮 -->
-          <a-space class="tool-bar-content-footer">
+          <a-space class="action-bar-content-footer">
             <a-button size="small" @click="clearUploadFile">
               清空
             </a-button>
@@ -130,18 +130,18 @@
   import type { IRdpSession } from '@/views/terminal/interfaces';
   import {
     TerminalStatus,
-    RdpCombinationKeyItems,
-    RdpActionItemKeys,
+    GuacdCombinationKeyItems,
+    GuacdActionItemKeys,
     RdpActionBarItems,
     screenResolutionKey,
-    fitDisplayValue
+    fitDisplayValue, ActionBarPosition
   } from '@/views/terminal/types/const';
   import { computed, ref, watch, onMounted } from 'vue';
   import { setAutoFocus } from '@/utils/dom';
   import { saveAs } from 'file-saver';
   import { readText } from '@/hooks/copy';
   import { useTerminalStore, useDictStore } from '@/store';
-  import { getDisplaySize } from '@/views/terminal/types/utils';
+  import useGuacdActionBar from '@/views/terminal/types/use-guacd-action-bar';
   import useVisible from '@/hooks/visible';
 
   const props = defineProps<{
@@ -153,9 +153,21 @@
   const { toOptions, getDictValue } = useDictStore();
   const { visible, setVisible } = useVisible();
 
+  const {
+    displaySize,
+    clipboardData,
+    fitOnce,
+    setDisplaySize,
+    triggerCombinationKey,
+    sendClipboardData,
+    clearClipboardData,
+    disconnect,
+  } = useGuacdActionBar({
+    session: props.session,
+    setVisible,
+  });
+
   const current = ref('');
-  const displaySize = ref(fitDisplayValue);
-  const clipboardData = ref('');
   const fileList = ref<FileItem[]>([]);
 
   const actions = computed(() => {
@@ -166,7 +178,7 @@
       return {
         ...item,
         active: current.value === key,
-        disabled: (key === RdpActionItemKeys.DISPLAY || key === RdpActionItemKeys.SAVE_RDP || RdpActionItemKeys.DISCONNECT || key === RdpActionItemKeys.CLOSE) ? false : !props.session.isWriteable(),
+        disabled: (key === GuacdActionItemKeys.DISPLAY || key === GuacdActionItemKeys.SAVE_RDP || GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.CLOSE) ? false : !props.session.isWriteable(),
       };
     });
   });
@@ -182,70 +194,39 @@
 
   // 触发 action
   const toggleClickAction = (key: string) => {
-    if (key === RdpActionItemKeys.DISPLAY) {
+    if (key === GuacdActionItemKeys.DISPLAY) {
       // 显示设置
-      current.value = RdpActionItemKeys.DISPLAY;
+      current.value = GuacdActionItemKeys.DISPLAY;
       if (props.session.displayHandler?.autoFit) {
         displaySize.value = fitDisplayValue;
       } else {
         displaySize.value = `${props.session.displayHandler?.displayWidth || 0}x${props.session.displayHandler?.displayHeight || 0}`;
       }
-    } else if (key === RdpActionItemKeys.COMBINATION_KEY) {
+    } else if (key === GuacdActionItemKeys.COMBINATION_KEY) {
       // 组合键
-      current.value = RdpActionItemKeys.COMBINATION_KEY;
-    } else if (key === RdpActionItemKeys.CLIPBOARD) {
+      current.value = GuacdActionItemKeys.COMBINATION_KEY;
+    } else if (key === GuacdActionItemKeys.CLIPBOARD) {
       // 剪切板
-      current.value = RdpActionItemKeys.CLIPBOARD;
+      current.value = GuacdActionItemKeys.CLIPBOARD;
       readText(false)
         .then(s => clipboardData.value = s)
         .catch(() => clipboardData.value = '');
-    } else if (key === RdpActionItemKeys.UPLOAD) {
+    } else if (key === GuacdActionItemKeys.UPLOAD) {
       // 文件上传
-      current.value = RdpActionItemKeys.UPLOAD;
+      current.value = GuacdActionItemKeys.UPLOAD;
       fileList.value = [];
-    } else if (key === RdpActionItemKeys.SAVE_RDP) {
+    } else if (key === GuacdActionItemKeys.SAVE_RDP) {
       // 保存 rdp 文件
       saveRdpFile();
-    } else if (key === RdpActionItemKeys.DISCONNECT) {
+    } else if (key === GuacdActionItemKeys.DISCONNECT) {
       // 断开连接
       disconnect();
-    } else if (key === RdpActionItemKeys.CLOSE) {
+    } else if (key === GuacdActionItemKeys.CLOSE) {
       // 关闭工具栏
       setVisible(false);
     }
   };
 
-  // 临时自适应
-  const fitOnce = () => {
-    props.session.displayHandler?.fit(true);
-    setVisible(false);
-  };
-
-  // 设置显示大小
-  const setDisplaySize = () => {
-    const displayHandler = props.session.displayHandler;
-    if (!displayHandler) {
-      return;
-    }
-    if (displaySize.value === fitDisplayValue) {
-      // 设置自适应
-      displayHandler.autoFit = true;
-      displayHandler.fit(true);
-    } else {
-      try {
-        // 获取大小
-        const [width, height] = getDisplaySize(displaySize.value, true);
-        // 取消自适应
-        displayHandler.autoFit = false;
-        // 设置大小
-        displayHandler.resize(width, height);
-      } catch (e) {
-        return;
-      }
-    }
-    setVisible(false);
-  };
-
   // 保存 rdp 文件
   const saveRdpFile = () => {
     const address = props.session.info.address;
@@ -255,24 +236,6 @@
     saveAs(new Blob([content], { type: 'text/plain;charset=utf-8' }), `${address}.rdp`);
   };
 
-  // 触发组合键
-  const triggerCombinationKey = (keys: Array<number>) => {
-    props.session.sendKeys(keys);
-    setVisible(false);
-  };
-
-  // 发送剪切板数据
-  const sendClipboardData = () => {
-    // 粘贴
-    props.session.paste(clipboardData.value);
-    setVisible(false);
-  };
-
-  // 清空剪切板数据
-  const clearClipboardData = () => {
-    clipboardData.value = '';
-  };
-
   // 上传文件
   const uploadFile = () => {
     const file = fileList.value[0].file as File;
@@ -293,12 +256,6 @@
     fileList.value = [];
   };
 
-  // 关闭会话
-  const disconnect = () => {
-    props.session.disconnect();
-    setVisible(false);
-  };
-
   // 设置选中
   onMounted(() => {
     if (actions.value?.length) {
@@ -309,127 +266,4 @@
 </script>
 
 <style lang="less" scoped>
-  .tool-bar {
-    display: flex;
-    border-radius: 8px;
-    transition: .3s all;
-    background: var(--color-bg-rdp-toolbar);
-    filter: contrast(50%) brightness(50%);
-
-    &.top {
-      width: 240px;
-      height: 8px;
-
-      &:hover {
-        transform: translateY(2px);
-      }
-    }
-
-    &.right {
-      width: 8px;
-      height: 228px;
-
-      &:hover {
-        transform: translateX(-2px);
-      }
-    }
-
-    &:hover {
-      background: var(--color-bg-rdp-toolbar-hover);
-    }
-  }
-</style>
-
-<style lang="less">
-  @action-size: 42px;
-
-  .tool-bar-popover.top {
-    .arco-popover-content {
-      flex-direction: column;
-      width: var(--actions-width);
-    }
-
-    .tool-bar-content {
-      margin-top: 16px;
-      max-height: var(--actions-width);
-    }
-
-    .tool-bar-upload, .tool-bar-clipboard {
-      height: 186px;
-    }
-  }
-
-  .tool-bar-popover.right {
-    .arco-popover-content {
-      flex-direction: row-reverse;
-      max-height: var(--actions-width);
-    }
-
-    .tool-bar-content {
-      margin-right: 16px;
-      width: var(--actions-width);
-    }
-
-    .tool-bar-upload, .tool-bar-clipboard {
-      height: calc(var(--actions-width) - 40px);
-    }
-  }
-
-  .tool-bar-popover {
-    --actions-width: calc(var(--action-count) * @action-size + (var(--action-count) - 1) * 16px);
-    background: var(--color-bg-2);
-
-    .arco-popover-content {
-      margin-top: 0;
-      display: flex;
-    }
-
-    .tool-bar-button {
-      width: @action-size !important;
-      height: @action-size !important;
-      font-size: 20px;
-    }
-
-    .tool-bar-content {
-      display: flex;
-      flex-direction: column;
-    }
-
-    .tool-bar-content-footer {
-      margin-top: 12px;
-      display: flex;
-      justify-content: flex-end;
-    }
-
-    .display-size-label {
-      padding-right: 6px;
-      user-select: none;
-      text-align: end;
-    }
-
-    .display-size-input {
-      width: 198px;
-    }
-
-    .tool-bar-upload, .tool-bar-clipboard {
-      display: flex;
-    }
-
-    .combination-key-item {
-      span {
-        display: block;
-        padding: 6px 12px;
-        cursor: pointer;
-        background: var(--color-fill-1);
-        border-radius: 2px;
-        user-select: none;
-        transition: 0.2s ALL;
-
-        &:hover {
-          background: var(--color-fill-2);
-        }
-      }
-    }
-  }
-
 </style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-view.vue b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-view.vue
index c2d01382..1d529fff 100644
--- a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-view.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-view.vue
@@ -1,17 +1,17 @@
 <template>
-  <div class="rdp-container">
+  <div class="guacd-container">
     <!-- 状态 -->
-    <rdp-status v-if="session"
-                class="rdp-status-mask"
-                :session="session" />
+    <guacd-status v-if="session"
+                  class="guacd-status-mask"
+                  :session="session" />
     <!-- 工具栏 -->
     <rdp-action-bar v-if="session"
-                    class="rdp-action-bar"
-                    :class="[toolbarDirection === 'right' ? 'right' : 'top']"
+                    class="guacd-action-bar"
+                    :class="[actionBarDirection === 'right' ? 'right' : 'top']"
                     :session="session"
-                    :direction="toolbarDirection" />
-    <!-- rdp 视口 -->
-    <div class="rdp-viewport" ref="viewport" />
+                    :direction="actionBarDirection" />
+    <!-- 视口 -->
+    <div class="guacd-viewport" ref="viewport" />
   </div>
 </template>
 
@@ -25,8 +25,9 @@
   import type { TerminalSessionTabItem, IRdpSession } from '@/views/terminal/interfaces';
   import { onMounted, ref, onUnmounted } from 'vue';
   import { useTerminalStore } from '@/store';
-  import RdpStatus from './rdp-status.vue';
+  import { ActionBarPosition } from '@/views/terminal/types/const';
   import RdpActionBar from './rdp-action-bar.vue';
+  import GuacdStatus from '../guacd/guacd-status.vue';
 
   const props = defineProps<{
     item: TerminalSessionTabItem;
@@ -34,7 +35,7 @@
 
   const { preference, sessionManager } = useTerminalStore();
 
-  const toolbarDirection = ref('top');
+  const actionBarDirection = ref(ActionBarPosition.TOP);
 
   const viewport = ref();
   const session = ref<IRdpSession>();
@@ -42,7 +43,7 @@
   // 初始化会话
   onMounted(async () => {
     // 工具栏方向
-    toolbarDirection.value = preference.rdpActionBarSetting.position || 'top';
+    actionBarDirection.value = preference.rdpActionBarSetting.position || ActionBarPosition.TOP;
     // 创建终端会话
     session.value = sessionManager.createSession<IRdpSession>(props.item);
     // 打开终端会话
@@ -60,53 +61,5 @@
 
 </script>
 
-<style scoped lang="less">
-  .rdp-container {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
-
-  .rdp-viewport {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    :deep(> div) {
-      position: relative;
-      z-index: 8;
-    }
-  }
-
-  .rdp-status-mask {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    backdrop-filter: blur(10px);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 9999;
-  }
-
-  .rdp-action-bar {
-    position: absolute;
-    cursor: pointer;
-    z-index: 9998;
-
-    &.top {
-      top: 4px;
-      left: 50%;
-      transform: translateX(-50%);
-    }
-
-    &.right {
-      right: 4px;
-      top: 50%;
-      transform: translateY(-50%);
-    }
-  }
-
+<style lang="less" scoped>
 </style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-view.vue b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-view.vue
index 6d4f51c5..05c5c067 100644
--- a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-view.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-view.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sftp-container">
+  <div>
     <a-split class="split-view"
              v-model:size="splitSize"
              :min="0.3"
@@ -69,7 +69,7 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ISftpSession, SftpFile, TerminalSessionTabItem } from '@/views/terminal/interfaces';
+  import type { ISftpSession, ISftpSessionHandler, SftpFile, TerminalSessionTabItem } from '@/views/terminal/interfaces';
   import { onMounted, onUnmounted, ref } from 'vue';
   import { useTerminalStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
@@ -297,8 +297,7 @@
     }
     // 创建终端会话
     session.value = sessionManager.createSession<ISftpSession>(props.item);
-    // 打开终端会话
-    await sessionManager.openSftp(props.item, {
+    const handler: ISftpSessionHandler = {
       setLoading: setTableLoading,
       connectCallback,
       onClose,
@@ -311,7 +310,8 @@
       resolveDownloadFlatDirectory,
       resolveSftpGetContent,
       resolveSftpSetContent,
-    });
+    };
+    await sessionManager.openSftp(props.item, handler);
   });
 
   // 关闭会话
@@ -326,15 +326,9 @@
 <style lang="less" scoped>
   @sftp-table-header-height: 32px + 8px;
 
-  .sftp-container {
+  .split-view {
     width: 100%;
     height: 100%;
-    position: relative;
-
-    .split-view {
-      width: 100%;
-      height: 100%;
-    }
   }
 
   .sftp-table-container, .sftp-editor-container {
diff --git a/orion-visor-ui/src/views/terminal/components/view/ssh/ssh-view.vue b/orion-visor-ui/src/views/terminal/components/view/ssh/ssh-view.vue
index 56640616..a565f6ed 100644
--- a/orion-visor-ui/src/views/terminal/components/view/ssh/ssh-view.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/ssh/ssh-view.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ssh-container">
+  <div>
     <!-- 头部 -->
     <ssh-header :session="session" @handle="doTerminalHandle" />
     <!-- 终端右键菜单 -->
@@ -94,12 +94,6 @@
 <style lang="less" scoped>
   @ssh-header-height: 36px;
 
-  .ssh-container {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
-
   .ssh-wrapper {
     width: 100%;
     height: calc(100% - @ssh-header-height);
diff --git a/orion-visor-ui/src/views/terminal/interfaces/handler.ts b/orion-visor-ui/src/views/terminal/interfaces/handler.ts
index a211d30b..428ba0e0 100644
--- a/orion-visor-ui/src/views/terminal/interfaces/handler.ts
+++ b/orion-visor-ui/src/views/terminal/interfaces/handler.ts
@@ -79,8 +79,8 @@ export interface ISftpSessionHandler {
   resolveSftpSetContent: (result: string, msg: string, token: string) => void;
 }
 
-// rdp 会话视图处理器定义
-export interface IRdpSessionDisplayHandler {
+// guacd 会话视图处理器定义
+export interface IGuacdSessionDisplayHandler {
   displayWidth: number;
   displayHeight: number;
   displayDpi: number;
@@ -101,8 +101,8 @@ export interface IRdpSessionDisplayHandler {
   setDisplaySize: (width: number, height: number) => void;
 }
 
-// rdp 会话剪切板处理器定义
-export interface IRdpSessionClipboardHandler {
+// guacd 会话剪切板处理器定义
+export interface IGuacdSessionClipboardHandler {
   // 发送数据到远程剪切板
   sendDataToRemoteClipboard: (data: string | File | Blob) => void;
   // 接收远程剪切板数据
diff --git a/orion-visor-ui/src/views/terminal/interfaces/session.ts b/orion-visor-ui/src/views/terminal/interfaces/session.ts
index ee84b1a2..0a3fefb2 100644
--- a/orion-visor-ui/src/views/terminal/interfaces/session.ts
+++ b/orion-visor-ui/src/views/terminal/interfaces/session.ts
@@ -3,8 +3,8 @@ import type { Terminal } from '@xterm/xterm';
 import type { ISearchOptions } from '@xterm/addon-search';
 import type Guacamole from 'guacamole-common-js';
 import type {
-  IRdpSessionClipboardHandler,
-  IRdpSessionDisplayHandler,
+  IGuacdSessionClipboardHandler,
+  IGuacdSessionDisplayHandler,
   ISftpSessionHandler,
   ISshSessionHandler,
   TerminalSessionTabItem
@@ -108,6 +108,9 @@ export interface ITerminalSession<State extends ReactiveSessionState = ReactiveS
   setConnected: () => void;
   // 设置已关闭
   setClosed: () => void;
+
+  // 是否可写
+  isWriteable: () => boolean;
 }
 
 // SSH 会话定义
@@ -160,29 +163,32 @@ export interface ISftpSession extends ITerminalSession {
 export interface IGuacdSession extends ITerminalSession<GuacdReactiveSessionStatus>, IDomViewportHandler {
   // guacd 客户端
   client: Guacamole.Client;
-  // FIXME VNC 可以再抽象
+  // 会话配置
+  config: GuacdInitConfig;
+  // 视图处理器
+  displayHandler: IGuacdSessionDisplayHandler;
+  // 剪切板处理器
+  clipboardHandler: IGuacdSessionClipboardHandler;
+
+  // 初始化
+  init: (config: GuacdInitConfig) => Promise<void>;
+
+  // 发送键
+  sendKeys: (keys: Array<number>) => void;
+  // 粘贴
+  paste: (data: string) => void;
 }
 
 // RDP 会话定义
 export interface IRdpSession extends IGuacdSession {
   fileSystemName: string;
-  // 会话配置
-  config: GuacdInitConfig;
-  // 视图处理器
-  displayHandler: IRdpSessionDisplayHandler;
-  // 剪切板处理器
-  clipboardHandler: IRdpSessionClipboardHandler;
 
-  // 初始化
-  init: (config: GuacdInitConfig) => Promise<void>;
   // 文件系统事件
   onFileSystemEvent: (event: Record<string, any>) => void;
-  // 发送键
-  sendKeys: (keys: Array<number>) => void;
-  // 粘贴
-  paste: (data: string) => void;
-  // 是否可写
-  isWriteable: () => boolean;
+}
+
+// VNC 会话定义
+export interface IVncSession extends IGuacdSession {
 }
 
 // sftp 文件
@@ -210,6 +216,8 @@ export interface ITerminalSessionManager {
   openSftp: (item: TerminalSessionTabItem, handler: ISftpSessionHandler) => Promise<void>;
   // 打开 rdp 会话
   openRdp: (item: TerminalSessionTabItem, config: GuacdInitConfig) => Promise<void>;
+  // 打开 vnc 会话
+  openVnc: (item: TerminalSessionTabItem, config: GuacdInitConfig) => Promise<void>;
   // 重新打开会话
   reOpenSession: (sessionKey: string) => Promise<void>;
   // 创建终端会话
diff --git a/orion-visor-ui/src/views/terminal/service/session/base-session.ts b/orion-visor-ui/src/views/terminal/service/session/base-session.ts
index 9dd68d49..2d77d7e8 100644
--- a/orion-visor-ui/src/views/terminal/service/session/base-session.ts
+++ b/orion-visor-ui/src/views/terminal/service/session/base-session.ts
@@ -1,6 +1,6 @@
 import type { Reactive } from 'vue';
 import { reactive } from 'vue';
-import type { ITerminalChannel, ITerminalSession, ReactiveSessionState, SessionHostInfo, TerminalSessionTabItem } from '@/views/terminal/interfaces';
+import type { ITerminalChannel, ITerminalSession, ReactiveSessionState, TerminalSessionTabItem, SessionHostInfo } from '@/views/terminal/interfaces';
 import { TerminalStatus } from '@/views/terminal/types/const';
 
 // 会话基类
@@ -86,4 +86,9 @@ export default abstract class BaseSession<State extends ReactiveSessionState, Ch
     this.state.connectStatus = TerminalStatus.CLOSED;
   }
 
+  // 是否可写
+  isWriteable(): boolean {
+    return this.state.connected && this.state.canWrite;
+  }
+
 }
diff --git a/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts b/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts
new file mode 100644
index 00000000..731dd0e1
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts
@@ -0,0 +1,84 @@
+import { ref } from 'vue';
+import type { IGuacdSession } from '../interfaces';
+import { fitDisplayValue } from './const';
+import { getDisplaySize } from './utils';
+
+// guacd 工具栏配置
+export interface UseGuacdActionBarOptions {
+  session: IGuacdSession;
+  setVisible: (visible: boolean) => void;
+}
+
+// 使用主机配置表单
+export default function useGuacdActionBar(options: UseGuacdActionBarOptions) {
+  const { session, setVisible } = options;
+
+  const displaySize = ref(fitDisplayValue);
+  const clipboardData = ref('');
+
+  // 临时自适应
+  const fitOnce = () => {
+    session.displayHandler?.fit(true);
+    setVisible(false);
+  };
+
+  // 设置显示大小
+  const setDisplaySize = () => {
+    const displayHandler = session.displayHandler;
+    if (!displayHandler) {
+      return;
+    }
+    if (displaySize.value === fitDisplayValue) {
+      // 设置自适应
+      displayHandler.autoFit = true;
+      displayHandler.fit(true);
+    } else {
+      try {
+        // 获取大小
+        const [width, height] = getDisplaySize(displaySize.value, true);
+        // 取消自适应
+        displayHandler.autoFit = false;
+        // 设置大小
+        displayHandler.resize(width, height);
+      } catch (e) {
+        return;
+      }
+    }
+    setVisible(false);
+  };
+
+  // 触发组合键
+  const triggerCombinationKey = (keys: Array<number>) => {
+    session.sendKeys(keys);
+    setVisible(false);
+  };
+
+  // 发送剪切板数据
+  const sendClipboardData = () => {
+    // 粘贴
+    session.paste(clipboardData.value);
+    setVisible(false);
+  };
+
+  // 清空剪切板数据
+  const clearClipboardData = () => {
+    clipboardData.value = '';
+  };
+
+  // 关闭会话
+  const disconnect = () => {
+    session.disconnect();
+    setVisible(false);
+  };
+
+  return {
+    displaySize,
+    clipboardData,
+    fitOnce,
+    setDisplaySize,
+    triggerCombinationKey,
+    sendClipboardData,
+    clearClipboardData,
+    disconnect,
+  };
+}

From f34dc75f41ec2a1389caad055a69ca8dc316b956 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 7 Jul 2025 14:48:34 +0800
Subject: [PATCH 19/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=20vnc=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/layout/terminal-panel.vue      | 113 ++++++----
 .../components/view/vnc/vnc-action-bar.vue    | 208 ++++++++++++++++++
 .../terminal/components/view/vnc/vnc-view.vue |  64 ++++++
 .../service/channel/base-guacd-channel.ts     |   5 +-
 .../terminal/service/channel/rdp-channel.ts   |   4 +-
 .../terminal/service/channel/vnc-channel.ts   |  34 +++
 ....ts => guacd-session-clipboard-handler.ts} |  10 +-
 ...er.ts => guacd-session-display-handler.ts} |  10 +-
 .../service/session/base-guacd-session.ts     | 194 ++++++++++++++++
 .../terminal/service/session/rdp-session.ts   | 205 +++--------------
 .../terminal/service/session/ssh-session.ts   |  20 +-
 .../session/terminal-session-manager.ts       |  23 +-
 .../terminal/service/session/vnc-session.ts   |  35 +++
 13 files changed, 677 insertions(+), 248 deletions(-)
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/vnc/vnc-view.vue
 create mode 100644 orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
 rename orion-visor-ui/src/views/terminal/service/handler/{rdp-session-clipboard-handler.ts => guacd-session-clipboard-handler.ts} (81%)
 rename orion-visor-ui/src/views/terminal/service/handler/{rdp-session-display-handler.ts => guacd-session-display-handler.ts} (94%)
 create mode 100644 orion-visor-ui/src/views/terminal/service/session/base-guacd-session.ts
 create mode 100644 orion-visor-ui/src/views/terminal/service/session/vnc-session.ts

diff --git a/orion-visor-ui/src/views/terminal/components/layout/terminal-panel.vue b/orion-visor-ui/src/views/terminal/components/layout/terminal-panel.vue
index 3e9f46cf..4dda783e 100644
--- a/orion-visor-ui/src/views/terminal/components/layout/terminal-panel.vue
+++ b/orion-visor-ui/src/views/terminal/components/layout/terminal-panel.vue
@@ -32,15 +32,25 @@
             <span class="tab-title-icon">
               <component :is="item.icon" />
             </span>
-            {{ item.title }}
+            <span>{{ item.title }}</span>
           </span>
         </template>
         <!-- ssh -->
-        <ssh-view v-if="item.type === TerminalSessionTypes.SSH.type" :item="item" />
+        <ssh-view v-if="item.type === TerminalSessionTypes.SSH.type"
+                  class="session-container"
+                  :item="item" />
         <!-- sftp -->
-        <sftp-view v-else-if="item.type === TerminalSessionTypes.SFTP.type" :item="item" />
+        <sftp-view v-else-if="item.type === TerminalSessionTypes.SFTP.type"
+                   class="session-container"
+                   :item="item" />
         <!-- rdp -->
-        <rdp-view v-else-if="item.type === TerminalSessionTypes.RDP.type" :item="item" />
+        <rdp-view v-else-if="item.type === TerminalSessionTypes.RDP.type"
+                  class="session-container"
+                  :item="item" />
+        <!-- vnc -->
+        <vnc-view v-else-if="item.type === TerminalSessionTypes.VNC.type"
+                  class="session-container"
+                  :item="item" />
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -60,6 +70,7 @@
   import SshView from '../view/ssh/ssh-view.vue';
   import SftpView from '../view/sftp/sftp-view.vue';
   import RdpView from '../view/rdp/rdp-view.vue';
+  import VncView from '../view/vnc/vnc-view.vue';
 
   const props = defineProps<{
     index: number;
@@ -118,56 +129,62 @@
   .terminal-panel-container {
     width: 100%;
     height: 100%;
-  }
 
-  .tab-title-wrapper {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    padding: 11px 18px 9px 14px;
-    background: var(--bg);
-    position: relative;
-    transition: all .3s;
-
-    .tab-title-icon {
-      font-size: 16px;
-      margin-right: 6px;
-    }
-
-    &:hover {
-      filter: brightness(1.04);
-    }
-
-    &::after {
-      content: '';
-      width: calc(100% - 3px);
-      height: 2px;
-      background: var(--color);
-      position: absolute;
-      left: 1px;
-      bottom: -1px;
-    }
-  }
-
-  .panel-extra {
-    margin-right: 8px;
-
-    .extra-icon {
-      color: var(--color-panel-text-1);
-      transition: 0.2s;
-      font-size: 16px;
-      cursor: pointer;
-      width: 24px;
-      height: 24px;
+    .tab-title-wrapper {
+      width: 100%;
+      height: 100%;
       display: flex;
       align-items: center;
-      justify-content: center;
-      border-radius: 50%;
+      padding: 4px 18px 4px 14px;
+      background: var(--bg);
+      position: relative;
+      transition: all .3s;
+
+      .tab-title-icon {
+        font-size: 16px;
+        margin-right: 6px;
+      }
 
       &:hover {
-        background: var(--color-bg-panel-icon-1);
+        filter: brightness(1.04);
       }
+
+      &::after {
+        content: '';
+        width: calc(100% - 3px);
+        height: 2px;
+        background: var(--color);
+        position: absolute;
+        left: 1px;
+        bottom: -1px;
+      }
+    }
+
+    .panel-extra {
+      margin-right: 8px;
+
+      .extra-icon {
+        color: var(--color-panel-text-1);
+        transition: 0.2s;
+        font-size: 16px;
+        cursor: pointer;
+        width: 24px;
+        height: 24px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 50%;
+
+        &:hover {
+          background: var(--color-bg-panel-icon-1);
+        }
+      }
+    }
+
+    .session-container {
+      width: 100%;
+      height: 100%;
+      position: relative;
     }
   }
 
diff --git a/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
new file mode 100644
index 00000000..90992586
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
@@ -0,0 +1,208 @@
+<template>
+  <div v-if="session.state.connectStatus === TerminalStatus.CONNECTED">
+    <!-- 工具栏 -->
+    <a-popover v-model:popup-visible="visible"
+               :title="undefined"
+               trigger="click"
+               :content-class="['guacd-action-bar-popover', direction]"
+               :content-style="{ '--action-count': Math.max(actions.length, direction === ActionBarPosition.RIGHT ? 5 : 6) }"
+               :position="direction === ActionBarPosition.RIGHT ? 'left' : 'bottom'"
+               :show-arrow="false"
+               :auto-fix-position="false">
+      <!-- 触发器 -->
+      <div class="action-bar-trigger" :class="[direction === ActionBarPosition.RIGHT ? 'right' : 'top']" />
+      <!-- 工具内容 -->
+      <template #content>
+        <!-- 按钮 -->
+        <a-space class="action-bar-actions"
+                 :direction="direction === ActionBarPosition.RIGHT ? 'vertical' : 'horizontal'"
+                 :size="16">
+          <div v-for="action in actions" :key="action.item">
+            <a-tooltip :mini="true"
+                       :auto-fix-position="false"
+                       :position="direction === ActionBarPosition.RIGHT ? 'left' : 'bottom'"
+                       content-class="terminal-tooltip-content"
+                       :show-arrow="false"
+                       :content="action.content">
+              <a-button class="action-bar-button"
+                        :disabled="action.disabled"
+                        :type="action.active ? 'primary' : 'secondary'"
+                        @click="toggleClickAction(action.item)">
+                <template #icon>
+                  <component :is="action.icon" />
+                </template>
+              </a-button>
+            </a-tooltip>
+          </div>
+        </a-space>
+        <!-- 显示设置 -->
+        <div v-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
+          <!-- 分辨率 -->
+          <a-space>
+            <span class="display-size-label">分辨率</span>
+            <a-select v-model="displaySize"
+                      class="display-size-input"
+                      placeholder="请选择分辨率"
+                      :options="toOptions(screenResolutionKey)"
+                      allow-create />
+          </a-space>
+          <!-- 按钮 -->
+          <a-space class="action-bar-content-footer">
+            <a-button type="primary"
+                      size="small"
+                      @click="fitOnce">
+              临时自适应
+            </a-button>
+            <a-button type="primary"
+                      size="small"
+                      @click="setDisplaySize">
+              设置
+            </a-button>
+          </a-space>
+        </div>
+        <!-- 组合键 -->
+        <div v-else-if="current === GuacdActionItemKeys.COMBINATION_KEY" class="action-bar-content">
+          <a-row :gutter="[12, 12]" wrap>
+            <a-col v-for="item in GuacdCombinationKeyItems"
+                   :key="item.name"
+                   :span="12"
+                   class="combination-key-item"
+                   @click="triggerCombinationKey(item.keys)">
+              <span>{{ item.name }}</span>
+            </a-col>
+          </a-row>
+        </div>
+        <!-- 剪切板 -->
+        <div v-else-if="current === GuacdActionItemKeys.CLIPBOARD" class="action-bar-content">
+          <a-textarea class="action-bar-clipboard"
+                      v-model="clipboardData"
+                      :ref="setAutoFocus"
+                      placeholder="远程剪切板"
+                      allow-clear />
+          <!-- 按钮 -->
+          <a-space class="action-bar-content-footer">
+            <a-button size="small" @click="clearClipboardData">
+              清空
+            </a-button>
+            <a-button type="primary"
+                      size="small"
+                      :disabled="!clipboardData"
+                      @click="sendClipboardData">
+              发送
+            </a-button>
+          </a-space>
+        </div>
+      </template>
+    </a-popover>
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'vncActionBar'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IVncSession } from '@/views/terminal/interfaces';
+  import {
+    TerminalStatus,
+    GuacdCombinationKeyItems,
+    GuacdActionItemKeys,
+    VncActionBarItems,
+    screenResolutionKey,
+    fitDisplayValue, ActionBarPosition,
+  } from '@/views/terminal/types/const';
+  import { computed, ref, watch, onMounted } from 'vue';
+  import { setAutoFocus } from '@/utils/dom';
+  import { readText } from '@/hooks/copy';
+  import { useTerminalStore, useDictStore } from '@/store';
+  import useGuacdActionBar from '@/views/terminal/types/use-guacd-action-bar';
+  import useVisible from '@/hooks/visible';
+
+  const props = defineProps<{
+    session: IVncSession;
+    direction: string;
+  }>();
+
+  const { preference } = useTerminalStore();
+  const { toOptions, getDictValue } = useDictStore();
+  const { visible, setVisible } = useVisible();
+
+  const {
+    displaySize,
+    clipboardData,
+    fitOnce,
+    setDisplaySize,
+    triggerCombinationKey,
+    sendClipboardData,
+    clearClipboardData,
+    disconnect,
+  } = useGuacdActionBar({
+    session: props.session,
+    setVisible,
+  });
+
+  const current = ref('');
+
+  const actions = computed(() => {
+    return VncActionBarItems.filter(item => {
+      return preference.vncActionBarSetting[item.item] !== false;
+    }).map(item => {
+      const key = item.item;
+      return {
+        ...item,
+        active: current.value === key,
+        disabled: (key === GuacdActionItemKeys.DISPLAY || GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.CLOSE) ? false : !props.session.isWriteable(),
+      };
+    });
+  });
+
+  // 修改数据值
+  watch(() => visible.value, (val) => {
+    if (!val) {
+      return;
+    }
+    // 重新触发点击
+    toggleClickAction(current.value);
+  });
+
+  // 触发 action
+  const toggleClickAction = (key: string) => {
+    if (key === GuacdActionItemKeys.DISPLAY) {
+      // 显示设置
+      current.value = GuacdActionItemKeys.DISPLAY;
+      if (props.session.displayHandler?.autoFit) {
+        displaySize.value = fitDisplayValue;
+      } else {
+        displaySize.value = `${props.session.displayHandler?.displayWidth || 0}x${props.session.displayHandler?.displayHeight || 0}`;
+      }
+    } else if (key === GuacdActionItemKeys.COMBINATION_KEY) {
+      // 组合键
+      current.value = GuacdActionItemKeys.COMBINATION_KEY;
+    } else if (key === GuacdActionItemKeys.CLIPBOARD) {
+      // 剪切板
+      current.value = GuacdActionItemKeys.CLIPBOARD;
+      readText(false)
+        .then(s => clipboardData.value = s)
+        .catch(() => clipboardData.value = '');
+    } else if (key === GuacdActionItemKeys.DISCONNECT) {
+      // 断开连接
+      disconnect();
+    } else if (key === GuacdActionItemKeys.CLOSE) {
+      // 关闭工具栏
+      setVisible(false);
+    }
+  };
+
+  // 设置选中
+  onMounted(() => {
+    if (actions.value?.length) {
+      current.value = actions.value[0].item;
+    }
+  });
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-view.vue b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-view.vue
new file mode 100644
index 00000000..ab30ac32
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-view.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="guacd-container">
+    <!-- 状态 -->
+    <guacd-status v-if="session"
+                  class="guacd-status-mask"
+                  :session="session" />
+    <!-- 工具栏 -->
+    <vnc-action-bar v-if="session"
+                    class="guacd-action-bar"
+                    :class="[actionBarDirection === 'right' ? 'right' : 'top']"
+                    :session="session"
+                    :direction="actionBarDirection" />
+    <!-- 视口 -->
+    <div class="guacd-viewport" ref="viewport" />
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'vnc-view'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { TerminalSessionTabItem, IVncSession } from '@/views/terminal/interfaces';
+  import { onMounted, ref, onUnmounted } from 'vue';
+  import { useTerminalStore } from '@/store';
+  import { ActionBarPosition } from '@/views/terminal/types/const';
+  import GuacdStatus from '../guacd/guacd-status.vue';
+  import VncActionBar from './vnc-action-bar.vue';
+
+  const props = defineProps<{
+    item: TerminalSessionTabItem;
+  }>();
+
+  const { preference, sessionManager } = useTerminalStore();
+
+  const actionBarDirection = ref(ActionBarPosition.TOP);
+
+  const viewport = ref();
+  const session = ref<IVncSession>();
+
+  // 初始化会话
+  onMounted(async () => {
+    // 工具栏方向
+    actionBarDirection.value = preference.vncActionBarSetting.position || ActionBarPosition.TOP;
+    // 创建终端会话
+    session.value = sessionManager.createSession<IVncSession>(props.item);
+    // 打开终端会话
+    await sessionManager.openVnc(props.item, {
+      viewport: viewport.value,
+    });
+  });
+
+  // 关闭会话
+  onUnmounted(() => {
+    if (props.item.key) {
+      sessionManager.closeSession(props.item.key);
+    }
+  });
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/service/channel/base-guacd-channel.ts b/orion-visor-ui/src/views/terminal/service/channel/base-guacd-channel.ts
index 06b73c50..6510fe72 100644
--- a/orion-visor-ui/src/views/terminal/service/channel/base-guacd-channel.ts
+++ b/orion-visor-ui/src/views/terminal/service/channel/base-guacd-channel.ts
@@ -1,4 +1,4 @@
-import type { GuacdReactiveSessionStatus, IGuacdChannel, ITerminalSession } from '@/views/terminal/interfaces';
+import type { ITerminalSession, IGuacdChannel, GuacdReactiveSessionStatus } from '@/views/terminal/interfaces';
 import type { OutputPayload } from '../../types/protocol';
 import { InputProtocol, OutputProtocol } from '../../types/protocol';
 import { TerminalCloseCode, TerminalMessages } from '@/views/terminal/types/const';
@@ -147,7 +147,8 @@ export default abstract class BaseGuacdChannel<T extends ITerminalSession<GuacdR
     if (Date.now() < this.lastSentTime + PING_FREQUENCY) {
       return;
     }
-    this.sendInstruction(Guacamole.Tunnel.INTERNAL_DATA_OPCODE, 'ping', Date.now());
+    // this.sendInstruction(Guacamole.Tunnel.INTERNAL_DATA_OPCODE, 'ping', Date.now());
+    this.send(InputProtocol.PING);
   }
 
   // 发送指令 guacd 内部调用
diff --git a/orion-visor-ui/src/views/terminal/service/channel/rdp-channel.ts b/orion-visor-ui/src/views/terminal/service/channel/rdp-channel.ts
index 18cb80f5..abc25a8d 100644
--- a/orion-visor-ui/src/views/terminal/service/channel/rdp-channel.ts
+++ b/orion-visor-ui/src/views/terminal/service/channel/rdp-channel.ts
@@ -5,7 +5,7 @@ import { TerminalSessionTypes } from '@/views/terminal/types/const';
 import { getTerminalAccessToken, openTerminalAccessChannel } from '@/api/terminal/terminal';
 import BaseGuacdChannel from './base-guacd-channel';
 
-// 终端通信会话 Rdp 会话实现
+// 终端通信会话 RDP 会话实现
 export default class RdpChannel extends BaseGuacdChannel<IRdpSession> {
 
   // 打开 channel
@@ -20,7 +20,7 @@ export default class RdpChannel extends BaseGuacdChannel<IRdpSession> {
         enableAudioInput: sessionSetting.enableAudioInput,
         enableAudioOutput: sessionSetting.enableAudioOutput,
         driveMountMode: sessionSetting.driveMountMode,
-        colorDepth: graphSetting.colorDepth || 16,
+        colorDepth: graphSetting.colorDepth || 24,
         forceLossless: graphSetting.forceLossless,
         enableWallpaper: graphSetting.enableWallpaper,
         enableTheming: graphSetting.enableTheming,
diff --git a/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts b/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
new file mode 100644
index 00000000..2216786e
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
@@ -0,0 +1,34 @@
+import type { IVncSession } from '@/views/terminal/interfaces';
+import type { OutputPayload } from '@/views/terminal/types/protocol';
+import { useTerminalStore } from '@/store';
+import { TerminalSessionTypes } from '@/views/terminal/types/const';
+import { getTerminalAccessToken, openTerminalAccessChannel } from '@/api/terminal/terminal';
+import BaseGuacdChannel from './base-guacd-channel';
+
+// 终端通信会话 VNC 会话实现
+export default class VncChannel extends BaseGuacdChannel<IVncSession> {
+
+  // 打开 channel
+  protected async openChannel(): Promise<void> {
+    const setting = useTerminalStore().preference.vncGraphSetting;
+    const { data } = await getTerminalAccessToken({
+      hostId: this.session.info.hostId,
+      connectType: TerminalSessionTypes.VNC.type,
+      extra: {
+        colorDepth: setting.colorDepth || 24,
+        forceLossless: setting.forceLossless,
+        swapRedBlue: setting.swapRedBlue,
+        cursor: setting.cursor,
+        compressLevel: setting.compressLevel,
+        qualityLevel: setting.qualityLevel,
+      }
+    });
+    // 打开 channel
+    this.client = await openTerminalAccessChannel(TerminalSessionTypes.VNC.channel, data);
+  }
+
+  // 处理修改大小
+  processResize({ width, height }: OutputPayload): void {
+  }
+
+}
diff --git a/orion-visor-ui/src/views/terminal/service/handler/rdp-session-clipboard-handler.ts b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-clipboard-handler.ts
similarity index 81%
rename from orion-visor-ui/src/views/terminal/service/handler/rdp-session-clipboard-handler.ts
rename to orion-visor-ui/src/views/terminal/service/handler/guacd-session-clipboard-handler.ts
index 1e73a5fb..8bd66b4c 100644
--- a/orion-visor-ui/src/views/terminal/service/handler/rdp-session-clipboard-handler.ts
+++ b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-clipboard-handler.ts
@@ -1,14 +1,14 @@
-import type { IRdpSession, IRdpSessionClipboardHandler } from '@/views/terminal/interfaces';
+import type { IGuacdSession, IGuacdSessionClipboardHandler } from '@/views/terminal/interfaces';
 import Guacamole from 'guacamole-common-js';
 import { copyToClipboard } from '@/hooks/copy';
 import { isString } from '@/utils/is';
 
-// rdp 会话剪切板处理器实现
-export default class RdpSessionClipboardHandler implements IRdpSessionClipboardHandler {
+// guacd 会话剪切板处理器实现
+export default class GuacdSessionClipboardHandler implements IGuacdSessionClipboardHandler {
 
-  private readonly session: IRdpSession;
+  private readonly session: IGuacdSession;
 
-  constructor(session: IRdpSession) {
+  constructor(session: IGuacdSession) {
     this.session = session;
   }
 
diff --git a/orion-visor-ui/src/views/terminal/service/handler/rdp-session-display-handler.ts b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
similarity index 94%
rename from orion-visor-ui/src/views/terminal/service/handler/rdp-session-display-handler.ts
rename to orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
index 59a3b886..bcdefb81 100644
--- a/orion-visor-ui/src/views/terminal/service/handler/rdp-session-display-handler.ts
+++ b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
@@ -1,11 +1,11 @@
-import type { IRdpSession, IRdpSessionDisplayHandler } from '@/views/terminal/interfaces';
+import type { IGuacdSession, IGuacdSessionDisplayHandler } from '@/views/terminal/interfaces';
 import { useDebounceFn } from '@vueuse/core';
 import Guacamole from 'guacamole-common-js';
 
-// rdp 会话视图处理器实现
-export default class RdpSessionDisplayHandler implements IRdpSessionDisplayHandler {
+// guacd 会话视图处理器实现
+export default class GuacdSessionDisplayHandler implements IGuacdSessionDisplayHandler {
 
-  private readonly session: IRdpSession;
+  private readonly session: IGuacdSession;
 
   public displayWidth: number;
   public displayHeight: number;
@@ -21,7 +21,7 @@ export default class RdpSessionDisplayHandler implements IRdpSessionDisplayHandl
 
   private readonly focusSink: () => void;
 
-  constructor(session: IRdpSession) {
+  constructor(session: IGuacdSession) {
     this.session = session;
     this.displayWidth = 0;
     this.displayHeight = 0;
diff --git a/orion-visor-ui/src/views/terminal/service/session/base-guacd-session.ts b/orion-visor-ui/src/views/terminal/service/session/base-guacd-session.ts
new file mode 100644
index 00000000..67214e3f
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/service/session/base-guacd-session.ts
@@ -0,0 +1,194 @@
+import type {
+  GuacdInitConfig,
+  GuacdReactiveSessionStatus,
+  IGuacdChannel,
+  IGuacdSession,
+  IGuacdSessionClipboardHandler,
+  IGuacdSessionDisplayHandler,
+  TerminalSessionTabItem
+} from '@/views/terminal/interfaces';
+import type { OutputPayload } from '@/views/terminal/types/protocol';
+import { InputProtocol } from '@/views/terminal/types/protocol';
+import { TerminalCloseCode, TerminalMessages } from '@/views/terminal/types/const';
+import { screenshot } from '@/views/terminal/types/utils';
+import Guacamole from 'guacamole-common-js';
+import BaseSession from './base-session';
+import GuacdSessionClipboardHandler from '../handler/guacd-session-clipboard-handler';
+
+export const CONNECT_TIMEOUT = 30000;
+
+// guacd 会话基类
+export default abstract class BaseGuacdSession extends BaseSession<GuacdReactiveSessionStatus, IGuacdChannel> implements IGuacdSession {
+
+  public config: GuacdInitConfig;
+
+  public client: Guacamole.Client;
+
+  public displayHandler: IGuacdSessionDisplayHandler;
+
+  public clipboardHandler: IGuacdSessionClipboardHandler;
+
+  protected connectTimeoutId?: number;
+
+  protected constructor(item: TerminalSessionTabItem) {
+    super(item, {
+      closeCode: 0,
+      closeMessage: ''
+    });
+    this.client = undefined as unknown as Guacamole.Client;
+    this.config = {} as unknown as GuacdInitConfig;
+    this.displayHandler = undefined as unknown as IGuacdSessionDisplayHandler;
+    this.clipboardHandler = undefined as unknown as IGuacdSessionClipboardHandler;
+  }
+
+  // 初始化
+  async init(config: GuacdInitConfig) {
+    this.config = config;
+    // 初始化
+    await this.reInit();
+  }
+
+  // 初始化 channel
+  async reInit(): Promise<void> {
+    // 初始化 channel
+    this.channel = this.createChannel();
+    // 创建 client
+    this.client = new Guacamole.Client(this.channel);
+    // 初始化 display
+    this.displayHandler = this.createDisplay();
+    // 初始化剪切板
+    this.clipboardHandler = this.createClipboard();
+    // 初始化 display
+    this.displayHandler.init();
+    // 初始化 channel
+    await this.channel.init();
+    // 注册 client 事件
+    this.registerClientEvent();
+  }
+
+  // 创建 channel
+  protected abstract createChannel(): IGuacdChannel;
+
+  // 创建 display
+  protected abstract createDisplay(): IGuacdSessionDisplayHandler;
+
+  // 创建 clipboard
+  protected createClipboard() {
+    // 创建 clipboard handler
+    return new GuacdSessionClipboardHandler(this);
+  }
+
+  // 注册 client 事件
+  protected registerClientEvent() {
+    // 错误回调
+    this.client.onerror = (state) => {
+      // 错误回调触发关闭
+      this.channel.closeTunnel(state.code, state.message || TerminalMessages.sessionClosed);
+    };
+    // 状态回调
+    this.client.onstatechange = (state) => {
+      if (state === Guacamole.Client.State.CONNECTED) {
+        // 触发连接成功回调
+        this.onConnected();
+      }
+    };
+    // 剪切板回调
+    this.client.onclipboard = this.clipboardHandler.receiveRemoteClipboardData.bind(this);
+  }
+
+  // 连接会话
+  connect(): void {
+    // 清空超时检查任务
+    window.clearTimeout(this.connectTimeoutId);
+    // 设置连接中
+    super.setConnecting();
+    // 连接 client 其实就是打开 channel 和 display
+    this.client.connect();
+    // 发送 connect 命令
+    this.channel.send(InputProtocol.CONNECT, {
+      body: JSON.stringify({
+        width: this.displayHandler?.displayWidth,
+        height: this.displayHandler?.displayHeight,
+        dpi: this.displayHandler?.displayDpi,
+      })
+    });
+    // 定时检查是否连接成功
+    this.connectTimeoutId = window.setTimeout(() => {
+      // 未连接上证明连接超时
+      if (!this.state.connected) {
+        this.channel.closeTunnel(TerminalCloseCode.CONNECT_TIMEOUT, TerminalMessages.connectTimeout);
+      }
+    }, CONNECT_TIMEOUT);
+  }
+
+  // 连接成功回调
+  protected onConnected() {
+    // 手动触发管道已连接
+    this.channel.processConnected({} as unknown as OutputPayload);
+  }
+
+  // 发送键
+  sendKeys(keys: Array<number>): void {
+    if (!this.isWriteable()) {
+      return;
+    }
+    for (let i = 0; i < keys.length; i++) {
+      this.client.sendKeyEvent(1, keys[i]);
+    }
+    for (let i = 0; i < keys.length; i++) {
+      this.client.sendKeyEvent(0, keys[i]);
+    }
+  }
+
+  // 粘贴
+  paste(data: string): void {
+    if (!this.isWriteable()) {
+      return;
+    }
+    // 发送至远程剪切板
+    this.clipboardHandler?.sendDataToRemoteClipboard(data);
+    // 发送粘贴命令
+    setTimeout(() => {
+      this.sendKeys([65507, 118]);
+    }, 100);
+  }
+
+  // 聚焦
+  focus(): void {
+    this.displayHandler?.focus?.();
+  }
+
+  // 失焦
+  blur(): void {
+    this.displayHandler?.blur?.();
+  }
+
+  // 自适应
+  fit(): void {
+    this.displayHandler?.fit(false);
+  }
+
+  // 修改大小
+  resize(width: number, height: number): void {
+    if (!this.isWriteable()) {
+      return;
+    }
+    // 发送重置大小
+    this.channel.send(InputProtocol.RESIZE, { width, height, });
+  }
+
+  // 截屏
+  async screenshot() {
+    await screenshot(this.client?.getDisplay()?.getElement() as HTMLElement);
+  }
+
+  // 断开连接
+  disconnect(): void {
+    super.disconnect();
+    // 关闭 client
+    this.client?.disconnect();
+    // 关闭超时检查任务
+    clearTimeout(this.connectTimeoutId);
+  }
+
+}
diff --git a/orion-visor-ui/src/views/terminal/service/session/rdp-session.ts b/orion-visor-ui/src/views/terminal/service/session/rdp-session.ts
index 7a40e47b..49c34051 100644
--- a/orion-visor-ui/src/views/terminal/service/session/rdp-session.ts
+++ b/orion-visor-ui/src/views/terminal/service/session/rdp-session.ts
@@ -1,104 +1,49 @@
-import type {
-  IGuacdChannel,
-  IRdpSession,
-  TerminalSessionTabItem,
-  GuacdInitConfig,
-  IRdpSessionDisplayHandler,
-  GuacdReactiveSessionStatus,
-  IRdpSessionClipboardHandler
-} from '@/views/terminal/interfaces';
-import type { OutputPayload } from '@/views/terminal/types/protocol';
+import type { IGuacdChannel, IGuacdSessionDisplayHandler, IRdpSession, TerminalSessionTabItem } from '@/views/terminal/interfaces';
 import { InputProtocol } from '@/views/terminal/types/protocol';
-import { TerminalMessages, fitDisplayValue, TerminalCloseCode } from '@/views/terminal/types/const';
-import { screenshot } from '@/views/terminal/types/utils';
+import { fitDisplayValue } from '@/views/terminal/types/const';
 import { Message } from '@arco-design/web-vue';
 import { useTerminalStore } from '@/store';
 import Guacamole from 'guacamole-common-js';
-import BaseSession from './base-session';
 import RdpChannel from '../channel/rdp-channel';
-import RdpSessionDisplayHandler from '../handler/rdp-session-display-handler';
-import RdpSessionClipboardHandler from '../handler/rdp-session-clipboard-handler';
+import BaseGuacdSession from './base-guacd-session';
+import GuacdSessionDisplayHandler from '../handler/guacd-session-display-handler';
 
 export const AUDIO_INPUT_MIMETYPE = 'audio/L16;rate=44100,channels=2';
 
-export const CONNECT_TIMEOUT = 30000;
-
 // RDP 会话实现
-export default class RdpSession extends BaseSession<GuacdReactiveSessionStatus, IGuacdChannel> implements IRdpSession {
+export default class RdpSession extends BaseGuacdSession implements IRdpSession {
 
   public fileSystemName: string;
 
-  public config: GuacdInitConfig;
-
-  public client: Guacamole.Client;
-
-  public displayHandler: IRdpSessionDisplayHandler;
-
-  public clipboardHandler: IRdpSessionClipboardHandler;
-
-  private connectTimeoutId?: number;
-
   constructor(item: TerminalSessionTabItem) {
-    super(item, {
-      closeCode: 0,
-      closeMessage: ''
-    });
+    super(item);
     this.fileSystemName = 'Shared Driver';
-    this.client = undefined as unknown as Guacamole.Client;
-    this.config = {} as unknown as GuacdInitConfig;
-    this.displayHandler = undefined as unknown as IRdpSessionDisplayHandler;
-    this.clipboardHandler = undefined as unknown as IRdpSessionClipboardHandler;
   }
 
-  // 初始化
-  async init(config: GuacdInitConfig) {
-    this.config = config;
-    // 初始化
-    await this.reInit();
+  // 创建 channel
+  protected createChannel(): IGuacdChannel {
+    return new RdpChannel(this);
   }
 
-  // 初始化 channel
-  async reInit(): Promise<void> {
+  // 创建 display
+  protected createDisplay(): IGuacdSessionDisplayHandler {
     const rdpGraphSetting = useTerminalStore().preference.rdpGraphSetting;
-    // 创建 channel
-    this.channel = new RdpChannel(this);
-    // 创建 client
-    this.client = new Guacamole.Client(this.channel);
-    // 创建 display handler
-    this.displayHandler = new RdpSessionDisplayHandler(this);
-    // 创建 clipboard handler
-    this.clipboardHandler = new RdpSessionClipboardHandler(this);
-    // 设置 display autoFit
+    // 创建 display
+    const displayHandler = new GuacdSessionDisplayHandler(this);
+    // 设置自适应
     const autoFit = rdpGraphSetting?.displaySize === fitDisplayValue;
-    this.displayHandler.autoFit = autoFit;
+    displayHandler.autoFit = autoFit;
+    // 非自适应设置分辨率
     if (!autoFit) {
-      this.displayHandler.setDisplaySize(rdpGraphSetting?.displayWidth || 1024, rdpGraphSetting?.displayHeight || 768);
+      displayHandler.setDisplaySize(rdpGraphSetting?.displayWidth || 1024, rdpGraphSetting?.displayHeight || 768);
     }
-    // 初始化 display
-    this.displayHandler.init();
-    // 初始化 channel
-    await this.channel.init();
-    // 注册 client 事件
-    this.registerClientEvent();
+    return displayHandler;
   }
 
   // 注册 client 事件
-  private registerClientEvent() {
-    // 错误回调
-    this.client.onerror = (state) => {
-      // 错误回调触发关闭
-      this.channel.closeTunnel(state.code, state.message || TerminalMessages.sessionClosed);
-    };
-    // 状态回调
-    this.client.onstatechange = (state) => {
-      if (state === Guacamole.Client.State.CONNECTED) {
-        // 触发已连接
-        this.onConnected();
-      }
-    };
-    // 剪切板回调
-    this.client.onclipboard = this.clipboardHandler.receiveRemoteClipboardData.bind(this);
-    // 文件系统回调
+  protected registerClientEvent() {
+    super.registerClientEvent();
+    // 注册文件系统回调
     this.client.onfilesystem = (_, fileSystemName) => {
       if (fileSystemName) {
         this.fileSystemName = fileSystemName;
@@ -117,35 +62,9 @@ export default class RdpSession extends BaseSession<GuacdReactiveSessionStatus,
     };
   }
 
-  // 连接会话
-  connect(): void {
-    // 清空超时检查任务
-    window.clearTimeout(this.connectTimeoutId);
-    // 设置连接中
-    super.setConnecting();
-    // 连接 client 其实就是打开 channel 和 display
-    this.client.connect();
-    // 发送 connect 命令
-    this.channel.send(InputProtocol.CONNECT, {
-      body: JSON.stringify({
-        width: this.displayHandler?.displayWidth,
-        height: this.displayHandler?.displayHeight,
-        dpi: this.displayHandler?.displayDpi,
-      })
-    });
-    // 定时检查是否连接成功
-    this.connectTimeoutId = window.setTimeout(() => {
-      // 未连接上证明连接超时
-      if (!this.state.connected) {
-        this.channel.closeTunnel(TerminalCloseCode.CONNECT_TIMEOUT, TerminalMessages.rdpConnectTimeout);
-      }
-    }, CONNECT_TIMEOUT);
-  }
-
-  // 连接成功
-  private onConnected() {
-    // 手动触发管道已连接
-    this.channel.processConnected({} as unknown as OutputPayload);
+  // 连接成功回调
+  protected onConnected() {
+    super.onConnected();
     // 监听音频输入
     if (useTerminalStore().preference.rdpSessionSetting?.enableAudioInput) {
       const requestAudioStream = (client: Guacamole.Client) => {
@@ -173,81 +92,11 @@ export default class RdpSession extends BaseSession<GuacdReactiveSessionStatus,
     this.channel.send(InputProtocol.RDP_FILE_SYSTEM_EVENT, { event: JSON.stringify(event) });
   }
 
-  // 发送键
-  sendKeys(keys: Array<number>): void {
-    if (!this.isWriteable()) {
-      return;
-    }
-    for (let i = 0; i < keys.length; i++) {
-      this.client.sendKeyEvent(1, keys[i]);
-    }
-    for (let i = 0; i < keys.length; i++) {
-      this.client.sendKeyEvent(0, keys[i]);
-    }
-  }
-
-  // 粘贴
-  paste(data: string): void {
-    if (!this.isWriteable()) {
-      return;
-    }
-    // 发送至远程剪切板
-    this.clipboardHandler?.sendDataToRemoteClipboard(data);
-    // 发送粘贴命令
-    setTimeout(() => {
-      this.sendKeys([65507, 118]);
-    }, 100);
-  }
-
-  // 聚焦
-  focus(): void {
-    this.displayHandler?.focus?.();
-  }
-
-  // 失焦
-  blur(): void {
-    this.displayHandler?.blur?.();
-  }
-
-  // 自适应
-  fit(): void {
-    this.displayHandler?.fit(false);
-  }
-
-  // 修改大小
-  resize(width: number, height: number): void {
-    if (!this.isWriteable()) {
-      return;
-    }
-    // 发送重置大小
-    this.channel.send(InputProtocol.RESIZE, { width, height, });
-  }
-
-  // 截屏
-  async screenshot() {
-    await screenshot(this.client?.getDisplay()?.getElement() as HTMLElement);
-  }
-
-  // 是否可写
-  isWriteable(): boolean {
-    return this.state.connected && this.state.canWrite;
-  }
-
-  // 设置为已关闭
-  setClosed() {
-    // 设置为已关闭
-    super.setClosed();
+  // 断开连接
+  disconnect(): void {
+    super.disconnect();
     // 关闭文件传输
     useTerminalStore().transferManager.rdp.closeBySessionKey(this.sessionKey);
   }
 
-  // 断开连接
-  disconnect(): void {
-    super.disconnect();
-    // 关闭 client
-    this.client?.disconnect();
-    // 关闭超时检查任务
-    clearTimeout(this.connectTimeoutId);
-  }
-
 }
diff --git a/orion-visor-ui/src/views/terminal/service/session/ssh-session.ts b/orion-visor-ui/src/views/terminal/service/session/ssh-session.ts
index d3a57161..0632219c 100644
--- a/orion-visor-ui/src/views/terminal/service/session/ssh-session.ts
+++ b/orion-visor-ui/src/views/terminal/service/session/ssh-session.ts
@@ -7,7 +7,7 @@ import type { XtermAddons } from '@/types/xterm';
 import { defaultFontFamily } from '@/types/xterm';
 import { useTerminalStore } from '@/store';
 import { InputProtocol } from '@/views/terminal/types/protocol';
-import { TerminalShortcutType } from '@/views/terminal/types/const';
+import { BACKSPACE_CHAR, CTRL_H_CHAR, TerminalShortcutType } from '@/views/terminal/types/const';
 import { Terminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
 import { WebLinksAddon } from '@xterm/addon-web-links';
@@ -127,15 +127,20 @@ export default class SshSession extends BaseSession<ReactiveSessionState, ISshCh
 
   // 注册事件
   private registerEvent(dom: HTMLElement, preference: UnwrapRef<TerminalPreference>) {
+    // 是否替换退格符
+    const replaceBackspace = preference.sshInteractSetting.replaceBackspace;
     // 注册输入事件
-    this.inst.onData(s => {
-      if (!this.state.canWrite || !this.state.connected) {
+    this.inst.onData(command => {
+      // 不可写
+      if (!this.isWriteable()) {
         return;
       }
+      // 替换退格符
+      if (replaceBackspace) {
+        command = command.replace(BACKSPACE_CHAR, CTRL_H_CHAR);
+      }
       // 输入
-      this.channel.send(InputProtocol.SSH_INPUT, {
-        command: s
-      });
+      this.channel.send(InputProtocol.SSH_INPUT, { command });
     });
     // 启用响铃
     if (preference.sshInteractSetting.enableBell) {
@@ -165,7 +170,8 @@ export default class SshSession extends BaseSession<ReactiveSessionState, ISshCh
     addEventListen(dom, 'contextmenu', async () => {
       // 右键粘贴逻辑
       if (preference.sshInteractSetting.rightClickPaste) {
-        if (!this.state.canWrite || !this.state.connected) {
+        // 不可写
+        if (!this.isWriteable()) {
           return;
         }
         // 未开启右键选中 || 开启并无选中的内容则粘贴
diff --git a/orion-visor-ui/src/views/terminal/service/session/terminal-session-manager.ts b/orion-visor-ui/src/views/terminal/service/session/terminal-session-manager.ts
index 78fa1d38..86444757 100644
--- a/orion-visor-ui/src/views/terminal/service/session/terminal-session-manager.ts
+++ b/orion-visor-ui/src/views/terminal/service/session/terminal-session-manager.ts
@@ -7,6 +7,7 @@ import type {
   ISshSession,
   ITerminalSession,
   ITerminalSessionManager,
+  IVncSession,
   SshInitConfig,
   TerminalSessionTabItem
 } from '@/views/terminal/interfaces';
@@ -17,6 +18,7 @@ import { addEventListen, removeEventListen } from '@/utils/event';
 import SshSession from './ssh-session';
 import SftpSession from './sftp-session';
 import RdpSession from './rdp-session';
+import VncSession from './vnc-session';
 
 // 终端会话管理器实现
 export default class TerminalSessionManager implements ITerminalSessionManager {
@@ -80,7 +82,23 @@ export default class TerminalSessionManager implements ITerminalSessionManager {
       // 连接会话
       session.connect();
     } catch (ex) {
-      console.error(ex);
+      // 异常关闭
+      session.close();
+    }
+  }
+
+  // 打开 vnc 会话
+  async openVnc(item: TerminalSessionTabItem, config: GuacdInitConfig): Promise<void> {
+    // 获取会话
+    const session: IVncSession = this.getSession(item.key);
+    try {
+      // 初始化 session
+      await session.init(config);
+      // 等待前端渲染完成
+      await sleep(100);
+      // 连接会话
+      session.connect();
+    } catch (ex) {
       // 异常关闭
       session.close();
     }
@@ -110,6 +128,9 @@ export default class TerminalSessionManager implements ITerminalSessionManager {
     } else if (item.type === TerminalSessionTypes.RDP.type) {
       // RDP 会话
       session = new RdpSession(item);
+    } else if (item.type === TerminalSessionTypes.VNC.type) {
+      // VNC 会话
+      session = new VncSession(item);
     } else {
       return undefined as unknown as T;
     }
diff --git a/orion-visor-ui/src/views/terminal/service/session/vnc-session.ts b/orion-visor-ui/src/views/terminal/service/session/vnc-session.ts
new file mode 100644
index 00000000..83bda5a6
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/service/session/vnc-session.ts
@@ -0,0 +1,35 @@
+import type { IVncSession, TerminalSessionTabItem, IGuacdSessionDisplayHandler, IGuacdChannel } from '@/views/terminal/interfaces';
+import { fitDisplayValue } from '@/views/terminal/types/const';
+import { useTerminalStore } from '@/store';
+import BaseGuacdSession from './base-guacd-session';
+import VncChannel from '../channel/vnc-channel';
+import GuacdSessionDisplayHandler from '../handler/guacd-session-display-handler';
+
+// VNC 会话实现
+export default class VncSession extends BaseGuacdSession implements IVncSession {
+
+  constructor(item: TerminalSessionTabItem) {
+    super(item);
+  }
+
+  // 创建 channel
+  protected createChannel(): IGuacdChannel {
+    return new VncChannel(this);
+  };
+
+  // 创建 display
+  protected createDisplay(): IGuacdSessionDisplayHandler {
+    const vncGraphSetting = useTerminalStore().preference.vncGraphSetting;
+    // 创建 display
+    const displayHandler = new GuacdSessionDisplayHandler(this);
+    // 设置自适应
+    const autoFit = vncGraphSetting?.displaySize === fitDisplayValue;
+    displayHandler.autoFit = autoFit;
+    // 非自适应设置分辨率
+    if (!autoFit) {
+      displayHandler.setDisplaySize(vncGraphSetting?.displayWidth || 1024, vncGraphSetting?.displayHeight || 768);
+    }
+    return displayHandler;
+  };
+
+}

From dd0237a83a17cfdc902dea9f1cf338dde4dd28d3 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 8 Jul 2025 00:32:37 +0800
Subject: [PATCH 20/31] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/terminal/components/view/sftp/sftp-chmod-modal.vue  | 3 +--
 .../views/terminal/components/view/sftp/sftp-move-modal.vue   | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-chmod-modal.vue b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-chmod-modal.vue
index 584ba3f4..f07d1b4d 100644
--- a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-chmod-modal.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-chmod-modal.vue
@@ -71,8 +71,7 @@
   };
 
   // 打开新增
-  const open = (key: string, path: string, permission: number) => {
-    sessionKey.value = key;
+  const open = (path: string, permission: number) => {
     formModel.value.path = path;
     formModel.value.mod = permission;
     formModel.value.permission = permission10toString(permission);
diff --git a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-move-modal.vue b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-move-modal.vue
index 67784643..e1bed339 100644
--- a/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-move-modal.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/sftp/sftp-move-modal.vue
@@ -48,7 +48,6 @@
 
   const { visible, setVisible } = useVisible();
 
-  const sessionKey = ref();
   const targetRef = ref();
   const formRef = ref();
   const formModel = ref({
@@ -57,8 +56,7 @@
   });
 
   // 打开新增
-  const open = (key: string, path: string) => {
-    sessionKey.value = key;
+  const open = (path: string) => {
     formModel.value.path = path;
     formModel.value.target = path;
     setVisible(true);

From fc151216f131cc762828574a388e50b0ecb06571 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 8 Jul 2025 00:34:30 +0800
Subject: [PATCH 21/31] =?UTF-8?q?:hammer:=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-visor-ui/src/api/asset/host-extra.ts    |  1 +
 .../src/store/modules/terminal/index.ts       |  4 +-
 .../src/store/modules/terminal/types.ts       |  1 -
 .../display/terminal-rdp-action-bar-block.vue | 17 ++------
 .../display/terminal-ssh-action-bar-block.vue | 23 ++++-------
 .../display/terminal-ssh-display-block.vue    | 20 +++------
 .../display/terminal-ssh-right-menu-block.vue | 21 ++++------
 .../display/terminal-vnc-action-bar-block.vue | 17 ++------
 .../setting/extra/rdp-extra-form.vue          |  2 +-
 .../setting/extra/vnc-extra-form.vue          | 10 ++++-
 .../general/terminal-rdp-graph-block.vue      | 17 ++------
 .../general/terminal-rdp-session-block.vue    | 16 ++------
 .../general/terminal-ssh-interact-block.vue   | 16 ++------
 .../general/terminal-ssh-plugins-block.vue    | 16 +-------
 .../general/terminal-vnc-graph-block.vue      | 35 +++++-----------
 .../terminal/service/channel/vnc-channel.ts   |  1 -
 .../terminal/types/use-terminal-preference.ts | 41 +++++++++++++++++++
 17 files changed, 104 insertions(+), 154 deletions(-)
 create mode 100644 orion-visor-ui/src/views/terminal/types/use-terminal-preference.ts

diff --git a/orion-visor-ui/src/api/asset/host-extra.ts b/orion-visor-ui/src/api/asset/host-extra.ts
index 08ebbbca..62419d8d 100644
--- a/orion-visor-ui/src/api/asset/host-extra.ts
+++ b/orion-visor-ui/src/api/asset/host-extra.ts
@@ -37,6 +37,7 @@ export interface HostRdpExtraSettingModel {
 export interface HostVncExtraSettingModel {
   port: number;
   lowBandwidthMode: boolean;
+  swapRedBlue: boolean;
 }
 
 // 标签额外配置
diff --git a/orion-visor-ui/src/store/modules/terminal/index.ts b/orion-visor-ui/src/store/modules/terminal/index.ts
index 2d142b16..2722faa8 100644
--- a/orion-visor-ui/src/store/modules/terminal/index.ts
+++ b/orion-visor-ui/src/store/modules/terminal/index.ts
@@ -30,7 +30,7 @@ import { getPreference, updatePreference } from '@/api/user/preference';
 import { getLatestConnectHostId } from '@/api/terminal/terminal-connect-log';
 import { useCacheStore } from '@/store';
 import { nextId } from '@/utils';
-import { isObject } from '@/utils/is';
+import { isArray, isObject } from '@/utils/is';
 import { Message } from '@arco-design/web-vue';
 import { TerminalSessionTypes, TerminalTabs } from '@/views/terminal/types/const';
 import TerminalTabManager from '@/views/terminal/service/tab/terminal-tab-manager';
@@ -146,7 +146,7 @@ export default defineStore('terminal', {
         await updatePreference({
           type: 'TERMINAL',
           item,
-          value: isObject(value) ? JSON.stringify(value) : value,
+          value: (isObject(value) || isArray(value)) ? JSON.stringify(value) : value,
         });
       } catch (e) {
         Message.error('同步失败');
diff --git a/orion-visor-ui/src/store/modules/terminal/types.ts b/orion-visor-ui/src/store/modules/terminal/types.ts
index 7bd40f11..0200445b 100644
--- a/orion-visor-ui/src/store/modules/terminal/types.ts
+++ b/orion-visor-ui/src/store/modules/terminal/types.ts
@@ -121,7 +121,6 @@ export interface TerminalVncGraphSetting {
   displayHeight?: number;
   colorDepth?: number;
   forceLossless?: boolean;
-  swapRedBlue?: boolean;
   cursor?: string;
   compressLevel?: number;
   qualityLevel?: number;
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
index 8a8c1d54..57ac4007 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-rdp-action-bar-block.vue
@@ -40,25 +40,16 @@
 <script lang="ts" setup>
   import type { TerminalRdpActionBarSetting } from '@/store/modules/terminal/types';
   import type { SidebarAction } from '@/views/terminal/types/define';
-  import { computed, ref, watch } from 'vue';
-  import { useTerminalStore, useDictStore } from '@/store';
+  import { computed } from 'vue';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { RdpActionBarItems, graphActionBarPositionKey } from '@/views/terminal/types/const';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import IconActions from '../../layout/icon-actions.vue';
 
   const { toOptions } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalRdpActionBarSetting>({ ...preference.rdpActionBarSetting });
-
-  // 监听同步
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.RDP_ACTION_BAR_SETTING, formModel.value, true);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalRdpActionBarSetting>(TerminalPreferenceItem.RDP_ACTION_BAR_SETTING, true);
 
   // 操作项
   const actions = computed<Array<SidebarAction>>(() => {
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-action-bar-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-action-bar-block.vue
index fc46a6d6..a4c8c48c 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-action-bar-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-action-bar-block.vue
@@ -30,6 +30,12 @@
                       :default-checked="true"
                       type="round" />
           </a-form-item>
+          <!-- 分享按钮 -->
+          <a-form-item field="share" label="分享按钮">
+            <a-switch v-model="formModel.share"
+                      :default-checked="true"
+                      type="round" />
+          </a-form-item>
         </a-space>
       </a-form>
     </div>
@@ -45,25 +51,14 @@
 <script lang="ts" setup>
   import type { TerminalSshActionBarSetting } from '@/store/modules/terminal/types';
   import type { SidebarAction } from '@/views/terminal/types/define';
-  import { computed, ref, watch } from 'vue';
-  import { useTerminalStore } from '@/store';
+  import { computed } from 'vue';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { SshActionBarItems } from '@/views/terminal/types/const';
   import { isSecureEnvironment } from '@/utils/env';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import IconActions from '../../layout/icon-actions.vue';
 
-  const { preference, updateTerminalPreference } = useTerminalStore();
-
-  const formModel = ref<TerminalSshActionBarSetting>({ ...preference.sshActionBarSetting });
-
-  // 监听同步
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.SSH_ACTION_BAR_SETTING, formModel.value, true);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalSshActionBarSetting>(TerminalPreferenceItem.SSH_ACTION_BAR_SETTING, true);
 
   // 操作项
   const actions = computed<Array<SidebarAction>>(() => {
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-display-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-display-block.vue
index 6231e5d0..d2c25675 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-display-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-display-block.vue
@@ -116,23 +116,22 @@
 <script lang="ts" setup>
   import type { TerminalSshDisplaySetting } from '@/store/modules/terminal/types';
   import type { ISshSession } from '@/views/terminal/interfaces';
-  import { ref, watch, onMounted } from 'vue';
+  import { ref } from 'vue';
   import { useDictStore, useTerminalStore } from '@/store';
   import { fontFamilyKey, fontSizeKey, fontWeightKey, cursorStyleKey, TerminalSessionTypes } from '@/views/terminal/types/const';
   import { labelFilter } from '@/types/form';
-  import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { defaultFontFamily } from '@/types/xterm';
+  import { TerminalPreferenceItem } from '@/store/modules/terminal';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import TerminalExample from '../terminal-example.vue';
 
   const { toOptions, toRadioOptions } = useDictStore();
-  const { preference, updateTerminalPreference, sessionManager } = useTerminalStore();
+  const { preference, sessionManager } = useTerminalStore();
 
   const background = preference.sshTheme.schema.background;
   const previewTerminal = ref();
-  const formModel = ref<TerminalSshDisplaySetting>({});
 
-  // 监听内容变化
-  watch(formModel, (v, before) => {
+  const { formModel } = useTerminalPreference<TerminalSshDisplaySetting>(TerminalPreferenceItem.SSH_DISPLAY_SETTING, true, (v) => {
     if (!v || !Object.keys(v).length) {
       return;
     }
@@ -168,17 +167,8 @@
         // 自适应
         s.fit();
       });
-    // 非初始化则同步
-    if (Object.keys(before).length) {
-      updateTerminalPreference(TerminalPreferenceItem.SSH_DISPLAY_SETTING, formModel.value, true);
-    }
     // 聚焦
     previewTerminal.value.term.focus();
-  }, { deep: true });
-
-  // 初始化配置
-  onMounted(() => {
-    formModel.value = { ...preference.sshDisplaySetting };
   });
 
 </script>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-right-menu-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-right-menu-block.vue
index 02ef7f63..88f85126 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-right-menu-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-ssh-right-menu-block.vue
@@ -26,7 +26,7 @@
                    class="action-item-wrapper"
                    v-for="(action, index) in SshActionBarItems"
                    :key="index">
-              <div class="action-item" @click="clickAction(action.item)">
+              <div class="action-item" @click="toggleAction(action.item)">
                 <!-- 图标 -->
                 <div class="action-icon">
                   <component :is="action.icon" />
@@ -62,7 +62,7 @@
               <div>{{ action.content }}</div>
             </div>
             <!-- 关闭按钮 -->
-            <div class="close-icon" @click="clickAction(action.item)">
+            <div class="close-icon" @click="toggleAction(action.item)">
               <icon-close />
             </div>
           </a-doption>
@@ -86,22 +86,15 @@
 
 <script lang="ts" setup>
   import type { ContextMenuItem } from '@/views/terminal/types/define';
-  import { computed, ref, watch } from 'vue';
-  import { useTerminalStore } from '@/store';
+  import { computed, ref } from 'vue';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { SshActionBarItems } from '@/views/terminal/types/const';
   import { isSecureEnvironment } from '@/utils/env';
-
-  const { preference, updateTerminalPreference } = useTerminalStore();
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
 
   const popupContainer = ref();
-  const rightActionItems = ref<Array<string>>([...preference.sshRightMenuSetting]);
 
-  // // 监听同步
-  watch(rightActionItems, (v) => {
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.SSH_RIGHT_MENU_SETTING, JSON.stringify(v), true);
-  }, { deep: true });
+  const { formModel: rightActionItems } = useTerminalPreference<Array<string>>(TerminalPreferenceItem.SSH_RIGHT_MENU_SETTING, true);
 
   // 实际操作项
   const rightActions = computed<Array<ContextMenuItem>>(() => {
@@ -110,8 +103,8 @@
       .filter(Boolean);
   });
 
-  // 添加操作项
-  const clickAction = (item: string) => {
+  // 触发操作项
+  const toggleAction = (item: string) => {
     if (rightActionItems.value.includes(item)) {
       // 移除
       rightActionItems.value.splice(rightActionItems.value.indexOf(item), 1);
diff --git a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
index 5baf89e8..929d410a 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/display/terminal-vnc-action-bar-block.vue
@@ -40,25 +40,16 @@
 <script lang="ts" setup>
   import type { TerminalVncActionBarSetting } from '@/store/modules/terminal/types';
   import type { SidebarAction } from '@/views/terminal/types/define';
-  import { computed, ref, watch } from 'vue';
-  import { useTerminalStore, useDictStore } from '@/store';
+  import { computed } from 'vue';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { VncActionBarItems, graphActionBarPositionKey } from '@/views/terminal/types/const';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import IconActions from '../../layout/icon-actions.vue';
 
   const { toOptions } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalVncActionBarSetting>({ ...preference.vncActionBarSetting });
-
-  // 监听同步
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.VNC_ACTION_BAR_SETTING, formModel.value, true);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalVncActionBarSetting>(TerminalPreferenceItem.VNC_ACTION_BAR_SETTING, true);
 
   // 操作项
   const actions = computed<Array<SidebarAction>>(() => {
diff --git a/orion-visor-ui/src/views/terminal/components/setting/extra/rdp-extra-form.vue b/orion-visor-ui/src/views/terminal/components/setting/extra/rdp-extra-form.vue
index e4570293..0db1a392 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/extra/rdp-extra-form.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/extra/rdp-extra-form.vue
@@ -23,7 +23,7 @@
     <a-form-item field="lowBandwidthMode"
                  style="margin-bottom: 8px;"
                  label="低带宽模式"
-                 help="调整图形化配置以及禁用音频, 提升慢速网络下的响应速度">
+                 help="调整图形化配置为最低以及禁用音频, 提升慢速网络下的响应速度">
       <a-switch v-model="formModel.lowBandwidthMode" type="round" />
     </a-form-item>
     <!-- 初始化程序 -->
diff --git a/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue b/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
index 33b45313..d591fe29 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/extra/vnc-extra-form.vue
@@ -8,16 +8,22 @@
     <a-form-item field="port"
                  label="自定义端口"
                  style="margin-bottom: 8px;"
-                 help="通常情况下端口号为 5900 + N(屏幕)"
+                 help="通常情况下端口号为 5900 + N (屏幕)"
                  :rules="{ min: 1, max: 65535, message: '输入的端口不合法' }">
       <a-input-number v-model="formModel.port"
                       placeholder="VNC 自定义端口"
                       allow-clear />
     </a-form-item>
+    <!-- 交换红蓝 -->
+    <a-form-item field="swapRedBlue"
+                 label="交换红蓝"
+                 help="若颜色显示错误(如蓝色显示为橙红色), 则需启用此选项">
+      <a-switch v-model="formModel.swapRedBlue" type="round" />
+    </a-form-item>
     <!-- 低带宽模式 -->
     <a-form-item field="lowBandwidthMode"
                  label="低带宽模式"
-                 help="调整图形化配置以及禁用音频, 提升慢速网络下的响应速度">
+                 help="调整图形化配置为最低, 提升慢速网络下的响应速度">
       <a-switch v-model="formModel.lowBandwidthMode" type="round" />
     </a-form-item>
   </a-form>
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
index d8b4bd64..e9db56ff 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-graph-block.vue
@@ -95,23 +95,16 @@
 
 <script lang="ts" setup>
   import type { TerminalRdpGraphSetting } from '@/store/modules/terminal/types';
-  import { ref, watch } from 'vue';
-  import { useTerminalStore, useDictStore } from '@/store';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { screenResolutionKey, graphColorDepthKey, fitDisplayValue } from '@/views/terminal/types/const';
   import { getDisplaySize } from '@/views/terminal/types/utils';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import BlockSettingItem from '../block-setting-item.vue';
 
   const { toOptions, getDictValue } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalRdpGraphSetting>({ ...preference.rdpGraphSetting });
-
-  // 监听内容变化
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
+  const { formModel } = useTerminalPreference<TerminalRdpGraphSetting>(TerminalPreferenceItem.RDP_GRAPH_SETTING, true, (v) => {
     // 同步大小
     if (v.displaySize) {
       // 自适应大小
@@ -129,9 +122,7 @@
         }
       }
     }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.RDP_GRAPH_SETTING, formModel.value, true);
-  }, { deep: true });
+  });
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
index 419645f3..f3eaa86e 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-rdp-session-block.vue
@@ -36,25 +36,15 @@
 
 <script lang="ts" setup>
   import type { TerminalRdpSessionSetting } from '@/store/modules/terminal/types';
-  import { ref, watch } from 'vue';
-  import { useDictStore, useTerminalStore } from '@/store';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { driveMountModeKey } from '@/views/terminal/types/const';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import BlockSettingItem from '../block-setting-item.vue';
 
   const { toOptions, getDictValue } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalRdpSessionSetting>({ ...preference.rdpSessionSetting });
-
-  // 监听内容变化
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.RDP_SESSION_SETTING, formModel.value, true);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalRdpSessionSetting>(TerminalPreferenceItem.RDP_SESSION_SETTING, true);
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
index 27e2dfe3..0aa8a695 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue
@@ -110,26 +110,16 @@
 
 <script lang="ts" setup>
   import type { TerminalSshInteractSetting } from '@/store/modules/terminal/types';
-  import { ref, watch } from 'vue';
-  import { useTerminalStore, useDictStore } from '@/store';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { emulationTypeKey } from '@/views/terminal/types/const';
   import { isSecureEnvironment } from '@/utils/env';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import BlockSettingItem from '../block-setting-item.vue';
 
   const { toOptions } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalSshInteractSetting>({ ...preference.sshInteractSetting });
-
-  // 监听内容变化
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.SSH_INTERACT_SETTING, formModel.value);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalSshInteractSetting>(TerminalPreferenceItem.SSH_INTERACT_SETTING);
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-plugins-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-plugins-block.vue
index 520a18f5..e0ce53fb 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-plugins-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-plugins-block.vue
@@ -40,23 +40,11 @@
 
 <script lang="ts" setup>
   import type { TerminalSshPluginsSetting } from '@/store/modules/terminal/types';
-  import { ref, watch } from 'vue';
-  import { useTerminalStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import BlockSettingItem from '../block-setting-item.vue';
 
-  const { preference, updateTerminalPreference } = useTerminalStore();
-
-  const formModel = ref<TerminalSshPluginsSetting>({ ...preference.sshPluginsSetting });
-
-  // 监听内容变化
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.SSH_PLUGINS_SETTING, formModel.value);
-  }, { deep: true });
+  const { formModel } = useTerminalPreference<TerminalSshPluginsSetting>(TerminalPreferenceItem.SSH_PLUGINS_SETTING);
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue
index 4ac5634a..237c0d08 100644
--- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-vnc-graph-block.vue
@@ -32,9 +32,12 @@
         <block-setting-item label="无损压缩" desc="是否启用对图像更新的无损压缩">
           <a-switch v-model="formModel.forceLossless" type="round" />
         </block-setting-item>
-        <!-- 交换红蓝 -->
-        <block-setting-item label="交换红蓝" desc="若显示的颜色出现错误(蓝色显示为橙色或红色等) 则需要启用此选项">
-          <a-switch v-model="formModel.swapRedBlue" type="round" />
+        <!-- 光标 -->
+        <block-setting-item label="光标" desc="光标渲染方式, 远程光标会比本地光标慢">
+          <a-select v-model="formModel.cursor"
+                    style="width: 168px;"
+                    size="small"
+                    :options="toOptions(vcnCursorKey)" />
         </block-setting-item>
       </a-row>
       <a-row class="mb16" align="stretch" :gutter="16">
@@ -59,15 +62,6 @@
                           placeholder="图像质量等级 0 ~ 9" />
         </block-setting-item>
       </a-row>
-      <a-row class="mb16" align="stretch" :gutter="16">
-        <!-- 光标 -->
-        <block-setting-item label="光标" desc="光标渲染方式, 远程光标会比本地光标慢">
-          <a-select v-model="formModel.cursor"
-                    style="width: 168px;"
-                    size="small"
-                    :options="toOptions(vcnCursorKey)" />
-        </block-setting-item>
-      </a-row>
     </div>
   </div>
 </template>
@@ -80,23 +74,16 @@
 
 <script lang="ts" setup>
   import type { TerminalVncGraphSetting } from '@/store/modules/terminal/types';
-  import { ref, watch } from 'vue';
-  import { useTerminalStore, useDictStore } from '@/store';
+  import { useDictStore } from '@/store';
   import { TerminalPreferenceItem } from '@/store/modules/terminal';
   import { graphColorDepthKey, vcnCursorKey, fitDisplayValue, screenResolutionKey } from '@/views/terminal/types/const';
   import { getDisplaySize } from '@/views/terminal/types/utils';
+  import useTerminalPreference from '@/views/terminal/types/use-terminal-preference';
   import BlockSettingItem from '../block-setting-item.vue';
 
   const { toOptions, getDictValue } = useDictStore();
-  const { preference, updateTerminalPreference } = useTerminalStore();
 
-  const formModel = ref<TerminalVncGraphSetting>({ ...preference.vncGraphSetting });
-
-  // 监听内容变化
-  watch(formModel, (v) => {
-    if (!v) {
-      return;
-    }
+  const { formModel } = useTerminalPreference<TerminalVncGraphSetting>(TerminalPreferenceItem.VNC_GRAPH_SETTING, true, (v) => {
     // 同步大小
     if (v.displaySize) {
       // 自适应大小
@@ -114,9 +101,7 @@
         }
       }
     }
-    // 同步
-    updateTerminalPreference(TerminalPreferenceItem.VNC_GRAPH_SETTING, formModel.value, true);
-  }, { deep: true });
+  });
 
 </script>
 
diff --git a/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts b/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
index 2216786e..9efa3b0a 100644
--- a/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
+++ b/orion-visor-ui/src/views/terminal/service/channel/vnc-channel.ts
@@ -17,7 +17,6 @@ export default class VncChannel extends BaseGuacdChannel<IVncSession> {
       extra: {
         colorDepth: setting.colorDepth || 24,
         forceLossless: setting.forceLossless,
-        swapRedBlue: setting.swapRedBlue,
         cursor: setting.cursor,
         compressLevel: setting.compressLevel,
         qualityLevel: setting.qualityLevel,
diff --git a/orion-visor-ui/src/views/terminal/types/use-terminal-preference.ts b/orion-visor-ui/src/views/terminal/types/use-terminal-preference.ts
new file mode 100644
index 00000000..8eb43fd9
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/types/use-terminal-preference.ts
@@ -0,0 +1,41 @@
+import { ref, watch } from 'vue';
+import { useDebounceFn } from '@vueuse/core';
+import { useTerminalStore } from '@/store';
+import { isArray, isObject } from '@/utils/is';
+
+const { preference, updateTerminalPreference } = useTerminalStore();
+
+// 更新终端偏好
+export default function useTerminalPreference<T>(key: string,
+                                                 setLocal = false,
+                                                 filler?: (v: T, before: T) => void,
+                                                 delay = 500) {
+  // 默认配置
+  let initialValue = preference[key as keyof typeof preference] as T;
+  if (isArray(initialValue)) {
+    initialValue = [...initialValue] as T;
+  } else if (isObject(initialValue)) {
+    initialValue = { ...initialValue } as T;
+  }
+  const formModel = ref<T>(initialValue);
+
+  // 防抖更新
+  const debouncedUpdate = useDebounceFn(async (value: T) => {
+    // 更新
+    await updateTerminalPreference(key, value, setLocal);
+  }, delay);
+
+  // 监听表单
+  watch(formModel, async (v, before) => {
+    if (!v) {
+      return;
+    }    // 填充
+    filler?.(v, before);
+    // 更新
+    await debouncedUpdate(v);
+  }, { deep: true });
+
+  return {
+    formModel,
+  };
+}

From bfde4350710e3ed1fc8a384d7bc28aaedb2de5ff Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 8 Jul 2025 00:45:23 +0800
Subject: [PATCH 22/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=8A=9F=E8=83=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../session/config/VncConnectConfig.java      |  3 +
 .../host/extra/model/HostVncExtraModel.java   |  5 ++
 .../extra/strategy/HostVncExtraStrategy.java  |  1 +
 .../service/impl/HostConnectServiceImpl.java  |  1 +
 .../model/TerminalPreferenceModel.java        | 62 ++++++++++++++++---
 .../strategy/TerminalPreferenceStrategy.java  | 15 ++++-
 .../terminal/model/TerminalChannelExtra.java  |  5 --
 .../handler/terminal/session/VncSession.java  |  2 +
 8 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java b/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
index 39317be0..b0d80640 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/session/config/VncConnectConfig.java
@@ -47,6 +47,9 @@ public class VncConnectConfig extends BaseConnectConfig {
     @Schema(description = "低带宽模式")
     private Boolean lowBandwidthMode;
 
+    @Schema(description = "交换红蓝")
+    private Boolean swapRedBlue;
+
     @Schema(description = "时区")
     private String timezone;
 
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
index 183f51bd..5db0346b 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostVncExtraModel.java
@@ -51,4 +51,9 @@ public class HostVncExtraModel implements GenericsDataModel {
      */
     private Boolean lowBandwidthMode;
 
+    /**
+     * 交换红蓝
+     */
+    private Boolean swapRedBlue;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java
index f8053dc5..384fe704 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostVncExtraStrategy.java
@@ -44,6 +44,7 @@ public class HostVncExtraStrategy extends AbstractGenericsDataStrategy<HostVncEx
     public HostVncExtraModel getDefault() {
         return HostVncExtraModel.builder()
                 .lowBandwidthMode(false)
+                .swapRedBlue(false)
                 .build();
     }
 
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
index 117cf04b..b5a3e5e4 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
@@ -368,6 +368,7 @@ public class HostConnectServiceImpl implements HostConnectService {
         if (extra != null) {
             // 设置额外配置信息
             connectConfig.setLowBandwidthMode(extra.getLowBandwidthMode());
+            connectConfig.setSwapRedBlue(extra.getSwapRedBlue());
             // 设置自定义端口
             Integer extraPort = extra.getPort();
             if (extraPort != null) {
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
index 091402fb..0b4c7104 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java
@@ -436,6 +436,11 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private String position;
 
+        /**
+         * 会话信息
+         */
+        private Boolean info;
+
         /**
          * 显示设置
          */
@@ -446,18 +451,33 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private Boolean combinationKey;
 
+        /**
+         * 长按键
+         */
+        private Boolean triggerKey;
+
         /**
          * 剪切板
          */
         private Boolean clipboard;
 
         /**
-         * 上传
+         * RDP 上传
          */
-        private Boolean upload;
+        private Boolean rdpUpload;
 
         /**
-         * 保存为 rdp 文件
+         * SFTP 上传
+         */
+        private Boolean sftpUpload;
+
+        /**
+         * 打开 SFTP
+         */
+        private Boolean openSftp;
+
+        /**
+         * 保存为 RDP 文件
          */
         private Boolean saveRdp;
 
@@ -466,6 +486,11 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private Boolean disconnect;
 
+        /**
+         * 重新连接
+         */
+        private Boolean reconnect;
+
         /**
          * 关闭
          */
@@ -527,11 +552,6 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private Boolean forceLossless;
 
-        /**
-         * 交换红蓝
-         */
-        private Boolean swapRedBlue;
-
         /**
          * 光标
          */
@@ -560,6 +580,11 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private String position;
 
+        /**
+         * 会话信息
+         */
+        private Boolean info;
+
         /**
          * 显示设置
          */
@@ -570,16 +595,37 @@ public class TerminalPreferenceModel implements GenericsDataModel {
          */
         private Boolean combinationKey;
 
+        /**
+         * 长按键
+         */
+        private Boolean triggerKey;
+
         /**
          * 剪切板
          */
         private Boolean clipboard;
 
+        /**
+         * SFTP 上传
+         */
+        private Boolean sftpUpload;
+
+        /**
+         * 打开 SFTP
+         */
+        private Boolean openSftp;
+
         /**
          * 断开连接
          */
         private Boolean disconnect;
 
+        /**
+         * 重新连接
+         */
+        private Boolean reconnect;
+
+
         /**
          * 关闭
          */
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
index e757f7d7..d09856f3 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
@@ -206,12 +206,17 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
     private String getDefaultRdpActionBarSetting() {
         return TerminalPreferenceModel.RdpActionBarSettingModel.builder()
                 .position("top")
+                .info(true)
                 .display(true)
                 .combinationKey(true)
+                .triggerKey(false)
                 .clipboard(true)
-                .upload(true)
-                .saveRdp(true)
+                .rdpUpload(true)
+                .sftpUpload(false)
+                .openSftp(false)
+                .saveRdp(false)
                 .disconnect(true)
+                .reconnect(false)
                 .close(true)
                 .build()
                 .toJsonString();
@@ -243,7 +248,6 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
                 .displayHeight(0)
                 .colorDepth(24)
                 .forceLossless(true)
-                .swapRedBlue(false)
                 .cursor("local")
                 .compressLevel(5)
                 .qualityLevel(5)
@@ -259,10 +263,15 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy<Ter
     private String getDefaultVncSessionSetting() {
         return TerminalPreferenceModel.VncActionBarSettingModel.builder()
                 .position("top")
+                .info(true)
                 .display(true)
                 .combinationKey(true)
+                .triggerKey(false)
                 .clipboard(true)
+                .sftpUpload(true)
+                .openSftp(true)
                 .disconnect(true)
+                .reconnect(false)
                 .close(true)
                 .build()
                 .toJsonString();
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/model/TerminalChannelExtra.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
index 24c072b7..e4e234fb 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelExtra.java
@@ -138,11 +138,6 @@ public class TerminalChannelExtra {
 
     // -------------------- vnc --------------------
 
-    /**
-     * 交换红蓝
-     */
-    private Boolean swapRedBlue;
-
     /**
      * 光标
      */
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/session/VncSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java
index f4a76b5e..9de39f17 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/VncSession.java
@@ -71,6 +71,8 @@ public class VncSession extends AbstractGuacdSession<TerminalSessionVncConfig> i
         tunnel.setParameter(GuacdConst.FORCE_LOSSLESS, extra.getForceLossless());
         tunnel.setParameter(GuacdConst.COMPRESS_LEVEL, extra.getCompressLevel());
         tunnel.setParameter(GuacdConst.QUALITY_LEVEL, extra.getQualityLevel());
+        // 交换红蓝
+        tunnel.setParameter(GuacdConst.SWAP_RED_BLUE, config.getSwapRedBlue());
         // 光标设置
         tunnel.setParameter(GuacdConst.CURSOR, extra.getCursor());
         // 编码设置

From ef146cdaef9524cf7fa10735e6e9632efd9a82d7 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 8 Jul 2025 01:06:48 +0800
Subject: [PATCH 23/31] =?UTF-8?q?:hammer:=20=E5=8E=BB=E9=99=A4=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=BF=9E=E6=8E=A5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../host-list/components/host-form-rdp.vue    | 12 ----
 .../host-list/components/host-form-ssh.vue    | 20 +++++-
 .../host-list/components/host-form-vnc.vue    | 12 ----
 .../asset/host-list/types/use-host-config.ts  | 22 ------
 .../src/views/terminal/types/const.ts         | 70 +++++++++++++++++--
 5 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
index f4f58da0..614661df 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-rdp.vue
@@ -152,17 +152,6 @@
                   @click="saveConfig">
           保存
         </a-button>
-        <!-- 测试连接 -->
-        <a-tooltip position="tr"
-                   content="请先保存后测试连接"
-                   mini>
-          <a-button class="extra-button"
-                    type="primary"
-                    long
-                    @click="testConnect">
-            测试连接
-          </a-button>
-        </a-tooltip>
       </a-form-item>
     </a-form>
   </a-spin>
@@ -198,7 +187,6 @@
     formRef,
     formRules,
     fetchHostConfig,
-    testConnect,
     saveConfig,
   } = useHostConfigForm({
     type: HostType.RDP.value,
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
index 33367941..a864bc85 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue
@@ -127,6 +127,8 @@
   import { useDictStore } from '@/store';
   import { sshAuthTypeKey, HostAuthType, HostType } from '../types/const';
   import { sshFormRules } from '../types/form.rules';
+  import { Message } from '@arco-design/web-vue';
+  import { testHostConnect } from '@/api/asset/host';
   import useHostConfigForm from '../types/use-host-config';
   import HostIdentitySelector from '@/components/asset/host-identity/selector/index.vue';
   import HostKeySelector from '@/components/asset/host-key/selector/index.vue';
@@ -144,7 +146,6 @@
     formRef,
     formRules,
     fetchHostConfig,
-    testConnect,
     saveConfig,
   } = useHostConfigForm({
     type: HostType.SSH.value,
@@ -154,6 +155,23 @@
     setLoading,
   });
 
+  // 测试连接
+  const testConnect = async () => {
+    const error = await formRef.value.validate();
+    if (error) {
+      return;
+    }
+    try {
+      setLoading(true);
+      // 测试连接
+      await testHostConnect({ id: props.hostId, type: HostType.SSH.value });
+      Message.success('连接成功');
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
   onMounted(fetchHostConfig);
 
 </script>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
index 330bb6df..ea6fa7e4 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-vnc.vue
@@ -104,17 +104,6 @@
                   @click="saveConfig">
           保存
         </a-button>
-        <!-- 测试连接 -->
-        <a-tooltip position="tr"
-                   content="请先保存后测试连接"
-                   mini>
-          <a-button class="extra-button"
-                    type="primary"
-                    long
-                    @click="testConnect">
-            测试连接
-          </a-button>
-        </a-tooltip>
       </a-form-item>
     </a-form>
   </a-spin>
@@ -150,7 +139,6 @@
     formRef,
     formRules,
     fetchHostConfig,
-    testConnect,
     saveConfig,
   } = useHostConfigForm({
     type: HostType.VNC.value,
diff --git a/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts b/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts
index 34ff1af4..44f3c469 100644
--- a/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts
+++ b/orion-visor-ui/src/views/asset/host-list/types/use-host-config.ts
@@ -6,7 +6,6 @@ import type { FieldRule } from '@arco-design/web-vue';
 import { Message } from '@arco-design/web-vue';
 import { baseFormRules } from './form.rules';
 import { encrypt } from '@/utils/rsa';
-import { testHostConnect } from '@/api/asset/host';
 
 // 主机配置表单信息
 export interface UseHostConfigFormOptions<T extends HostBaseConfig> {
@@ -38,26 +37,6 @@ export default function useHostConfigForm<T extends HostBaseConfig>(options: Use
     }
   };
 
-  // 测试连接
-  const testConnect = async () => {
-    if (!formRef?.value) {
-      return;
-    }
-    const error = await formRef.value.validate();
-    if (error) {
-      return;
-    }
-    try {
-      setLoading(true);
-      // 测试连接
-      await testHostConnect({ id: hostId, type });
-      Message.success('连接成功');
-    } catch (e) {
-    } finally {
-      setLoading(false);
-    }
-  };
-
   // 保存配置
   const saveConfig = async () => {
     if (!formRef?.value) {
@@ -93,7 +72,6 @@ export default function useHostConfigForm<T extends HostBaseConfig>(options: Use
     formRef,
     formRules,
     fetchHostConfig,
-    testConnect,
     saveConfig,
   };
 }
diff --git a/orion-visor-ui/src/views/terminal/types/const.ts b/orion-visor-ui/src/views/terminal/types/const.ts
index 9826c18d..a0f564d9 100644
--- a/orion-visor-ui/src/views/terminal/types/const.ts
+++ b/orion-visor-ui/src/views/terminal/types/const.ts
@@ -230,17 +230,27 @@ export const SshActionBarItems = [
 
 // guacd 终端操作栏键
 export const GuacdActionItemKeys = {
+  INFO: 'info',
   DISPLAY: 'display',
   COMBINATION_KEY: 'combinationKey',
+  TRIGGER_KEY: 'triggerKey',
   CLIPBOARD: 'clipboard',
-  UPLOAD: 'upload',
+  RDP_UPLOAD: 'rdpUpload',
+  SFTP_UPLOAD: 'sftpUpload',
+  OPEN_SFTP: 'openSftp',
   SAVE_RDP: 'saveRdp',
   DISCONNECT: 'disconnect',
+  RECONNECT: 'reconnect',
   CLOSE: 'close',
 };
 
 // guacd 终端操作栏
 export const GuacdActionBarItemMap = {
+  [GuacdActionItemKeys.INFO]: {
+    item: GuacdActionItemKeys.INFO,
+    icon: 'icon-info',
+    content: '会话信息',
+  },
   [GuacdActionItemKeys.DISPLAY]: {
     item: GuacdActionItemKeys.DISPLAY,
     icon: 'icon-desktop',
@@ -251,15 +261,30 @@ export const GuacdActionBarItemMap = {
     icon: 'icon-command',
     content: '组合键',
   },
+  [GuacdActionItemKeys.TRIGGER_KEY]: {
+    item: GuacdActionItemKeys.TRIGGER_KEY,
+    icon: 'icon-dice',
+    content: '长按键',
+  },
   [GuacdActionItemKeys.CLIPBOARD]: {
     item: GuacdActionItemKeys.CLIPBOARD,
     icon: 'icon-paste',
     content: '剪切板',
   },
-  [GuacdActionItemKeys.UPLOAD]: {
-    item: GuacdActionItemKeys.UPLOAD,
+  [GuacdActionItemKeys.RDP_UPLOAD]: {
+    item: GuacdActionItemKeys.RDP_UPLOAD,
     icon: 'icon-upload',
-    content: '文件上传',
+    content: 'RDP 文件上传',
+  },
+  [GuacdActionItemKeys.SFTP_UPLOAD]: {
+    item: GuacdActionItemKeys.SFTP_UPLOAD,
+    icon: 'icon-folder-add',
+    content: 'SFTP 文件上传',
+  },
+  [GuacdActionItemKeys.OPEN_SFTP]: {
+    item: GuacdActionItemKeys.OPEN_SFTP,
+    icon: 'icon-folder',
+    content: '打开 SFTP',
   },
   [GuacdActionItemKeys.SAVE_RDP]: {
     item: GuacdActionItemKeys.SAVE_RDP,
@@ -271,6 +296,11 @@ export const GuacdActionBarItemMap = {
     icon: 'icon-stop',
     content: '断开连接',
   },
+  [GuacdActionItemKeys.RECONNECT]: {
+    item: GuacdActionItemKeys.RECONNECT,
+    icon: 'icon-refresh',
+    content: '重新连接',
+  },
   [GuacdActionItemKeys.CLOSE]: {
     item: GuacdActionItemKeys.CLOSE,
     icon: 'icon-close',
@@ -280,21 +310,31 @@ export const GuacdActionBarItemMap = {
 
 // 终端操作栏 - RDP
 export const RdpActionBarItems = [
+  GuacdActionBarItemMap[GuacdActionItemKeys.INFO],
   GuacdActionBarItemMap[GuacdActionItemKeys.DISPLAY],
   GuacdActionBarItemMap[GuacdActionItemKeys.COMBINATION_KEY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.TRIGGER_KEY],
   GuacdActionBarItemMap[GuacdActionItemKeys.CLIPBOARD],
-  GuacdActionBarItemMap[GuacdActionItemKeys.UPLOAD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.RDP_UPLOAD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.SFTP_UPLOAD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.OPEN_SFTP],
   GuacdActionBarItemMap[GuacdActionItemKeys.SAVE_RDP],
   GuacdActionBarItemMap[GuacdActionItemKeys.DISCONNECT],
+  GuacdActionBarItemMap[GuacdActionItemKeys.RECONNECT],
   GuacdActionBarItemMap[GuacdActionItemKeys.CLOSE],
 ];
 
 // 终端操作栏 - VNC
 export const VncActionBarItems = [
+  GuacdActionBarItemMap[GuacdActionItemKeys.INFO],
   GuacdActionBarItemMap[GuacdActionItemKeys.DISPLAY],
   GuacdActionBarItemMap[GuacdActionItemKeys.COMBINATION_KEY],
+  GuacdActionBarItemMap[GuacdActionItemKeys.TRIGGER_KEY],
   GuacdActionBarItemMap[GuacdActionItemKeys.CLIPBOARD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.SFTP_UPLOAD],
+  GuacdActionBarItemMap[GuacdActionItemKeys.OPEN_SFTP],
   GuacdActionBarItemMap[GuacdActionItemKeys.DISCONNECT],
+  GuacdActionBarItemMap[GuacdActionItemKeys.RECONNECT],
   GuacdActionBarItemMap[GuacdActionItemKeys.CLOSE],
 ];
 
@@ -562,6 +602,26 @@ export const GuacdCombinationKeyItems: Array<CombinationKeyItem> = [
   }
 ];
 
+// Guacd 键盘码
+export const GuacdKeyboardItems = [
+  {
+    key: 65507,
+    name: 'Ctrl',
+  },
+  {
+    key: 65505,
+    name: 'Shift',
+  },
+  {
+    key: 65513,
+    name: 'Alt',
+  },
+  {
+    key: 65515,
+    name: 'Windows',
+  },
+];
+
 // backspace 字符
 export const BACKSPACE_CHAR = String.fromCharCode(127);
 

From bf04e8eace8d1c134e9edcd5a3ce8dd3d132f957 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 8 Jul 2025 17:27:35 +0800
Subject: [PATCH 24/31] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E9=95=BF?=
 =?UTF-8?q?=E6=8C=89=E6=93=8D=E4=BD=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/TerminalSessionVncConfig.java      |  3 --
 .../view/guacd/actions/trigger-key-action.vue | 44 +++++++++++++++++++
 .../src/views/terminal/interfaces/handler.ts  |  1 +
 .../handler/guacd-session-display-handler.ts  | 14 ++++++
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/guacd/actions/trigger-key-action.vue

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/model/config/TerminalSessionVncConfig.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java
index 315ee928..667922f7 100644
--- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java
+++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionVncConfig.java
@@ -47,9 +47,6 @@ public class TerminalSessionVncConfig extends VncConnectConfig implements ITermi
     @Schema(description = "logId")
     private Long logId;
 
-    @Schema(description = "录屏文件路径")
-    private String recordPath;
-
     @Schema(description = "宽")
     private Integer width;
 
diff --git a/orion-visor-ui/src/views/terminal/components/view/guacd/actions/trigger-key-action.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/trigger-key-action.vue
new file mode 100644
index 00000000..a7d1f2b8
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/trigger-key-action.vue
@@ -0,0 +1,44 @@
+<template>
+  <a-space>
+    <a-tag v-for="item in GuacdKeyboardItems"
+           :key="item.name"
+           :default-checked="session.displayHandler.keyboardDownKeys.includes(item.key)"
+           checkable
+           bordered
+           @check="(checked: boolean) => setChecked(item.key, checked)">
+      {{ item.name }}
+    </a-tag>
+  </a-space>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'triggerKeyAction'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
+  import { GuacdKeyboardItems } from '@/views/terminal/types/const';
+
+  const props = defineProps<{
+    session: IGuacdSession;
+  }>();
+
+  // 设置选中
+  const setChecked = (key: number, checked: boolean) => {
+    const keys = props.session.displayHandler.keyboardDownKeys;
+    if (checked) {
+      keys.push(key);
+    } else {
+      const index = keys.findIndex(s => s === key);
+      if (index !== -1) {
+        keys.splice(index, 1);
+      }
+    }
+  };
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/interfaces/handler.ts b/orion-visor-ui/src/views/terminal/interfaces/handler.ts
index 428ba0e0..26452f90 100644
--- a/orion-visor-ui/src/views/terminal/interfaces/handler.ts
+++ b/orion-visor-ui/src/views/terminal/interfaces/handler.ts
@@ -86,6 +86,7 @@ export interface IGuacdSessionDisplayHandler {
   displayDpi: number;
   autoFit: boolean;
   localCursor: boolean;
+  keyboardDownKeys: number[];
 
   // 初始化
   init: () => void;
diff --git a/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
index bcdefb81..9d19f169 100644
--- a/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
+++ b/orion-visor-ui/src/views/terminal/service/handler/guacd-session-display-handler.ts
@@ -12,6 +12,7 @@ export default class GuacdSessionDisplayHandler implements IGuacdSessionDisplayH
   public displayDpi: number;
   public autoFit: boolean;
   public localCursor: boolean;
+  public keyboardDownKeys: Array<number>;
 
   private display?: Guacamole.Display;
   private sink?: Guacamole.InputSink;
@@ -28,6 +29,7 @@ export default class GuacdSessionDisplayHandler implements IGuacdSessionDisplayH
     this.displayDpi = 96;
     this.autoFit = true;
     this.localCursor = true;
+    this.keyboardDownKeys = [];
     this.focusSink = useDebounceFn(() => this.sink?.focus(), 300).bind(this);
   }
 
@@ -187,6 +189,12 @@ export default class GuacdSessionDisplayHandler implements IGuacdSessionDisplayH
       return;
     }
     this.session.client.sendKeyEvent(0, key);
+    // 触发长按键
+    if (this.keyboardDownKeys) {
+      this.keyboardDownKeys.forEach(key => {
+        this.session.client.sendKeyEvent(0, key);
+      });
+    }
   }
 
   // 键盘按下事件
@@ -195,6 +203,12 @@ export default class GuacdSessionDisplayHandler implements IGuacdSessionDisplayH
     if (!this.session.isWriteable()) {
       return;
     }
+    // 触发长按键
+    if (this.keyboardDownKeys) {
+      this.keyboardDownKeys.forEach(key => {
+        this.session.client.sendKeyEvent(1, key);
+      });
+    }
     this.session.client.sendKeyEvent(1, key);
     // // 处理退格
     // if (key === 65288) {

From 0224e2f19a5275493100126dba7b26a1b03897d2 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 00:18:42 +0800
Subject: [PATCH 25/31] =?UTF-8?q?:hammer:=20=E4=BC=98=E5=8C=96=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/asset/service/impl/HostConnectServiceImpl.java  | 1 -
 .../src/components/view/card-list/components/card-item.vue | 1 -
 orion-visor-ui/src/components/view/card-list/index.vue     | 7 ++++---
 .../src/components/view/card-list/types/props.ts           | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
index b5a3e5e4..647a5451 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
@@ -112,7 +112,6 @@ public class HostConnectServiceImpl implements HostConnectService {
                 Streams.close(sessionStore);
             }
         }
-        // TODO: 其他连接方式
     }
 
     @Override
diff --git a/orion-visor-ui/src/components/view/card-list/components/card-item.vue b/orion-visor-ui/src/components/view/card-list/components/card-item.vue
index 1c134d14..70891885 100644
--- a/orion-visor-ui/src/components/view/card-list/components/card-item.vue
+++ b/orion-visor-ui/src/components/view/card-list/components/card-item.vue
@@ -9,7 +9,6 @@
           :bordered="false"
           :hoverable="true"
           :body-style="cardBodyStyle as Record<string, any>"
-          @contextmenu.prevent="() => false"
           @click="bubblesEmitter(CardEmitter.CLICK, item, index)"
           @dblclick="bubblesEmitter(CardEmitter.DBL_CLICK, item, index)">
     <!-- 标题 -->
diff --git a/orion-visor-ui/src/components/view/card-list/index.vue b/orion-visor-ui/src/components/view/card-list/index.vue
index d1d2454a..097fe684 100644
--- a/orion-visor-ui/src/components/view/card-list/index.vue
+++ b/orion-visor-ui/src/components/view/card-list/index.vue
@@ -33,7 +33,9 @@
                v-bind="cardLayoutCols"
                :class="{ 'disabled-col': item.disabled === true }">
           <!-- 右键菜单 -->
-          <a-dropdown trigger="contextMenu" alignPoint>
+          <a-dropdown trigger="contextMenu"
+                      :disabled="!$slots.contextMenu"
+                      alignPoint>
             <!-- 卡片 -->
             <card-item v-bind="props"
                        :index="index"
@@ -48,7 +50,7 @@
               </template>
             </card-item>
             <!-- 右键菜单 -->
-            <template v-if="contextMenu" #content>
+            <template v-if="$slots.contextMenu" #content>
               <slot name="contextMenu"
                     :record="item"
                     :index="index"
@@ -92,7 +94,6 @@
     pagination: false,
     loading: false,
     cardHeight: '100%',
-    contextMenu: true,
     filterCount: 0,
     searchInputWidth: '200px',
     searchValue: '',
diff --git a/orion-visor-ui/src/components/view/card-list/types/props.ts b/orion-visor-ui/src/components/view/card-list/types/props.ts
index 9936595a..7332c71f 100644
--- a/orion-visor-ui/src/components/view/card-list/types/props.ts
+++ b/orion-visor-ui/src/components/view/card-list/types/props.ts
@@ -13,7 +13,6 @@ export interface CardProps {
   cardHeight?: string;
   cardClass?: string;
   cardBodyStyle?: CSSProperties;
-  contextMenu?: boolean;
   filterCount?: number;
   searchInputPlaceholder?: string;
   searchInputWidth?: string;

From abada92907788e06dce044d56aa00643295ad603 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 00:19:17 +0800
Subject: [PATCH 26/31] =?UTF-8?q?:hammer:=20=E4=BC=98=E5=8C=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E5=B7=A5=E5=85=B7=E6=A0=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/session/ssh/SessionStores.java     |   5 +-
 .../entity/dto/host/HostSshConfigDTO.java     |   2 +-
 .../view/guacd/actions/clipboard-action.vue   |  61 ++++++
 .../guacd/actions/combination-key-action.vue  |  37 ++++
 .../view/guacd/actions/display-action.vue     |  91 +++++++++
 .../view/guacd/actions/info-action.vue        |  48 +++++
 .../components/view/rdp/rdp-action-bar.vue    | 179 ++++++++----------
 .../components/view/vnc/vnc-action-bar.vue    | 176 ++++++++---------
 .../terminal/types/use-guacd-action-bar.ts    |  84 --------
 9 files changed, 403 insertions(+), 280 deletions(-)
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/guacd/actions/clipboard-action.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/guacd/actions/combination-key-action.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/guacd/actions/display-action.vue
 create mode 100644 orion-visor-ui/src/views/terminal/components/view/guacd/actions/info-action.vue
 delete mode 100644 orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts

diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/session/ssh/SessionStores.java b/orion-visor-common/src/main/java/org/dromara/visor/common/session/ssh/SessionStores.java
index c0de57e7..e9a715b7 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/session/ssh/SessionStores.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/session/ssh/SessionStores.java
@@ -110,7 +110,10 @@ public class SessionStores {
             }
         }
         // 超时时间
-        session.timeout(config.getTimeout());
+        Integer timeout = config.getTimeout();
+        if (timeout != null) {
+            session.timeout(timeout);
+        }
         return session;
     }
 
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostSshConfigDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostSshConfigDTO.java
index 4717c811..691f400d 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostSshConfigDTO.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/entity/dto/host/HostSshConfigDTO.java
@@ -71,7 +71,7 @@ public class HostSshConfigDTO implements GenericsDataModel, UpdatePasswordAction
     private Long keyId;
 
     @NotNull
-    @Min(value = 1)
+    @Min(value = 0)
     @Max(value = 100000)
     @Schema(description = "连接超时时间")
     private Integer connectTimeout;
diff --git a/orion-visor-ui/src/views/terminal/components/view/guacd/actions/clipboard-action.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/clipboard-action.vue
new file mode 100644
index 00000000..884875e3
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/clipboard-action.vue
@@ -0,0 +1,61 @@
+<template>
+  <a-textarea class="action-bar-clipboard"
+              v-model="clipboardData"
+              :ref="setAutoFocus"
+              placeholder="远程剪切板"
+              allow-clear />
+  <!-- 按钮 -->
+  <a-space class="action-bar-content-footer">
+    <a-button size="small" @click="clearClipboardData">
+      清空
+    </a-button>
+    <a-button type="primary"
+              size="small"
+              :disabled="!clipboardData"
+              @click="sendClipboardData">
+      发送
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'clipboardAction'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
+  import { ref, onMounted } from 'vue';
+  import { setAutoFocus } from '@/utils/dom';
+  import { readText } from '@/hooks/copy';
+
+  const props = defineProps<{
+    session: IGuacdSession;
+  }>();
+  const emits = defineEmits(['close']);
+
+  const clipboardData = ref('');
+
+  // 发送剪切板数据
+  const sendClipboardData = () => {
+    props.session.paste(clipboardData.value);
+    emits('close');
+  };
+
+  // 清空剪切板数据
+  const clearClipboardData = () => {
+    clipboardData.value = '';
+  };
+
+  // 初始化
+  onMounted(() => {
+    readText(false)
+      .then(s => clipboardData.value = s)
+      .catch(() => clipboardData.value = '');
+  });
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/guacd/actions/combination-key-action.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/combination-key-action.vue
new file mode 100644
index 00000000..d5be4aa8
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/combination-key-action.vue
@@ -0,0 +1,37 @@
+<template>
+  <a-row :gutter="[12, 12]" wrap>
+    <a-col v-for="item in GuacdCombinationKeyItems"
+           :key="item.name"
+           :span="12"
+           class="combination-key-item"
+           @click="triggerCombinationKey(item.keys)">
+      <span>{{ item.name }}</span>
+    </a-col>
+  </a-row>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'combinationKeyAction'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
+  import { GuacdCombinationKeyItems } from '@/views/terminal/types/const';
+
+  const props = defineProps<{
+    session: IGuacdSession;
+  }>();
+  const emits = defineEmits(['close']);
+
+  // 触发组合键
+  const triggerCombinationKey = (keys: Array<number>) => {
+    props.session.sendKeys(keys);
+    emits('close');
+  };
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/guacd/actions/display-action.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/display-action.vue
new file mode 100644
index 00000000..b10fb9b6
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/display-action.vue
@@ -0,0 +1,91 @@
+<template>
+  <!-- 分辨率 -->
+  <a-space>
+    <span class="display-size-label">分辨率</span>
+    <a-select v-model="displaySize"
+              class="display-size-input"
+              placeholder="请选择分辨率"
+              :options="toOptions(screenResolutionKey)"
+              allow-create />
+  </a-space>
+  <!-- 按钮 -->
+  <a-space class="action-bar-content-footer">
+    <a-button type="primary"
+              size="small"
+              @click="fitOnce">
+      临时自适应
+    </a-button>
+    <a-button type="primary"
+              size="small"
+              @click="setDisplaySize">
+      设置
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'displayAction'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
+  import { ref, onMounted } from 'vue';
+  import { useDictStore } from '@/store';
+  import { getDisplaySize } from '@/views/terminal/types/utils';
+  import { screenResolutionKey, fitDisplayValue } from '@/views/terminal/types/const';
+
+  const { toOptions, getDictValue } = useDictStore();
+
+  const props = defineProps<{
+    session: IGuacdSession;
+  }>();
+  const emits = defineEmits(['close']);
+
+  const displaySize = ref(fitDisplayValue);
+
+  // 临时自适应
+  const fitOnce = () => {
+    props.session.displayHandler?.fit(true);
+    emits('close');
+  };
+
+  // 设置显示大小
+  const setDisplaySize = () => {
+    const displayHandler = props.session.displayHandler;
+    if (!displayHandler) {
+      return;
+    }
+    if (displaySize.value === fitDisplayValue) {
+      // 设置自适应
+      displayHandler.autoFit = true;
+      displayHandler.fit(true);
+    } else {
+      try {
+        // 获取大小
+        const [width, height] = getDisplaySize(displaySize.value, true);
+        // 取消自适应
+        displayHandler.autoFit = false;
+        // 设置大小
+        displayHandler.resize(width, height);
+      } catch (e) {
+        return;
+      }
+    }
+    emits('close');
+  };
+
+  // 初始化
+  onMounted(() => {
+    if (props.session.displayHandler?.autoFit) {
+      displaySize.value = fitDisplayValue;
+    } else {
+      displaySize.value = `${props.session.displayHandler?.displayWidth || 0}x${props.session.displayHandler?.displayHeight || 0}`;
+    }
+  });
+
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/guacd/actions/info-action.vue b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/info-action.vue
new file mode 100644
index 00000000..a00caf41
--- /dev/null
+++ b/orion-visor-ui/src/views/terminal/components/view/guacd/actions/info-action.vue
@@ -0,0 +1,48 @@
+<template>
+  <a-descriptions size="large"
+                  :label-style="{ display: 'flex', width: '48px' }"
+                  :column="1">
+    <!-- 主机id -->
+    <a-descriptions-item label="主机id">
+      {{ session.info.hostId }}
+    </a-descriptions-item>
+    <!-- 主机名称 -->
+    <a-descriptions-item label="主机名称">
+      {{ session.info.name }}
+    </a-descriptions-item>
+    <!-- 主机地址 -->
+    <a-descriptions-item label="主机地址">
+      <span class="text-copy" @click="copy(session.info.address, true)">
+        {{ session.info.address }}
+      </span>
+    </a-descriptions-item>
+    <!-- 主机端口 -->
+    <a-descriptions-item label="主机端口">
+      {{ session.info.port }}
+    </a-descriptions-item>
+    <!-- 用户名 -->
+    <a-descriptions-item v-if="session.info.username" label="用户名">
+      {{ session.info.username }}
+    </a-descriptions-item>
+  </a-descriptions>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'infoAction'
+  };
+</script>
+
+<script lang="ts" setup>
+  import type { IGuacdSession } from '@/views/terminal/interfaces';
+  import { copy } from '@/hooks/copy';
+
+  const props = defineProps<{
+    session: IGuacdSession;
+  }>();
+
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
index 9408cb95..7d96f1fc 100644
--- a/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/rdp/rdp-action-bar.vue
@@ -25,9 +25,9 @@
                        :show-arrow="false"
                        :content="action.content">
               <a-button class="action-bar-button"
-                        :disabled="action.disabled"
+                        :disabled="!action.enabled()"
                         :type="action.active ? 'primary' : 'secondary'"
-                        @click="toggleClickAction(action.item)">
+                        @click="toggleAction(action.item)">
                 <template #icon>
                   <component :is="action.icon" />
                 </template>
@@ -35,65 +35,28 @@
             </a-tooltip>
           </div>
         </a-space>
+        <!-- 连接信息 -->
+        <div v-if="current === GuacdActionItemKeys.INFO" class="action-bar-content">
+          <info-action :session="session" />
+        </div>
         <!-- 显示设置 -->
-        <div v-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
-          <!-- 分辨率 -->
-          <a-space>
-            <span class="display-size-label">分辨率</span>
-            <a-select v-model="displaySize"
-                      class="display-size-input"
-                      placeholder="请选择分辨率"
-                      :options="toOptions(screenResolutionKey)"
-                      allow-create />
-          </a-space>
-          <!-- 按钮 -->
-          <a-space class="action-bar-content-footer">
-            <a-button type="primary"
-                      size="small"
-                      @click="fitOnce">
-              临时自适应
-            </a-button>
-            <a-button type="primary"
-                      size="small"
-                      @click="setDisplaySize">
-              设置
-            </a-button>
-          </a-space>
+        <div v-else-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
+          <display-action :session="session" @close="close" />
         </div>
         <!-- 组合键 -->
         <div v-else-if="current === GuacdActionItemKeys.COMBINATION_KEY" class="action-bar-content">
-          <a-row :gutter="[12, 12]" wrap>
-            <a-col v-for="item in GuacdCombinationKeyItems"
-                   :key="item.name"
-                   :span="12"
-                   class="combination-key-item"
-                   @click="triggerCombinationKey(item.keys)">
-              <span>{{ item.name }}</span>
-            </a-col>
-          </a-row>
+          <combination-key-action :session="session" @close="close" />
+        </div>
+        <!-- 触发键 -->
+        <div v-else-if="current === GuacdActionItemKeys.TRIGGER_KEY" class="action-bar-content">
+          <trigger-key-action :session="session" />
         </div>
         <!-- 剪切板 -->
         <div v-else-if="current === GuacdActionItemKeys.CLIPBOARD" class="action-bar-content">
-          <a-textarea class="action-bar-clipboard"
-                      v-model="clipboardData"
-                      :ref="setAutoFocus"
-                      placeholder="远程剪切板"
-                      allow-clear />
-          <!-- 按钮 -->
-          <a-space class="action-bar-content-footer">
-            <a-button size="small" @click="clearClipboardData">
-              清空
-            </a-button>
-            <a-button type="primary"
-                      size="small"
-                      :disabled="!clipboardData"
-                      @click="sendClipboardData">
-              发送
-            </a-button>
-          </a-space>
+          <clipboard-action :session="session" @close="close" />
         </div>
-        <!-- 文件上传 -->
-        <div v-else-if="current === GuacdActionItemKeys.UPLOAD" class="action-bar-content">
+        <!-- RDP 文件上传 -->
+        <div v-else-if="current === GuacdActionItemKeys.RDP_UPLOAD" class="action-bar-content">
           <a-upload class="action-bar-upload"
                     v-model:file-list="fileList"
                     :auto-upload="false"
@@ -116,6 +79,8 @@
         </div>
       </template>
     </a-popover>
+    <!-- sftp 上传框 -->
+    <sftp-upload-modal ref="sftpUploadModalRef" :session="session" />
   </div>
 </template>
 
@@ -130,44 +95,31 @@
   import type { IRdpSession } from '@/views/terminal/interfaces';
   import {
     TerminalStatus,
-    GuacdCombinationKeyItems,
     GuacdActionItemKeys,
     RdpActionBarItems,
-    screenResolutionKey,
-    fitDisplayValue, ActionBarPosition
+    ActionBarPosition, TerminalSessionTypes
   } from '@/views/terminal/types/const';
   import { computed, ref, watch, onMounted } from 'vue';
-  import { setAutoFocus } from '@/utils/dom';
   import { saveAs } from 'file-saver';
-  import { readText } from '@/hooks/copy';
-  import { useTerminalStore, useDictStore } from '@/store';
-  import useGuacdActionBar from '@/views/terminal/types/use-guacd-action-bar';
+  import { useTerminalStore } from '@/store';
   import useVisible from '@/hooks/visible';
+  import InfoAction from '../guacd/actions/info-action.vue';
+  import DisplayAction from '../guacd/actions/display-action.vue';
+  import TriggerKeyAction from '../guacd/actions/trigger-key-action.vue';
+  import ClipboardAction from '../guacd/actions/clipboard-action.vue';
+  import CombinationKeyAction from '../guacd/actions/combination-key-action.vue';
+  import SftpUploadModal from '@/views/terminal/components/view/sftp/sftp-upload-modal.vue';
 
   const props = defineProps<{
     session: IRdpSession;
     direction: string;
   }>();
 
-  const { preference, transferManager } = useTerminalStore();
-  const { toOptions, getDictValue } = useDictStore();
+  const { hosts, preference, openSession, reOpenSession, transferManager } = useTerminalStore();
   const { visible, setVisible } = useVisible();
 
-  const {
-    displaySize,
-    clipboardData,
-    fitOnce,
-    setDisplaySize,
-    triggerCombinationKey,
-    sendClipboardData,
-    clearClipboardData,
-    disconnect,
-  } = useGuacdActionBar({
-    session: props.session,
-    setVisible,
-  });
-
   const current = ref('');
+  const sftpUploadModalRef = ref();
   const fileList = ref<FileItem[]>([]);
 
   const actions = computed(() => {
@@ -178,7 +130,17 @@
       return {
         ...item,
         active: current.value === key,
-        disabled: (key === GuacdActionItemKeys.DISPLAY || key === GuacdActionItemKeys.SAVE_RDP || GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.CLOSE) ? false : !props.session.isWriteable(),
+        enabled: () => {
+          if (key === GuacdActionItemKeys.DISPLAY || key === GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.RECONNECT || key === GuacdActionItemKeys.SAVE_RDP || key === GuacdActionItemKeys.CLOSE) {
+            return true;
+          } else if (key === GuacdActionItemKeys.OPEN_SFTP || key === GuacdActionItemKeys.SFTP_UPLOAD) {
+            // 支持 SFTP 协议
+            if (!hosts.hostList.find(s => s.id === props.session.info.hostId)?.types?.includes?.(TerminalSessionTypes.SFTP.protocol)) {
+              return false;
+            }
+          }
+          return props.session.isWriteable();
+        }
       };
     });
   });
@@ -189,31 +151,22 @@
       return;
     }
     // 重新触发点击
-    toggleClickAction(current.value);
+    toggleAction(current.value);
   });
 
   // 触发 action
-  const toggleClickAction = (key: string) => {
-    if (key === GuacdActionItemKeys.DISPLAY) {
-      // 显示设置
-      current.value = GuacdActionItemKeys.DISPLAY;
-      if (props.session.displayHandler?.autoFit) {
-        displaySize.value = fitDisplayValue;
-      } else {
-        displaySize.value = `${props.session.displayHandler?.displayWidth || 0}x${props.session.displayHandler?.displayHeight || 0}`;
-      }
-    } else if (key === GuacdActionItemKeys.COMBINATION_KEY) {
-      // 组合键
-      current.value = GuacdActionItemKeys.COMBINATION_KEY;
-    } else if (key === GuacdActionItemKeys.CLIPBOARD) {
-      // 剪切板
-      current.value = GuacdActionItemKeys.CLIPBOARD;
-      readText(false)
-        .then(s => clipboardData.value = s)
-        .catch(() => clipboardData.value = '');
-    } else if (key === GuacdActionItemKeys.UPLOAD) {
-      // 文件上传
-      current.value = GuacdActionItemKeys.UPLOAD;
+  const toggleAction = (key: string) => {
+    if (key === GuacdActionItemKeys.OPEN_SFTP) {
+      // 打开 SFTP 会话
+      openSession(hosts.hostList.find(s => s.id === props.session.info.hostId) as any, TerminalSessionTypes.SFTP);
+      setVisible(false);
+    } else if (key === GuacdActionItemKeys.SFTP_UPLOAD) {
+      // 打开 SFTP 上传
+      sftpUploadModalRef.value.open('/');
+      setVisible(false);
+    } else if (key === GuacdActionItemKeys.RDP_UPLOAD) {
+      // RDP 文件上传
+      current.value = GuacdActionItemKeys.RDP_UPLOAD;
       fileList.value = [];
     } else if (key === GuacdActionItemKeys.SAVE_RDP) {
       // 保存 rdp 文件
@@ -221,9 +174,14 @@
     } else if (key === GuacdActionItemKeys.DISCONNECT) {
       // 断开连接
       disconnect();
+    } else if (key === GuacdActionItemKeys.RECONNECT) {
+      // 重新连接
+      reconnect();
     } else if (key === GuacdActionItemKeys.CLOSE) {
       // 关闭工具栏
       setVisible(false);
+    } else {
+      current.value = key;
     }
   };
 
@@ -256,6 +214,29 @@
     fileList.value = [];
   };
 
+  // 关闭会话
+  const disconnect = () => {
+    props.session.disconnect();
+    setVisible(false);
+  };
+
+  // 关闭会话
+  const reconnect = () => {
+    const session = props.session;
+    // 断开连接
+    session.disconnect();
+    // 重新连接
+    if (session.state.canReconnect) {
+      reOpenSession(session.sessionKey);
+    }
+    setVisible(false);
+  };
+
+  // 关闭
+  const close = () => {
+    setVisible(false);
+  };
+
   // 设置选中
   onMounted(() => {
     if (actions.value?.length) {
diff --git a/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
index 90992586..d3f978ab 100644
--- a/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
+++ b/orion-visor-ui/src/views/terminal/components/view/vnc/vnc-action-bar.vue
@@ -25,9 +25,9 @@
                        :show-arrow="false"
                        :content="action.content">
               <a-button class="action-bar-button"
-                        :disabled="action.disabled"
+                        :disabled="!action.enabled()"
                         :type="action.active ? 'primary' : 'secondary'"
-                        @click="toggleClickAction(action.item)">
+                        @click="toggleAction(action.item)">
                 <template #icon>
                   <component :is="action.icon" />
                 </template>
@@ -35,65 +35,35 @@
             </a-tooltip>
           </div>
         </a-space>
+        <!-- 连接信息 -->
+        <div v-if="current === GuacdActionItemKeys.INFO" class="action-bar-content">
+          <info-action :session="session" />
+        </div>
         <!-- 显示设置 -->
-        <div v-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
-          <!-- 分辨率 -->
-          <a-space>
-            <span class="display-size-label">分辨率</span>
-            <a-select v-model="displaySize"
-                      class="display-size-input"
-                      placeholder="请选择分辨率"
-                      :options="toOptions(screenResolutionKey)"
-                      allow-create />
-          </a-space>
-          <!-- 按钮 -->
-          <a-space class="action-bar-content-footer">
-            <a-button type="primary"
-                      size="small"
-                      @click="fitOnce">
-              临时自适应
-            </a-button>
-            <a-button type="primary"
-                      size="small"
-                      @click="setDisplaySize">
-              设置
-            </a-button>
-          </a-space>
+        <div v-else-if="current === GuacdActionItemKeys.DISPLAY" class="action-bar-content">
+          <display-action ref="display"
+                          :session="session"
+                          @close="close" />
         </div>
         <!-- 组合键 -->
         <div v-else-if="current === GuacdActionItemKeys.COMBINATION_KEY" class="action-bar-content">
-          <a-row :gutter="[12, 12]" wrap>
-            <a-col v-for="item in GuacdCombinationKeyItems"
-                   :key="item.name"
-                   :span="12"
-                   class="combination-key-item"
-                   @click="triggerCombinationKey(item.keys)">
-              <span>{{ item.name }}</span>
-            </a-col>
-          </a-row>
+          <combination-key-action :session="session"
+                                  @close="close" />
+        </div>
+        <!-- 触发键 -->
+        <div v-else-if="current === GuacdActionItemKeys.TRIGGER_KEY" class="action-bar-content">
+          <trigger-key-action :session="session" />
         </div>
         <!-- 剪切板 -->
         <div v-else-if="current === GuacdActionItemKeys.CLIPBOARD" class="action-bar-content">
-          <a-textarea class="action-bar-clipboard"
-                      v-model="clipboardData"
-                      :ref="setAutoFocus"
-                      placeholder="远程剪切板"
-                      allow-clear />
-          <!-- 按钮 -->
-          <a-space class="action-bar-content-footer">
-            <a-button size="small" @click="clearClipboardData">
-              清空
-            </a-button>
-            <a-button type="primary"
-                      size="small"
-                      :disabled="!clipboardData"
-                      @click="sendClipboardData">
-              发送
-            </a-button>
-          </a-space>
+          <clipboard-action ref="clipboard"
+                            :session="session"
+                            @close="close" />
         </div>
       </template>
     </a-popover>
+    <!-- sftp 上传框 -->
+    <sftp-upload-modal ref="sftpUploadModalRef" :session="session" />
   </div>
 </template>
 
@@ -107,43 +77,31 @@
   import type { IVncSession } from '@/views/terminal/interfaces';
   import {
     TerminalStatus,
-    GuacdCombinationKeyItems,
     GuacdActionItemKeys,
     VncActionBarItems,
-    screenResolutionKey,
-    fitDisplayValue, ActionBarPosition,
+    ActionBarPosition,
+    TerminalSessionTypes,
   } from '@/views/terminal/types/const';
   import { computed, ref, watch, onMounted } from 'vue';
-  import { setAutoFocus } from '@/utils/dom';
-  import { readText } from '@/hooks/copy';
-  import { useTerminalStore, useDictStore } from '@/store';
-  import useGuacdActionBar from '@/views/terminal/types/use-guacd-action-bar';
+  import { useTerminalStore } from '@/store';
   import useVisible from '@/hooks/visible';
+  import InfoAction from '../guacd/actions/info-action.vue';
+  import DisplayAction from '../guacd/actions/display-action.vue';
+  import ClipboardAction from '../guacd/actions/clipboard-action.vue';
+  import TriggerKeyAction from '../guacd/actions/trigger-key-action.vue';
+  import CombinationKeyAction from '../guacd/actions/combination-key-action.vue';
+  import SftpUploadModal from '@/views/terminal/components/view/sftp/sftp-upload-modal.vue';
 
   const props = defineProps<{
     session: IVncSession;
     direction: string;
   }>();
 
-  const { preference } = useTerminalStore();
-  const { toOptions, getDictValue } = useDictStore();
+  const { hosts, preference, openSession, reOpenSession } = useTerminalStore();
   const { visible, setVisible } = useVisible();
 
-  const {
-    displaySize,
-    clipboardData,
-    fitOnce,
-    setDisplaySize,
-    triggerCombinationKey,
-    sendClipboardData,
-    clearClipboardData,
-    disconnect,
-  } = useGuacdActionBar({
-    session: props.session,
-    setVisible,
-  });
-
   const current = ref('');
+  const sftpUploadModalRef = ref();
 
   const actions = computed(() => {
     return VncActionBarItems.filter(item => {
@@ -153,7 +111,16 @@
       return {
         ...item,
         active: current.value === key,
-        disabled: (key === GuacdActionItemKeys.DISPLAY || GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.CLOSE) ? false : !props.session.isWriteable(),
+        enabled: () => {
+          if (key === GuacdActionItemKeys.DISPLAY || key === GuacdActionItemKeys.DISCONNECT || key === GuacdActionItemKeys.RECONNECT || key === GuacdActionItemKeys.CLOSE) {
+            return true;
+          } else if (key === GuacdActionItemKeys.OPEN_SFTP || key === GuacdActionItemKeys.SFTP_UPLOAD) {
+            if (!hosts.hostList.find(s => s.id === props.session.info.hostId)?.types?.includes?.(TerminalSessionTypes.SFTP.protocol)) {
+              return false;
+            }
+          }
+          return props.session.isWriteable();
+        }
       };
     });
   });
@@ -163,38 +130,57 @@
     if (!val) {
       return;
     }
-    // 重新触发点击
-    toggleClickAction(current.value);
+    // 重新触发
+    toggleAction(current.value);
   });
 
   // 触发 action
-  const toggleClickAction = (key: string) => {
-    if (key === GuacdActionItemKeys.DISPLAY) {
-      // 显示设置
-      current.value = GuacdActionItemKeys.DISPLAY;
-      if (props.session.displayHandler?.autoFit) {
-        displaySize.value = fitDisplayValue;
-      } else {
-        displaySize.value = `${props.session.displayHandler?.displayWidth || 0}x${props.session.displayHandler?.displayHeight || 0}`;
-      }
-    } else if (key === GuacdActionItemKeys.COMBINATION_KEY) {
-      // 组合键
-      current.value = GuacdActionItemKeys.COMBINATION_KEY;
-    } else if (key === GuacdActionItemKeys.CLIPBOARD) {
-      // 剪切板
-      current.value = GuacdActionItemKeys.CLIPBOARD;
-      readText(false)
-        .then(s => clipboardData.value = s)
-        .catch(() => clipboardData.value = '');
+  const toggleAction = (key: string) => {
+    if (key === GuacdActionItemKeys.OPEN_SFTP) {
+      // 打开 SFTP 会话
+      openSession(hosts.hostList.find(s => s.id === props.session.info.hostId) as any, TerminalSessionTypes.SFTP);
+      setVisible(false);
+    } else if (key === GuacdActionItemKeys.SFTP_UPLOAD) {
+      // 打开 SFTP 上传
+      sftpUploadModalRef.value.open('/');
+      setVisible(false);
     } else if (key === GuacdActionItemKeys.DISCONNECT) {
       // 断开连接
       disconnect();
+    } else if (key === GuacdActionItemKeys.RECONNECT) {
+      // 重新连接
+      reconnect();
     } else if (key === GuacdActionItemKeys.CLOSE) {
       // 关闭工具栏
       setVisible(false);
+    } else {
+      current.value = key;
     }
   };
 
+  // 关闭会话
+  const disconnect = () => {
+    props.session.disconnect();
+    setVisible(false);
+  };
+
+  // 关闭会话
+  const reconnect = () => {
+    const session = props.session;
+    // 断开连接
+    session.disconnect();
+    // 重新连接
+    if (session.state.canReconnect) {
+      reOpenSession(session.sessionKey);
+    }
+    setVisible(false);
+  };
+
+  // 关闭
+  const close = () => {
+    setVisible(false);
+  };
+
   // 设置选中
   onMounted(() => {
     if (actions.value?.length) {
diff --git a/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts b/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts
deleted file mode 100644
index 731dd0e1..00000000
--- a/orion-visor-ui/src/views/terminal/types/use-guacd-action-bar.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ref } from 'vue';
-import type { IGuacdSession } from '../interfaces';
-import { fitDisplayValue } from './const';
-import { getDisplaySize } from './utils';
-
-// guacd 工具栏配置
-export interface UseGuacdActionBarOptions {
-  session: IGuacdSession;
-  setVisible: (visible: boolean) => void;
-}
-
-// 使用主机配置表单
-export default function useGuacdActionBar(options: UseGuacdActionBarOptions) {
-  const { session, setVisible } = options;
-
-  const displaySize = ref(fitDisplayValue);
-  const clipboardData = ref('');
-
-  // 临时自适应
-  const fitOnce = () => {
-    session.displayHandler?.fit(true);
-    setVisible(false);
-  };
-
-  // 设置显示大小
-  const setDisplaySize = () => {
-    const displayHandler = session.displayHandler;
-    if (!displayHandler) {
-      return;
-    }
-    if (displaySize.value === fitDisplayValue) {
-      // 设置自适应
-      displayHandler.autoFit = true;
-      displayHandler.fit(true);
-    } else {
-      try {
-        // 获取大小
-        const [width, height] = getDisplaySize(displaySize.value, true);
-        // 取消自适应
-        displayHandler.autoFit = false;
-        // 设置大小
-        displayHandler.resize(width, height);
-      } catch (e) {
-        return;
-      }
-    }
-    setVisible(false);
-  };
-
-  // 触发组合键
-  const triggerCombinationKey = (keys: Array<number>) => {
-    session.sendKeys(keys);
-    setVisible(false);
-  };
-
-  // 发送剪切板数据
-  const sendClipboardData = () => {
-    // 粘贴
-    session.paste(clipboardData.value);
-    setVisible(false);
-  };
-
-  // 清空剪切板数据
-  const clearClipboardData = () => {
-    clipboardData.value = '';
-  };
-
-  // 关闭会话
-  const disconnect = () => {
-    session.disconnect();
-    setVisible(false);
-  };
-
-  return {
-    displaySize,
-    clipboardData,
-    fitOnce,
-    setDisplaySize,
-    triggerCombinationKey,
-    sendClipboardData,
-    clearClipboardData,
-    disconnect,
-  };
-}

From 2e36d0f44b9512339dc7020ea637dd7784a6efa1 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 00:26:55 +0800
Subject: [PATCH 27/31] =?UTF-8?q?:zap:=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

---
 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 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.4.1</revision>
+        <revision>2.4.2</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
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 @@
     </modules>
 
     <properties>
-        <revision>2.4.1</revision>
+        <revision>2.4.2</revision>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
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);

From 7a3580936f887643cc0b1903b97a314fe49aea83 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 11:43:17 +0800
Subject: [PATCH 28/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/mysql/Dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
index 185e2137..b28498a8 100644
--- a/docker/mysql/Dockerfile
+++ b/docker/mysql/Dockerfile
@@ -11,11 +11,4 @@ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
 COPY ./mysql/my.cnf /etc/mysql/conf.d/my.cnf
 
 # 复制初始化脚本
-COPY ./mysql/sql /tmp
-
-# 设置初始化脚本
-RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \
-    cat /tmp/init-2-schema-tables.sql >> /tmp/init.sql && \
-    cat /tmp/init-3-schema-quartz.sql >> /tmp/init.sql && \
-    cat /tmp/init-4-data.sql >> /tmp/init.sql && \
-    cp /tmp/init.sql /docker-entrypoint-initdb.d
+COPY ./mysql/sql/init-*.sql /docker-entrypoint-initdb.d

From 8ebc3ee3b2dfd9db36dd9c373905796da761a4d4 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 16:04:28 +0800
Subject: [PATCH 29/31] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/mysql/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
index b28498a8..79874967 100644
--- a/docker/mysql/Dockerfile
+++ b/docker/mysql/Dockerfile
@@ -11,4 +11,4 @@ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
 COPY ./mysql/my.cnf /etc/mysql/conf.d/my.cnf
 
 # 复制初始化脚本
-COPY ./mysql/sql/init-*.sql /docker-entrypoint-initdb.d
+COPY ./mysql/sql/init-*.sql /docker-entrypoint-initdb.d/

From 3123a89d133d97e3a8b15cd9d5a1a02ed4c3ae47 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 16:06:23 +0800
Subject: [PATCH 30/31] =?UTF-8?q?:zap:=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/docker-build.sh  | 2 +-
 docker/project-build.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index 2b686207..9c6b8e66 100644
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -7,7 +7,7 @@ set -e
 source ./project-build.sh "$@"
 
 # 版本号
-version=2.test
+version=2.4.2
 # 是否推送镜像
 push_image=false
 # 是否构建 latest
diff --git a/docker/project-build.sh b/docker/project-build.sh
index d264304a..7a94559f 100644
--- a/docker/project-build.sh
+++ b/docker/project-build.sh
@@ -4,7 +4,7 @@ set -e
 # DockerContext: orion-visor
 
 # 版本号
-version=2.test
+version=2.4.2
 # 是否构建 service
 export build_service=false
 # 是否构建 ui

From 9f379546cbb155c1986d3b59fc9be77946c66574 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 9 Jul 2025 16:31:05 +0800
Subject: [PATCH 31/31] =?UTF-8?q?:zap:=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-upgrade.sh | 49 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/docker-upgrade.sh b/docker-upgrade.sh
index 590118a3..9996bf96 100644
--- a/docker-upgrade.sh
+++ b/docker-upgrade.sh
@@ -1,16 +1,51 @@
 #!/bin/bash
 
-# 停止并移除现有容器
-docker compose down --remove-orphans
+# 初始化标志变量
+PULL_IMAGES=false
+DEMO_MODE=false
 
-if [ "$1" == "demo" ]; then
-    # 设置 DEMO_MODE 环境变量为 true
+# 解析命令行参数
+for arg in "$@"
+do
+    case $arg in
+        --pull)
+        PULL_IMAGES=true
+        shift
+        ;;
+        --demo)
+        DEMO_MODE=true
+        shift
+        ;;
+        *)
+        echo "Unknown argument: $arg"
+        exit 1
+        ;;
+    esac
+done
+
+# 停止并移除现有容器
+echo "Stopping all services..."
+docker compose down --remove-orphans
+echo "Stopped all services..."
+
+# 拉取镜像
+if [ "$PULL_IMAGES" = true ]; then
+    echo "Pulling latest images..."
+    docker compose pull
+    echo "Pulled latest images..."
+fi
+
+if [ "$DEMO_MODE" = true ]; then
+    # 启用 demo 模式
     export DEMO_MODE=true
     echo "Starting services for demo mode..."
+
     # 启动指定的服务
-    docker compose up -d --pull --remove-orphans mysql redis ui service guacd adminer
+    docker compose up -d --remove-orphans mysql redis ui service guacd adminer
+    echo "Started services for demo mode..."
 else
+    # 启动所有服务
     echo "Starting all services..."
-    # 正常启动所有服务
-    docker compose up -d --pull --remove-orphans
+    docker compose up -d --remove-orphans
+    echo "Started all services..."
 fi