flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-16 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复ssh_config中Host存在其他字符时第一次连接失败

Browse Source
This commit is contained in:
Kairlec
2025-01-06 10:25:21 +08:00
committed by hstyi
parent 89fa153c1e
commit 7f40a67c28
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/app/termora/SshClients.kt
View File

@@ -20,6 +20,7 @@ import java.net.InetSocketAddress
import java.net.Proxy import java.net.Proxy
import java.time.Duration import java.time.Duration
import kotlin.math.max import kotlin.math.max
import org.apache.sshd.client.config.hosts.HostConfigEntryResolver
object SshClients { object SshClients {
private val timeout = Duration.ofSeconds(30) private val timeout = Duration.ofSeconds(30)
@@ -83,6 +84,8 @@ object SshClients {
builder.forwardingFilter(AcceptAllForwardingFilter.INSTANCE) builder.forwardingFilter(AcceptAllForwardingFilter.INSTANCE)
} }
builder.hostConfigEntryResolver(HostConfigEntryResolver.EMPTY)
val sshClient = builder.build() as JGitSshClient val sshClient = builder.build() as JGitSshClient
val heartbeatInterval = max(host.options.heartbeatInterval, 3) val heartbeatInterval = max(host.options.heartbeatInterval, 3)
CoreModuleProperties.HEARTBEAT_INTERVAL.set(sshClient, Duration.ofSeconds(heartbeatInterval.toLong())) CoreModuleProperties.HEARTBEAT_INTERVAL.set(sshClient, Duration.ofSeconds(heartbeatInterval.toLong()))