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] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=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());
         // 编码设置