mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-02-01 02:21:53 +08:00
fix: 修复 rustdesk 扩展前端校验逻辑,自动补全端口
This commit is contained in:
@@ -750,10 +750,10 @@ export default {
|
|||||||
serverSettings: 'Server Settings',
|
serverSettings: 'Server Settings',
|
||||||
rendezvousServer: 'ID Server',
|
rendezvousServer: 'ID Server',
|
||||||
rendezvousServerPlaceholder: 'hbbs.example.com:21116',
|
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',
|
relayServer: 'Relay Server',
|
||||||
relayServerPlaceholder: 'hbbr.example.com:21117',
|
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',
|
relayKey: 'Relay Key',
|
||||||
relayKeyPlaceholder: 'Enter relay server key',
|
relayKeyPlaceholder: 'Enter relay server key',
|
||||||
relayKeySet: '••••••••',
|
relayKeySet: '••••••••',
|
||||||
|
|||||||
@@ -750,10 +750,10 @@ export default {
|
|||||||
serverSettings: '服务器设置',
|
serverSettings: '服务器设置',
|
||||||
rendezvousServer: 'ID 服务器',
|
rendezvousServer: 'ID 服务器',
|
||||||
rendezvousServerPlaceholder: 'hbbs.example.com:21116',
|
rendezvousServerPlaceholder: 'hbbs.example.com:21116',
|
||||||
rendezvousServerHint: '请配置您的 RustDesk 服务器地址',
|
rendezvousServerHint: '请配置您的 RustDesk 服务器地址(端口可省略,默认 21116)',
|
||||||
relayServer: '中继服务器',
|
relayServer: '中继服务器',
|
||||||
relayServerPlaceholder: 'hbbr.example.com:21117',
|
relayServerPlaceholder: 'hbbr.example.com:21117',
|
||||||
relayServerHint: '中继服务器地址,留空则自动从 ID 服务器推导',
|
relayServerHint: '中继服务器地址(端口可省略,默认 21117),留空则自动从 ID 服务器推导',
|
||||||
relayKey: '中继密钥',
|
relayKey: '中继密钥',
|
||||||
relayKeyPlaceholder: '输入中继服务器密钥',
|
relayKeyPlaceholder: '输入中继服务器密钥',
|
||||||
relayKeySet: '••••••••',
|
relayKeySet: '••••••••',
|
||||||
|
|||||||
@@ -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
|
// Web server config functions
|
||||||
async function loadWebServerConfig() {
|
async function loadWebServerConfig() {
|
||||||
try {
|
try {
|
||||||
@@ -978,10 +985,15 @@ async function saveRustdeskConfig() {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
saved.value = false
|
saved.value = false
|
||||||
try {
|
try {
|
||||||
|
const rendezvousServer = normalizeRustdeskServer(
|
||||||
|
rustdeskLocalConfig.value.rendezvous_server,
|
||||||
|
21116,
|
||||||
|
)
|
||||||
|
const relayServer = normalizeRustdeskServer(rustdeskLocalConfig.value.relay_server, 21117)
|
||||||
await rustdeskConfigApi.update({
|
await rustdeskConfigApi.update({
|
||||||
enabled: rustdeskLocalConfig.value.enabled,
|
enabled: rustdeskLocalConfig.value.enabled,
|
||||||
rendezvous_server: rustdeskLocalConfig.value.rendezvous_server || undefined,
|
rendezvous_server: rendezvousServer,
|
||||||
relay_server: rustdeskLocalConfig.value.relay_server || undefined,
|
relay_server: relayServer,
|
||||||
relay_key: rustdeskLocalConfig.value.relay_key || undefined,
|
relay_key: rustdeskLocalConfig.value.relay_key || undefined,
|
||||||
})
|
})
|
||||||
await loadRustdeskConfig()
|
await loadRustdeskConfig()
|
||||||
|
|||||||
Reference in New Issue
Block a user