From ece0bbdcef1a03484f774828ab1a70fe9f984359 Mon Sep 17 00:00:00 2001
From: mofeng <mofeng654321@hotmail.com>
Date: Wed, 28 Jan 2026 21:44:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20rustdesk=20?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=89=8D=E7=AB=AF=E6=A0=A1=E9=AA=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=85=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/i18n/en-US.ts          |  4 ++--
 web/src/i18n/zh-CN.ts          |  4 ++--
 web/src/views/SettingsView.vue | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/web/src/i18n/en-US.ts b/web/src/i18n/en-US.ts
index 5cd71156..7454257c 100644
--- a/web/src/i18n/en-US.ts
+++ b/web/src/i18n/en-US.ts
@@ -750,10 +750,10 @@ export default {
       serverSettings: 'Server Settings',
       rendezvousServer: 'ID Server',
       rendezvousServerPlaceholder: 'hbbs.example.com:21116',
-      rendezvousServerHint: 'Configure your RustDesk server address',
+      rendezvousServerHint: 'Configure your RustDesk server address (port optional, defaults to 21116)',
       relayServer: 'Relay Server',
       relayServerPlaceholder: 'hbbr.example.com:21117',
-      relayServerHint: 'Relay server address, auto-derived from ID server if empty',
+      relayServerHint: 'Relay server address (port optional, defaults to 21117). Auto-derived if empty',
       relayKey: 'Relay Key',
       relayKeyPlaceholder: 'Enter relay server key',
       relayKeySet: '••••••••',
diff --git a/web/src/i18n/zh-CN.ts b/web/src/i18n/zh-CN.ts
index d5069fe2..b355355a 100644
--- a/web/src/i18n/zh-CN.ts
+++ b/web/src/i18n/zh-CN.ts
@@ -750,10 +750,10 @@ export default {
       serverSettings: '服务器设置',
       rendezvousServer: 'ID 服务器',
       rendezvousServerPlaceholder: 'hbbs.example.com:21116',
-      rendezvousServerHint: '请配置您的 RustDesk 服务器地址',
+      rendezvousServerHint: '请配置您的 RustDesk 服务器地址（端口可省略，默认 21116）',
       relayServer: '中继服务器',
       relayServerPlaceholder: 'hbbr.example.com:21117',
-      relayServerHint: '中继服务器地址，留空则自动从 ID 服务器推导',
+      relayServerHint: '中继服务器地址（端口可省略，默认 21117），留空则自动从 ID 服务器推导',
       relayKey: '中继密钥',
       relayKeyPlaceholder: '输入中继服务器密钥',
       relayKeySet: '••••••••',
diff --git a/web/src/views/SettingsView.vue b/web/src/views/SettingsView.vue
index 8d87bfc0..a5254f18 100644
--- a/web/src/views/SettingsView.vue
+++ b/web/src/views/SettingsView.vue
@@ -933,6 +933,13 @@ async function loadRustdeskPassword() {
   }
 }
 
+function normalizeRustdeskServer(value: string, defaultPort: number): string | undefined {
+  const trimmed = value.trim()
+  if (!trimmed) return undefined
+  if (trimmed.includes(':')) return trimmed
+  return `${trimmed}:${defaultPort}`
+}
+
 // Web server config functions
 async function loadWebServerConfig() {
   try {
@@ -978,10 +985,15 @@ async function saveRustdeskConfig() {
   loading.value = true
   saved.value = false
   try {
+    const rendezvousServer = normalizeRustdeskServer(
+      rustdeskLocalConfig.value.rendezvous_server,
+      21116,
+    )
+    const relayServer = normalizeRustdeskServer(rustdeskLocalConfig.value.relay_server, 21117)
     await rustdeskConfigApi.update({
       enabled: rustdeskLocalConfig.value.enabled,
-      rendezvous_server: rustdeskLocalConfig.value.rendezvous_server || undefined,
-      relay_server: rustdeskLocalConfig.value.relay_server || undefined,
+      rendezvous_server: rendezvousServer,
+      relay_server: relayServer,
       relay_key: rustdeskLocalConfig.value.relay_key || undefined,
     })
     await loadRustdeskConfig()