GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-31 01:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复 rustdesk 扩展前端校验逻辑，自动补全端口

Browse Source
This commit is contained in:
mofeng
2026-01-28 21:44:45 +08:00
parent 2dc055a5b2
commit ece0bbdcef
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/i18n/en-US.ts
View File

@@ -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: '••••••••',

4
web/src/i18n/zh-CN.ts
View File

@@ -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: '••••••••',

16
web/src/views/SettingsView.vue
View File

@@ -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()