chore(deps): bump org.glassfish.jaxb:jaxb-runtime from 2.3.3 to 4.0.6

Bumps org.glassfish.jaxb:jaxb-runtime from 2.3.3 to 4.0.6.

---
updated-dependencies:
- dependency-name: org.glassfish.jaxb:jaxb-runtime
  dependency-version: 4.0.6
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/linux.yml

@@ -3,8 +3,8 @@ name: Linux
 on: [ push, pull_request ]
 
 env:
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 21.0.7
+  JBR_PATCH: b1038.58
 
 jobs:
   build:

.github/workflows/osx.yml

@@ -8,15 +8,15 @@ env:
   # 只有发布版本时才需要公证
   TERMORA_MAC_NOTARY: "${{ startsWith(github.event.head_commit.message, 'release: ') && github.repository == 'TermoraDev/termora' }}"
   TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE: ${{ secrets.TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE }}
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 21.0.7
+  JBR_PATCH: b1038.58
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-15-intel, macos-latest ]
+        os: [ macos-15, macos-13 ]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/windows.yml

@@ -3,8 +3,8 @@ name: Windows
 on: [ push, pull_request ]
 
 env:
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 21.0.7
+  JBR_PATCH: b1038.58
 
 jobs:
   build:

VERSION

@@ -1 +1 @@
-2.0.0-beta.15
+2.0.0-beta.14

build.gradle.kts

@@ -339,7 +339,6 @@ tasks.register<Exec>("jlink") {
         "java.security.jgss",
         "jdk.crypto.ec",
         "jdk.unsupported",
-        "jdk.httpserver",
     )
 
     commandLine(

gradle/libs.versions.toml

@@ -1,50 +1,50 @@
 [versions]
-kotlin = "2.3.0"
+kotlin = "2.2.20"
 slf4j = "2.0.17"
 pty4j = "0.13.10"
 tinylog = "2.7.0"
 kotlinx-coroutines = "1.10.2"
-flatlaf = "3.7"
+flatlaf = "3.6.1"
 kotlinx-serialization-json = "1.9.0"
-commons-codec = "1.20.0"
-commons-lang3 = "3.20.0"
+commons-codec = "1.19.0"
+commons-lang3 = "3.18.0"
 commons-csv = "1.14.1"
 commons-net = "3.12.0"
-commons-text = "1.15.0"
+commons-text = "1.14.0"
 commons-compress = "1.28.0"
 commons-vfs2 = "2.10.0"
 swingx = "1.6.5-1"
 jgoodies-forms = "1.9.0"
 jfa = "1.2.0"
-oshi = "6.9.1"
+oshi = "6.9.0"
 versioncompare = "1.4.1"
-jna = "5.18.1"
+jna = "5.17.0"
 jSystemThemeDetector = "3.9.1"
-commons-io = "2.21.0"
+commons-io = "2.20.0"
 jbr-api = "17.1.10.1"
 hutool = "5.8.40"
 jsch = "2.27.3"
-okhttp = "5.3.0"
+okhttp = "5.1.0"
 sshj = "0.39.0"
 sshd-core = "2.15.0"
-jgit = "7.4.0.202509020913-r"
-commonmark = "0.27.0"
+jgit = "7.2.0.202503040940-r"
+commonmark = "0.26.0"
 jnafilechooser = "1.1.2"
 xodus = "2.0.1"
 bip39 = "1.0.9"
 colorpicker = "2.0.1"
-rhino = "1.9.0"
-delight-rhino-sandbox = "0.2.1"
-testcontainers = "2.0.3"
-mixpanel = "1.7.0"
-jSerialComm = "2.11.4"
+rhino = "1.8.0"
+delight-rhino-sandbox = "0.0.17"
+testcontainers = "1.21.3"
+mixpanel = "1.5.3"
+jSerialComm = "2.11.2"
 ini4j = "0.5.5-2"
 restart4j = "0.0.1"
 eddsa = "0.3.0"
-exposed = "1.0.0-rc-4"
+exposed = "1.0.0-rc-1"
 h2 = "2.3.232"
 sqlite = "3.50.3.0"
-jug = "5.2.0"
+jug = "5.1.0"
 semver4j = "6.0.0"
 jsvg = "2.0.0"
 dom4j = "2.2.0"
@@ -70,7 +70,7 @@ flatlafextras = { group = "com.formdev", name = "flatlaf-extras", version.ref =
 flatlafswingx = { module = "com.formdev:flatlaf-swingx", version.ref = "flatlaf" }
 testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version.ref = "testcontainers" }
 testcontainers = { module = "org.testcontainers:testcontainers" }
-testcontainers-junit-jupiter = { module = "org.testcontainers:testcontainers-junit-jupiter" }
+testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter" }
 swingx = { module = "org.swinglabs.swingx:swingx-all", version.ref = "swingx" }
 jgoodies-forms = { module = "com.jgoodies:jgoodies-forms", version.ref = "jgoodies-forms" }
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }

plugins/cos/build.gradle.kts

@@ -8,7 +8,7 @@ project.version = "0.0.4"
 
 dependencies {
     testImplementation(kotlin("test"))
-    implementation("com.qcloud:cos_api:5.6.260.1")
+    implementation("com.qcloud:cos_api:5.6.255")
     compileOnly(project(":"))
 }
 

plugins/editor/build.gradle.kts

@@ -10,7 +10,7 @@ project.version = "0.0.8"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.fifesoft:rsyntaxtextarea:3.6.1")
+    implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
     implementation("com.fifesoft:languagesupport:3.4.0")
     implementation("com.fifesoft:autocomplete:3.3.2")
 }

plugins/ftp/build.gradle.kts

@@ -7,7 +7,7 @@ project.version = "0.0.2"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("org.apache.commons:commons-pool2:2.13.0")
+    implementation("org.apache.commons:commons-pool2:2.12.1")
     testImplementation(project(":"))
 }
 

plugins/geo/build.gradle.kts

@@ -7,9 +7,9 @@ project.version = "0.0.8"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.maxmind.geoip2:geoip2:5.0.0")
+    implementation("com.maxmind.geoip2:geoip2:4.4.0")
     // https://github.com/hstyi/geolite2
-    implementation("com.github.hstyi:geolite2:v1.0-202510270056")
+    implementation("com.github.hstyi:geolite2:v1.0-202508180058")
 }
 
 apply(from = "$rootDir/plugins/common.gradle.kts")

plugins/oss/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     implementation("com.aliyun.oss:aliyun-sdk-oss:3.18.3")
     implementation("javax.xml.bind:jaxb-api:2.3.1")
     implementation("javax.activation:activation:1.1.1")
-    implementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")
+    implementation("org.glassfish.jaxb:jaxb-runtime:4.0.6")
     compileOnly(project(":"))
 }
 

plugins/s3/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     testImplementation(libs.testcontainers.junit.jupiter)
     testImplementation(project(":"))
 
-    implementation("io.minio:minio:8.6.0")
+    implementation("io.minio:minio:8.5.17")
     compileOnly(project(":"))
 }
 

plugins/serial/build.gradle.kts

@@ -10,7 +10,7 @@ project.version = "0.0.5"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.fazecast:jSerialComm:2.11.4")
+    implementation("com.fazecast:jSerialComm:2.11.2")
 }
 
 apply(from = "$rootDir/plugins/common.gradle.kts")

plugins/smb/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
 }
 
-project.version = "0.0.4"
+project.version = "0.0.3"
 
 dependencies {
     testImplementation(kotlin("test"))

plugins/smb/src/main/kotlin/app/termora/plugins/smb/SMBHostOptionsPane.kt

@@ -42,7 +42,6 @@ class SMBHostOptionsPane : OptionsPane() {
             sftpDefaultDirectory = sftpOption.defaultDirectoryField.text,
             extras = mutableMapOf(
                 "smb.share" to generalOption.shareTextField.text,
-                "smb.domain" to generalOption.domainTextField.text,
             )
         )
 
@@ -67,7 +66,6 @@ class SMBHostOptionsPane : OptionsPane() {
         generalOption.remarkTextArea.text = host.remark
         generalOption.passwordTextField.text = host.authentication.password
         generalOption.shareTextField.text = host.options.extras["smb.share"] ?: StringUtils.EMPTY
-        generalOption.domainTextField.text = host.options.extras["smb.domain"] ?: StringUtils.EMPTY
 
         sftpOption.defaultDirectoryField.text = host.options.sftpDefaultDirectory
     }
@@ -116,7 +114,6 @@ class SMBHostOptionsPane : OptionsPane() {
         val nameTextField = OutlineTextField(128)
         val shareTextField = OutlineTextField(256)
         val usernameTextField = OutlineComboBox<String>()
-        val domainTextField = OutlineTextField(128)
         val hostTextField = OutlineTextField(255)
         val passwordTextField = OutlinePasswordField(255)
         val remarkTextArea = FixedLengthTextArea(512)
@@ -191,9 +188,7 @@ class SMBHostOptionsPane : OptionsPane() {
                 .add(portTextField).xy(7, rows).apply { rows += step }
 
                 .add("${I18n.getString("termora.new-host.general.username")}:").xy(1, rows)
-                .add(usernameTextField).xy(3, rows)
-                .add("${SMBI18n.getString("termora.plugins.smb.domain")}:").xy(5, rows)
-                .add(domainTextField).xy(7, rows).apply { rows += step }
+                .add(usernameTextField).xyw(3, rows, 5).apply { rows += step }
 
                 .add("${I18n.getString("termora.new-host.general.password")}:").xy(1, rows)
                 .add(passwordTextField).xyw(3, rows, 5).apply { rows += step }

plugins/smb/src/main/kotlin/app/termora/plugins/smb/SMBProtocolProvider.kt

@@ -30,7 +30,6 @@ class SMBProtocolProvider private constructor() : TransferProtocolProvider {
         val client = SMBClient()
         val host = requester.host
         val connection = client.connect(host.host, host.port)
-        val domain = host.options.extras["smb.domain"] ?: StringUtils.EMPTY
         val session = when (host.username) {
             "Guest" -> connection.authenticate(AuthenticationContext.guest())
             "Anonymous" -> connection.authenticate(AuthenticationContext.anonymous())
@@ -38,7 +37,7 @@ class SMBProtocolProvider private constructor() : TransferProtocolProvider {
                 AuthenticationContext(
                     host.username,
                     host.authentication.password.toCharArray(),
-                    domain.ifBlank { null }
+                    null
                 )
             )
         }

plugins/smb/src/main/resources/i18n/messages.properties

@@ -1,2 +1 @@
 termora.plugins.smb.share=Share name
-termora.plugins.smb.domain=Domain

plugins/smb/src/main/resources/i18n/messages_zh_CN.properties

@@ -1,3 +1 @@
 termora.plugins.smb.share=共享名称
-termora.plugins.smb.domain=域名
-

plugins/smb/src/main/resources/i18n/messages_zh_TW.properties

@@ -1,3 +1 @@
 termora.plugins.smb.share=共享名稱
-termora.plugins.smb.domain=網域
-

src/main/kotlin/app/termora/ApplicationInitializr.kt

@@ -50,17 +50,6 @@ class ApplicationInitializr {
             }
         }
 
-        // https://github.com/TermoraDev/termora/issues/1254
-        if (System.getProperty(FlatSystemProperties.UI_SCALE).isNullOrBlank()) {
-            val scale = System.getenv("TERMORA_SCALE")
-            if (scale.isNullOrBlank().not()) {
-                if (NumberUtils.toDouble(scale, -1.0) > 0) {
-                    System.setProperty(FlatSystemProperties.UI_SCALE_ENABLED, "true")
-                    System.setProperty(FlatSystemProperties.UI_SCALE, scale)
-                }
-            }
-        }
-
         // 启动
         val runtime = measureTimeMillis { ApplicationRunner().run() }
         val log = LoggerFactory.getLogger(javaClass)

src/main/kotlin/app/termora/ApplicationRunner.kt

@@ -10,11 +10,15 @@ import com.formdev.flatlaf.extras.FlatInspector
 import com.formdev.flatlaf.ui.FlatTableCellBorder
 import com.formdev.flatlaf.util.SystemInfo
 import com.jthemedetecor.OsThemeDetector
+import com.mixpanel.mixpanelapi.ClientDelivery
+import com.mixpanel.mixpanelapi.MessageBuilder
+import com.mixpanel.mixpanelapi.MixpanelAPI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
 import org.apache.commons.lang3.LocaleUtils
 import org.apache.commons.lang3.SystemUtils
+import org.json.JSONObject
 import org.slf4j.LoggerFactory
 import java.awt.*
 import java.awt.desktop.AppReopenedEvent
@@ -365,8 +369,61 @@ class ApplicationRunner {
         if (Application.isUnknownVersion()) {
             return
         }
-        MixpanelService.getInstance().push("launch")
+
+        swingCoroutineScope.launch(Dispatchers.IO) {
+            try {
+                val properties = JSONObject()
+                properties.put("os", SystemUtils.OS_NAME)
+                if (SystemInfo.isLinux) {
+                    properties.put("platform", "Linux")
+                } else if (SystemInfo.isWindows) {
+                    properties.put("platform", "Windows")
+                } else if (SystemInfo.isMacOS) {
+                    properties.put("platform", "macOS")
+                }
+                properties.put("version", Application.getVersion())
+                properties.put("language", Locale.getDefault().toString())
+                val message = MessageBuilder("0871335f59ee6d0eb246b008a20f9d1c")
+                    .event(getAnalyticsUserID(), "launch", properties)
+                val delivery = ClientDelivery()
+                delivery.addMessage(message)
+                val endpoints = listOf(
+                    "https://api-eu.mixpanel.com",
+                    "https://api-in.mixpanel.com",
+                    "https://api.mixpanel.com",
+                    "http://api.mixpanel.com",
+                )
+                for (endpoint in endpoints) {
+                    try {
+                        MixpanelAPI(
+                            "$endpoint/track",
+                            "$endpoint/engage",
+                            "$endpoint/groups"
+                        ).deliver(delivery, true)
+                        break
+                    } catch (e: Exception) {
+                        if (log.isErrorEnabled) {
+                            log.error(e.message, e)
+                        }
+                        continue
+                    }
+                }
+            } catch (e: Exception) {
+                if (log.isErrorEnabled) {
+                    log.error(e.message, e)
+                }
+            }
+        }
     }
 
+    private fun getAnalyticsUserID(): String {
+        val properties = DatabaseManager.getInstance().properties
+        var id = properties.getString("AnalyticsUserID")
+        if (id.isNullOrBlank()) {
+            id = randomUUID()
+            properties.putString("AnalyticsUserID", id)
+        }
+        return id
+    }
 
 }

src/main/kotlin/app/termora/Laf.kt

@@ -874,8 +874,6 @@ class NordDarkLaf : FlatPropertiesLaf("Nord Dark", Properties().apply {
             TerminalColor.Basic.SELECTION_BACKGROUND,
             TerminalColor.Cursor.BACKGROUND -> 0xeceff4
 
-            TerminalColor.Basic.SELECTION_FOREGROUND -> 0x3b4252
-
             TerminalColor.Basic.FOREGROUND -> 0xd8dee9
 
 

src/main/kotlin/app/termora/MixpanelService.kt

@@ -1,85 +0,0 @@
-package app.termora
-
-import app.termora.database.DatabaseManager
-import com.formdev.flatlaf.util.SystemInfo
-import com.mixpanel.mixpanelapi.ClientDelivery
-import com.mixpanel.mixpanelapi.MessageBuilder
-import com.mixpanel.mixpanelapi.MixpanelAPI
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.apache.commons.lang3.SystemUtils
-import org.json.JSONObject
-import org.slf4j.LoggerFactory
-import java.util.*
-
-internal class MixpanelService private constructor() {
-    companion object {
-        private val log = LoggerFactory.getLogger(MixpanelService::class.java)
-
-        fun getInstance(): MixpanelService {
-            return ApplicationScope.forApplicationScope().getOrCreate(MixpanelService::class) { MixpanelService() }
-        }
-    }
-
-    fun push(event: String, extras: Map<String, String> = emptyMap()) {
-        swingCoroutineScope.launch(Dispatchers.IO) {
-            try {
-                val properties = JSONObject()
-                for (entry in extras) {
-                    properties.put(entry.key, entry.value)
-                }
-                properties.put("os", SystemUtils.OS_NAME)
-                if (SystemInfo.isLinux) {
-                    properties.put("platform", "Linux")
-                } else if (SystemInfo.isWindows) {
-                    properties.put("platform", "Windows")
-                } else if (SystemInfo.isMacOS) {
-                    properties.put("platform", "macOS")
-                }
-                properties.put("version", Application.getVersion())
-                properties.put("language", Locale.getDefault().toString())
-                val message = MessageBuilder("0871335f59ee6d0eb246b008a20f9d1c")
-                    .event(getAnalyticsUserID(), event, properties)
-                val delivery = ClientDelivery()
-                delivery.addMessage(message)
-                val endpoints = listOf(
-                    "https://api-eu.mixpanel.com",
-                    "https://api-in.mixpanel.com",
-                    "https://api.mixpanel.com",
-                    "http://api.mixpanel.com",
-                )
-                for (endpoint in endpoints) {
-                    try {
-                        MixpanelAPI(
-                            "$endpoint/track",
-                            "$endpoint/engage",
-                            "$endpoint/groups"
-                        ).deliver(delivery, true)
-                        break
-                    } catch (e: Exception) {
-                        if (log.isErrorEnabled) {
-                            log.error(e.message, e)
-                        }
-                        continue
-                    }
-                }
-            } catch (e: Exception) {
-                if (log.isErrorEnabled) {
-                    log.error(e.message, e)
-                }
-            }
-        }
-    }
-
-
-    private fun getAnalyticsUserID(): String {
-        val properties = DatabaseManager.getInstance().properties
-        var id = properties.getString("AnalyticsUserID")
-        if (id.isNullOrBlank()) {
-            id = randomUUID()
-            properties.putString("AnalyticsUserID", id)
-        }
-        return id
-    }
-
-}

src/main/kotlin/app/termora/OpenHostActionEvent.kt

@@ -3,5 +3,5 @@ package app.termora
 import app.termora.actions.AnActionEvent
 import java.util.*
 
-class OpenHostActionEvent(source: Any, val host: Host, event: EventObject, val tabIndex: Int = -1) :
+class OpenHostActionEvent(source: Any, val host: Host, event: EventObject) :
     AnActionEvent(source, String(), event)

src/main/kotlin/app/termora/PtyHostTerminalTab.kt

@@ -179,7 +179,7 @@ abstract class PtyHostTerminalTab(
 
         val tab = createReconnectTerminalTab()
         manager.addTerminalTab(index, tab, true)
-        manager.closeTerminalTab(this, disposable = true, reconnect = true)
+        manager.closeTerminalTab(this, true)
 
         if (tab is HostTerminalTab) {
             tab.start()

src/main/kotlin/app/termora/SettingsOptionsPane.kt

@@ -547,7 +547,6 @@ class SettingsOptionsPane : OptionsPane() {
 
             rightClickComboBox.addItem("Copy")
             rightClickComboBox.addItem("CopyAndPaste")
-            rightClickComboBox.addItem("Nothing")
 
             rightClickComboBox.selectedItem = terminalSetting.rightClick
 
@@ -577,8 +576,6 @@ class SettingsOptionsPane : OptionsPane() {
                         text = I18n.getString("termora.settings.terminal.right-click.copy")
                     } else if (value == "CopyAndPaste") {
                         text = I18n.getString("termora.settings.terminal.right-click.copy-and-paste")
-                    }else if (value == "Nothing") {
-                        text = I18n.getString("termora.settings.terminal.right-click.nothing")
                     }
                     return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus)
                 }

src/main/kotlin/app/termora/TerminalTabbed.kt

@@ -141,28 +141,25 @@ class TerminalTabbed(
 
     }
 
-    private fun removeTabAt(index: Int, disposable: Boolean = true, reconnect: Boolean = false) {
+    private fun removeTabAt(index: Int, disposable: Boolean = true) {
         if (tabbedPane.isTabClosable(index)) {
             val tab = tabs[index]
 
             // 询问是否可以关闭
             if (disposable) {
-                // 如果是重连接，那么直接关闭不进行任何形式的询问
-                if (reconnect.not()) {
-                    // 如果开启了关闭确认，那么直接询问用户
-                    if (appearance.confirmTabClose) {
-                        if (OptionPane.showConfirmDialog(
-                                windowScope.window,
-                                I18n.getString("termora.tabbed.tab.close-prompt"),
-                                messageType = JOptionPane.QUESTION_MESSAGE,
-                                optionType = JOptionPane.OK_CANCEL_OPTION
-                            ) != JOptionPane.OK_OPTION
-                        ) {
-                            return
-                        }
-                    } else if (!tab.willBeClose()) { // 如果没有开启则询问用户
+                // 如果开启了关闭确认，那么直接询问用户
+                if (appearance.confirmTabClose) {
+                    if (OptionPane.showConfirmDialog(
+                            windowScope.window,
+                            I18n.getString("termora.tabbed.tab.close-prompt"),
+                            messageType = JOptionPane.QUESTION_MESSAGE,
+                            optionType = JOptionPane.OK_CANCEL_OPTION
+                        ) != JOptionPane.OK_OPTION
+                    ) {
                         return
                     }
+                } else if (!tab.willBeClose()) { // 如果没有开启则询问用户
+                    return
                 }
             }
 
@@ -236,7 +233,7 @@ class TerminalTabbed(
             if (tab is HostTerminalTab) {
                 actionManager
                     .getAction(OpenHostAction.OPEN_HOST)
-                    .actionPerformed(OpenHostActionEvent(this, tab.host, evt, tabIndex + 1))
+                    .actionPerformed(OpenHostActionEvent(this, tab.host, evt))
             }
         }
 
@@ -364,7 +361,7 @@ class TerminalTabbed(
         }
     }
 
-    override fun indexOfTerminalTab(tab: TerminalTab): Int {
+    override fun indexOfTerminalTab(tab: TerminalTab):Int {
         return tabbedPane.indexOfComponent(tab.getJComponent())
     }
 
@@ -454,10 +451,10 @@ class TerminalTabbed(
         }
     }
 
-    override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean, reconnect: Boolean) {
+    override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean) {
         for (i in 0 until tabs.size) {
             if (tabs[i] == tab) {
-                removeTabAt(i, disposable, reconnect)
+                removeTabAt(i, disposable)
                 break
             }
         }

src/main/kotlin/app/termora/TerminalTabbedManager.kt

@@ -6,7 +6,7 @@ interface TerminalTabbedManager {
     fun getSelectedTerminalTab(): TerminalTab?
     fun getTerminalTabs(): List<TerminalTab>
     fun setSelectedTerminalTab(tab: TerminalTab)
-    fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true, reconnect: Boolean = false)
+    fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true)
     fun refreshTerminalTabs()
     fun indexOfTerminalTab(tab: TerminalTab): Int
 }

src/main/kotlin/app/termora/WelcomePanel.kt

@@ -170,18 +170,16 @@ class WelcomePanel() : JPanel(BorderLayout()), Disposable, TerminalTab, DataProv
 
         filterableTreeModel.addFilter(object : Filter {
             override fun filter(node: Any): Boolean {
-                val text = searchTextField.text.trim()
+                val text = searchTextField.text
                 if (text.isBlank()) return true
                 if (node !is HostTreeNode) return false
                 if (node is TeamTreeNode || node.id == "0") return true
-                return node.host.name.contains(text, ignoreCase = true)
-                        || node.host.host.contains(text, ignoreCase = true)
-                        || node.host.username.contains(text, ignoreCase = true)
-                        || node.host.remark.contains(text, ignoreCase = true)
+                return node.host.name.contains(text) || node.host.host.contains(text)
+                        || node.host.username.contains(text)
             }
 
             override fun canFilter(): Boolean {
-                return searchTextField.text.trim().isNotBlank()
+                return searchTextField.text.isNotBlank()
             }
 
         })
@@ -266,4 +264,4 @@ class WelcomePanel() : JPanel(BorderLayout()), Disposable, TerminalTab, DataProv
     }
 
 
-}
+}

src/main/kotlin/app/termora/account/AccountOption.kt

@@ -1,7 +1,6 @@
 package app.termora.account
 
 import app.termora.*
-import app.termora.Application.ohMyJson
 import app.termora.OptionsPane.Companion.FORM_MARGIN
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
@@ -9,36 +8,21 @@ import app.termora.database.DatabaseManager
 import app.termora.plugin.internal.extension.DynamicExtensionHandler
 import com.jgoodies.forms.builder.FormBuilder
 import com.jgoodies.forms.layout.FormLayout
-import com.sun.net.httpserver.HttpServer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.swing.Swing
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.Serializable
-import org.apache.commons.codec.binary.Hex
-import org.apache.commons.io.IOUtils
-import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.time.DateFormatUtils
-import org.jdesktop.swingx.JXBusyLabel
 import org.jdesktop.swingx.JXHyperlink
-import org.slf4j.LoggerFactory
 import java.awt.BorderLayout
-import java.awt.CardLayout
-import java.net.InetSocketAddress
 import java.net.URI
-import java.net.URLEncoder
 import java.util.*
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
 import javax.swing.*
 import kotlin.time.Duration.Companion.milliseconds
 
 
 class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
-    companion object {
-        private val log = LoggerFactory.getLogger(AccountOption::class.java)
-    }
 
     private val owner get() = SwingUtilities.getWindowAncestor(this)
     private val databaseManager get() = DatabaseManager.getInstance()
@@ -46,32 +30,19 @@ class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
     private val accountProperties get() = AccountProperties.getInstance()
     private val userInfoPanel = JPanel(BorderLayout())
     private val lastSynchronizationOnLabel = JLabel()
-    private val serverManager get() = ServerManager.getInstance()
-    private val cardLayout = CardLayout()
-    private val contentPanel = JPanel(cardLayout)
-    private val loginPanel = JPanel(BorderLayout())
-    private val busyLabel = JXBusyLabel()
-    private var httpServer: HttpServer? = null
 
     init {
         initView()
         initEvents()
     }
 
+
     private fun initView() {
         refreshUserInfoPanel()
-        refreshLoginPanel()
-
-        contentPanel.add(userInfoPanel, "UserInfo")
-        contentPanel.add(loginPanel, "Login")
-
-        cardLayout.show(contentPanel, "UserInfo")
-
-        add(contentPanel, BorderLayout.CENTER)
-
-
+        add(userInfoPanel, BorderLayout.CENTER)
     }
 
+
     private fun initEvents() {
         // 服务器签名发生变更
         DynamicExtensionHandler.getInstance()
@@ -128,7 +99,11 @@ class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
             planBox.add(Box.createHorizontalStrut(16))
             val upgrade = JXHyperlink(object : AnAction(I18n.getString("termora.settings.account.upgrade")) {
                 override fun actionPerformed(evt: AnActionEvent) {
-                    Application.browse(URI.create("${accountManager.getServer()}/v1/client/redirect?to=upgrade&version=${Application.getVersion()}"))
+                    if (I18n.isChinaMainland()) {
+                        Application.browse(URI.create("https://www.termora.cn/pricing?version=${Application.getVersion()}"))
+                    } else {
+                        Application.browse(URI.create("https://www.termora.app/pricing?version=${Application.getVersion()}"))
+                    }
                 }
             })
             upgrade.isFocusable = false
@@ -170,29 +145,6 @@ class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
             .build()
     }
 
-    private fun getLoginComponent(): JComponent {
-        val layout = FormLayout(
-            "default:grow",
-            "pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref"
-        )
-
-        val cancelBtn = JXHyperlink(object : AnAction(I18n.getString("termora.cancel")) {
-            override fun actionPerformed(evt: AnActionEvent) {
-                httpServer?.stop(0)
-                cardLayout.show(contentPanel, "UserInfo")
-            }
-        })
-
-        val tipLabel = JLabel(I18n.getString("termora.settings.account.wait-login"))
-        tipLabel.foreground = UIManager.getColor("TextField.placeholderForeground")
-
-        return FormBuilder.create().layout(layout).debug(false).padding("10dlu,0,0,0")
-            .add(busyLabel).xy(1, 1, "center, fill")
-            .add(tipLabel).xy(1, 3, "center, fill")
-            .add(cancelBtn).xy(1, 5, "center, fill")
-            .build()
-    }
-
     private fun createActionPanel(isFreePlan: Boolean): JComponent {
         val actionBox = Box.createHorizontalBox()
         actionBox.add(Box.createHorizontalGlue())
@@ -267,139 +219,11 @@ class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
         return actionBox
     }
 
-    private fun showLoginPanel() {
-        refreshLoginPanel()
-        busyLabel.isBusy = true
-        cardLayout.show(contentPanel, "Login")
-    }
-
     private fun onLogin() {
-        httpServer?.stop(0)
-
         val dialog = LoginServerDialog(owner)
         dialog.isVisible = true
-        val server = dialog.server ?: return
-
-        showLoginPanel()
-
-        onLogin(server)
     }
 
-
-    private fun onLogin(server: Server) {
-
-        val httpServer = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
-            .apply { httpServer = this }
-        val future = processLogin(server, httpServer)
-
-        val loginJob = swingCoroutineScope.launch(Dispatchers.IO) {
-            try {
-                val loginResult = future.get(5, TimeUnit.MINUTES)
-                serverManager.login(server, loginResult.refreshToken, loginResult.password)
-            } catch (e: Exception) {
-                if (log.isErrorEnabled) log.error(e.message, e)
-                withContext(Dispatchers.Swing) {
-                    OptionPane.showMessageDialog(
-                        owner,
-                        StringUtils.defaultIfBlank(
-                            e.message ?: StringUtils.EMPTY,
-                            I18n.getString("termora.settings.account.login-failed")
-                        ),
-                        messageType = JOptionPane.ERROR_MESSAGE,
-                    )
-                }
-            } finally {
-                withContext(Dispatchers.Swing) { cardLayout.show(contentPanel, "UserInfo") }
-                httpServer.stop(0)
-            }
-        }
-
-        Disposer.register(this, object : Disposable {
-            override fun dispose() {
-                loginJob.cancel()
-                httpServer.stop(0)
-            }
-        })
-    }
-
-    override fun dispose() {
-        busyLabel.isBusy = false
-        super.dispose()
-    }
-
-    private fun processLogin(server: Server, httpServer: HttpServer): CompletableFuture<LoginResult> {
-        val keypair = RSA.generateKeyPair(2048)
-        val future = CompletableFuture<LoginResult>()
-
-        httpServer.createContext("/callback") { exchange ->
-            val method = exchange.requestMethod
-            if (method.equals("OPTIONS", ignoreCase = true)) {
-                exchange.responseHeaders.add("Access-Control-Allow-Origin", "*")
-                exchange.responseHeaders.add("Access-Control-Allow-Methods", "POST, OPTIONS")
-                exchange.responseHeaders.add("Access-Control-Allow-Headers", "Content-Type")
-                exchange.sendResponseHeaders(204, -1)
-            } else {
-                var loginResult: LoginResult? = null
-
-                if (method.equals("POST", ignoreCase = true)) {
-                    try {
-                        val text = String(exchange.requestBody.readAllBytes())
-                        loginResult = ohMyJson.decodeFromString<LoginResult>(text)
-
-                        val secretKey = RSA.decrypt(keypair.private, Hex.decodeHex(loginResult.secretKey))
-                        val secretIv = RSA.decrypt(keypair.private, Hex.decodeHex(loginResult.secretIv))
-                        val password = AES.CBC.decrypt(secretKey, secretIv, Hex.decodeHex(loginResult.password))
-                        val refreshToken = AES.CBC.decrypt(
-                            secretKey, secretIv, Hex.decodeHex(loginResult.refreshToken)
-                        )
-                        loginResult = loginResult.copy(
-                            password = String(password),
-                            refreshToken = String(refreshToken)
-                        )
-                    } catch (e: Exception) {
-                        if (log.isErrorEnabled) {
-                            log.error(e.message, e)
-                        }
-                    }
-                }
-
-                val response = "OK".toByteArray()
-                exchange.responseHeaders.add("Access-Control-Allow-Origin", "*")
-                exchange.sendResponseHeaders(200, response.size.toLong())
-                exchange.responseBody.use { it.write(response) }
-
-                if (loginResult != null) {
-                    future.complete(loginResult)
-                }
-            }
-            IOUtils.closeQuietly { exchange.close() }
-        }
-        httpServer.start()
-
-        val sb = StringBuilder()
-        val redirect = StringBuilder()
-        redirect.append("/device?callback=").append("http://127.0.0.1:${httpServer.address.port}/callback")
-        redirect.append("&from=device&publicKey=").append(keypair.public.encoded.toHexString())
-        redirect.append("&format=hex&device=termora&device-version=").append(Application.getVersion())
-
-        sb.append(server.server)
-        sb.append("/v1/client/redirect?to=login&from=device")
-        sb.append("&redirect=").append(URLEncoder.encode(redirect.toString(), Charsets.UTF_8))
-
-        Application.browse(URI.create(sb.toString()))
-
-        return future
-    }
-
-    @Serializable
-    private data class LoginResult(
-        val password: String,
-        val refreshToken: String,
-        val secretKey: String,
-        val secretIv: String,
-    )
-
-
     private fun refreshUserInfoPanel() {
         userInfoPanel.removeAll()
         userInfoPanel.add(getCenterComponent(), BorderLayout.CENTER)
@@ -407,13 +231,6 @@ class AccountOption : JPanel(BorderLayout()), OptionsPane.Option, Disposable {
         userInfoPanel.repaint()
     }
 
-    private fun refreshLoginPanel() {
-        loginPanel.removeAll()
-        loginPanel.add(getLoginComponent(), BorderLayout.CENTER)
-        loginPanel.revalidate()
-        loginPanel.repaint()
-    }
-
     override fun getIcon(isSelected: Boolean): Icon {
         return Icons.user
     }

src/main/kotlin/app/termora/account/LoginServerDialog.kt

@@ -9,6 +9,12 @@ import app.termora.database.DatabaseManager
 import com.formdev.flatlaf.FlatClientProperties
 import com.jgoodies.forms.builder.FormBuilder
 import com.jgoodies.forms.layout.FormLayout
+import kotlinx.coroutines.*
+import kotlinx.coroutines.swing.Swing
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.Request
 import org.apache.commons.lang3.StringUtils
 import org.jdesktop.swingx.JXHyperlink
 import org.slf4j.LoggerFactory
@@ -18,10 +24,12 @@ import java.awt.Window
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 import java.net.URI
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.swing.*
 import javax.swing.event.ListDataEvent
 import javax.swing.event.ListDataListener
 import kotlin.math.max
+import kotlin.time.Duration.Companion.milliseconds
 
 class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
     companion object {
@@ -29,14 +37,18 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
     }
 
     private val serverComboBox = OutlineComboBox<Server>()
+    private val usernameTextField = OutlineTextField(128)
+    private val passwordField = OutlinePasswordField()
+    private val mfaTextField = OutlineTextField(128)
     private val okAction = OkAction(I18n.getString("termora.settings.account.login"))
     private val cancelAction = super.createCancelAction()
     private val cancelButton = super.createJButtonForAction(cancelAction)
+    private val isLoggingIn = AtomicBoolean(false)
     private val singaporeServer =
         Server(I18n.getString("termora.settings.account.server-singapore"), "https://account.termora.app")
     private val chinaServer =
         Server(I18n.getString("termora.settings.account.server-china"), "https://account.termora.cn")
-    var server: Server? = null
+    private val serverManager get() = ServerManager.getInstance()
 
     init {
         isModal = true
@@ -48,10 +60,12 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
         size = Dimension(max(preferredSize.width, UIManager.getInt("Dialog.width") - 250), preferredSize.height)
         setLocationRelativeTo(owner)
 
+        passwordField.putClientProperty(FlatClientProperties.STYLE, mapOf("showCapsLock" to true))
 
         addWindowListener(object : WindowAdapter() {
             override fun windowOpened(e: WindowEvent) {
                 removeWindowListener(this)
+                usernameTextField.requestFocus()
             }
         })
     }
@@ -59,7 +73,7 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
     override fun createCenterPanel(): JComponent {
         val layout = FormLayout(
             "left:pref, $FORM_MARGIN, default:grow, $FORM_MARGIN, pref",
-            "pref, $FORM_MARGIN"
+            "pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN, pref, $FORM_MARGIN"
         )
 
         var rows = 1
@@ -76,6 +90,7 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
             serverComboBox.addItem(Server(server.name, server.server))
         }
 
+        mfaTextField.placeholderText = I18n.getString("termora.settings.account.mfa")
 
         serverComboBox.renderer = object : DefaultListCellRenderer() {
             override fun getListCellRendererComponent(
@@ -138,6 +153,40 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
             }
         }
 
+        val registerAction = object : AnAction(I18n.getString("termora.settings.account.register")) {
+            override fun actionPerformed(evt: AnActionEvent) {
+                val server = serverComboBox.selectedItem as Server?
+                if (server == null) {
+                    serverComboBox.outline = FlatClientProperties.OUTLINE_ERROR
+                    serverComboBox.requestFocusInWindow()
+                    return
+                }
+
+                try {
+                    val text = AccountHttp.execute(
+                        AccountHttp.client, Request.Builder()
+                            .get().url("${server.server}/v1/client/system").build()
+                    )
+                    val json = runCatching { ohMyJson.decodeFromString<JsonObject>(text) }.getOrNull()
+                    val allowRegister = json?.get("register")?.jsonPrimitive?.boolean ?: false
+                    if (allowRegister.not()) {
+                        throw IllegalStateException(I18n.getString("termora.settings.account.not-support-register"))
+                    }
+                    Application.browse(URI.create("${server.server}/v1/client/redirect?to=register&from=${Application.getName()}"))
+                } catch (e: Exception) {
+                    if (log.isErrorEnabled) {
+                        log.error(e.message, e)
+                    }
+                    OptionPane.showMessageDialog(
+                        dialog,
+                        e.message ?: I18n.getString("termora.settings.account.not-support-register"),
+                        messageType = JOptionPane.ERROR_MESSAGE
+                    )
+                }
+            }
+        }
+
+
         fun refreshButton() {
             if (serverComboBox.selectedItem == singaporeServer || serverComboBox.selectedItem == chinaServer || serverComboBox.itemCount < 1) {
                 newAction.name = I18n.getString("termora.welcome.contextmenu.new")
@@ -165,11 +214,21 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
 
         })
 
+        val registerLink = JXHyperlink(registerAction)
+        registerLink.isFocusable = false
+
 
         return FormBuilder.create().layout(layout).debug(false).padding("0dlu, $FORM_MARGIN, 0dlu, $FORM_MARGIN")
             .add("${I18n.getString("termora.settings.account.server")}:").xy(1, rows)
             .add(serverComboBox).xy(3, rows)
             .add(newServer).xy(5, rows).apply { rows += step }
+            .add("${I18n.getString("termora.settings.account")}:").xy(1, rows)
+            .add(usernameTextField).xy(3, rows)
+            .add(registerLink).xy(5, rows).apply { rows += step }
+            .add("${I18n.getString("termora.new-host.general.password")}:").xy(1, rows)
+            .add(passwordField).xy(3, rows).apply { rows += step }
+            .add("MFA:").xy(1, rows)
+            .add(mfaTextField).xy(3, rows).apply { rows += step }
             .build()
     }
 
@@ -256,21 +315,95 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) {
     }
 
     override fun doOKAction() {
+        if (isLoggingIn.get()) return
 
-        server = serverComboBox.selectedItem as? Server
+        val server = serverComboBox.selectedItem as? Server
         if (server == null) {
             serverComboBox.outline = FlatClientProperties.OUTLINE_ERROR
             serverComboBox.requestFocusInWindow()
             return
         }
 
+        if (usernameTextField.text.isBlank()) {
+            usernameTextField.outline = FlatClientProperties.OUTLINE_ERROR
+            usernameTextField.requestFocusInWindow()
+            return
+        } else if (passwordField.password.isEmpty()) {
+            passwordField.outline = FlatClientProperties.OUTLINE_ERROR
+            passwordField.requestFocusInWindow()
+            return
+        }
+
+        if (isLoggingIn.compareAndSet(false, true)) {
+            okAction.isEnabled = false
+            usernameTextField.isEnabled = false
+            passwordField.isEnabled = false
+            mfaTextField.isEnabled = false
+            serverComboBox.isEnabled = false
+            cancelButton.isVisible = false
+            onLogin(server)
+            return
+        }
 
         super.doOKAction()
     }
 
+    private fun onLogin(server: Server) {
+        val job = swingCoroutineScope.launch(Dispatchers.IO) {
+            var c = 0
+            while (isActive) {
+                if (++c > 3) c = 0
+                okAction.name = I18n.getString("termora.settings.account.login") + ".".repeat(c)
+                delay(350.milliseconds)
+            }
+        }
+
+        val loginJob = swingCoroutineScope.launch(Dispatchers.IO) {
+            try {
+                serverManager.login(
+                    server, usernameTextField.text,
+                    String(passwordField.password), mfaTextField.text.trim()
+                )
+                withContext(Dispatchers.Swing) {
+                    super.doOKAction()
+                }
+            } catch (e: Exception) {
+                if (log.isErrorEnabled) log.error(e.message, e)
+                withContext(Dispatchers.Swing) {
+                    OptionPane.showMessageDialog(
+                        this@LoginServerDialog,
+                        StringUtils.defaultIfBlank(
+                            e.message ?: StringUtils.EMPTY,
+                            I18n.getString("termora.settings.account.login-failed")
+                        ),
+                        messageType = JOptionPane.ERROR_MESSAGE,
+                    )
+                }
+            } finally {
+                job.cancel()
+                withContext(Dispatchers.Swing) {
+                    okAction.name = I18n.getString("termora.settings.account.login")
+                    okAction.isEnabled = true
+                    usernameTextField.isEnabled = true
+                    passwordField.isEnabled = true
+                    serverComboBox.isEnabled = true
+                    cancelButton.isVisible = true
+                    mfaTextField.isEnabled = true
+                }
+                isLoggingIn.compareAndSet(true, false)
+            }
+        }
+
+        Disposer.register(disposable, object : Disposable {
+            override fun dispose() {
+                if (loginJob.isActive)
+                    loginJob.cancel()
+            }
+        })
+    }
 
     override fun doCancelAction() {
-        server = null
+        if (isLoggingIn.get()) return
         super.doCancelAction()
     }
 }

src/main/kotlin/app/termora/account/PullService.kt

@@ -67,11 +67,7 @@ class PullService private constructor() : SyncService(), Disposable, Application
     private var lastChangeHash = StringUtils.EMPTY
 
     private fun pullChanges() {
-
-        if (accountManager.isLocally()) {
-            return
-        }
-
+        if (isFreePlan) return
         val hash: String
 
         try {

src/main/kotlin/app/termora/account/ServerManager.kt

@@ -1,10 +1,7 @@
 package app.termora.account
 
-import app.termora.AES
+import app.termora.*
 import app.termora.Application.ohMyJson
-import app.termora.ApplicationScope
-import app.termora.PBKDF2
-import app.termora.RSA
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
@@ -12,6 +9,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.apache.commons.codec.binary.Base64
+import org.apache.commons.codec.digest.DigestUtils
 import java.util.concurrent.atomic.AtomicBoolean
 
 class ServerManager private constructor() {
@@ -30,7 +28,7 @@ class ServerManager private constructor() {
     /**
      * 登录，不报错就是登录成功
      */
-    fun login(server: Server, refreshToken: String, password: String) {
+    fun login(server: Server, username: String, password: String, mfa: String) {
 
         if (accountManager.isLocally().not()) {
             throw IllegalStateException("Already logged in")
@@ -41,25 +39,25 @@ class ServerManager private constructor() {
         }
 
         try {
-            doLogin(server, refreshToken, password)
+            doLogin(server, username, password, mfa)
         } finally {
             isLoggingIn.compareAndSet(true, false)
         }
 
     }
 
-    private fun doLogin(server: Server, refreshToken: String, password: String) {
+    private fun doLogin(server: Server, username: String, password: String, mfa: String) {
         // 服务器信息
         val serverInfo = getServerInfo(server)
 
         // call login
-        val loginResponse = callToken(server, refreshToken)
+        val loginResponse = callLogin(serverInfo, server, username, password, mfa)
 
         // call me
         val meResponse = callMe(server.server, loginResponse.accessToken)
 
         // 解密
-        val salt = "${serverInfo.salt}:${meResponse.email}".toByteArray()
+        val salt = "${serverInfo.salt}:${username}".toByteArray()
         val privateKeySecureKey = PBKDF2.hash(salt, password.toCharArray(), 1024, 256)
         val privateKeySecureIv = PBKDF2.hash(salt, password.toCharArray(), 1024, 128)
         val privateKeyEncoded = AES.CBC.decrypt(
@@ -108,19 +106,29 @@ class ServerManager private constructor() {
         return ohMyJson.decodeFromString<ServerInfo>(AccountHttp.execute(request = request))
     }
 
-    private fun callToken(
+    private fun callLogin(
+        serverInfo: ServerInfo,
         server: Server,
-        refreshToken: String,
+        username: String,
+        password: String,
+        mfa: String
     ): LoginResponse {
-        val body = ohMyJson.encodeToString(mapOf("refreshToken" to refreshToken))
+
+        val passwordHex = DigestUtils.sha256Hex("${serverInfo.salt}:${username}:${password}")
+        val requestBody = ohMyJson.encodeToString(mapOf("email" to username, "password" to passwordHex, "mfa" to mfa))
             .toRequestBody("application/json".toMediaType())
-        val request = Request.Builder().url("${server.server}/v1/token")
-            .header("Authorization", "Bearer $refreshToken")
-            .post(body)
+
+        val request = Request.Builder()
+            .url("${server.server}/v1/login")
+            .post(requestBody)
             .build()
 
         val response = AccountHttp.client.newCall(request).execute()
-        val text = response.use { response.body.use { it.string() } }
+        val text = response.use { response.body.use { it?.string() } }
+
+        if (text == null) {
+            throw ResponseException(response.code, response)
+        }
 
         if (response.isSuccessful.not()) {
             val message = ohMyJson.parseToJsonElement(text).jsonObject["message"]?.jsonPrimitive?.content

src/main/kotlin/app/termora/actions/OpenHostAction.kt

@@ -56,12 +56,7 @@ class OpenHostAction : AnAction() {
 
         if (tab == null) return
 
-        if (evt.tabIndex >= 0) {
-            terminalTabbedManager.addTerminalTab(evt.tabIndex, tab)
-        } else {
-            terminalTabbedManager.addTerminalTab(tab)
-        }
-
+        terminalTabbedManager.addTerminalTab(tab)
         if (tab is PtyHostTerminalTab) {
             tab.start()
         }

src/main/kotlin/app/termora/actions/TerminalCopyAction.kt

@@ -20,10 +20,6 @@ class TerminalCopyAction : AnAction() {
 
     override fun actionPerformed(evt: AnActionEvent) {
         val terminalPanel = evt.getData(DataProviders.TerminalPanel) ?: return
-        val selectionModel = terminalPanel.terminal.getSelectionModel()
-        if (!selectionModel.hasSelection()) {
-            return
-        }
         val text = terminalPanel.copy()
         val systemClipboard = terminalPanel.toolkit.systemClipboard
 
@@ -57,4 +53,4 @@ class TerminalCopyAction : AnAction() {
 
     }
 
-}
+}

src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt

@@ -27,14 +27,12 @@ class KeyboardInteractiveDialog(
         isModal = true
         isResizable = true
         controlsVisible = false
+        title = I18n.getString("termora.new-host.title")
 
         init()
         pack()
         size = Dimension(max(300, size.width), size.height)
 
-        // fix https://github.com/TermoraDev/termora/issues/1311
-        pack()
-
         setLocationRelativeTo(null)
 
     }

src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt

@@ -30,7 +30,6 @@ class TerminalUserInteraction(
                 )
                 dialog.setLocationRelativeTo(owner)
                 dialog.title = instruction ?: name ?: "OTP"
-                dialog.title = StringUtils.defaultIfBlank(dialog.title, "OTP")
                 passwords[i] = dialog.getText()
                 if (passwords[i].isBlank()) {
                     break

src/main/kotlin/app/termora/keymap/KeymapPanel.kt

@@ -29,10 +29,8 @@ class KeymapPanel : JPanel(BorderLayout()) {
     private val copyBtn = JButton(Icons.copy)
     private val renameBtn = JButton(Icons.edit)
     private val deleteBtn = JButton(Icons.delete)
-    private val infoBtn = JButton(Icons.questionMark)
     private val database get() = DatabaseManager.getInstance()
     private val allowKeyCodes = mutableSetOf<Int>()
-    private val owner get() = SwingUtilities.getWindowAncestor(this)
 
     init {
         initView()
@@ -91,8 +89,8 @@ class KeymapPanel : JPanel(BorderLayout()) {
         box.add(copyBtn)
         box.add(renameBtn)
         box.add(deleteBtn)
-        box.add(infoBtn)
         box.add(Box.createHorizontalGlue())
+        box.border = BorderFactory.createEmptyBorder(0, 0, 6, 0)
 
         add(box, BorderLayout.NORTH)
         add(scrollPane, BorderLayout.CENTER)
@@ -107,12 +105,6 @@ class KeymapPanel : JPanel(BorderLayout()) {
             }
         })
 
-        infoBtn.addActionListener {
-            val color = UIManager.getColor("TextField.placeholderForeground")
-            val msg = I18n.getString("termora.settings.keymap.question", color.red, color.green, color.blue)
-            OptionPane.showMessageDialog(owner, msg)
-        }
-
         copyBtn.addActionListener {
             val keymap = getCurrentKeymap()
             if (keymap != null) {

src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt

@@ -287,9 +287,6 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay
 
             typeComboBox.addItem("RSA")
             typeComboBox.addItem("ED25519")
-            typeComboBox.addItem("ECDSA-SHA2-NISTP256")
-            typeComboBox.addItem("ECDSA-SHA2-NISTP384")
-            typeComboBox.addItem("ECDSA-SHA2-NISTP521")
 
             // 默认 RSA
             lengthComboBox.addItem(1024)
@@ -399,12 +396,6 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay
                         lengthComboBox.addItem(1024 * 4)
                         lengthComboBox.addItem(1024 * 8)
                         lengthComboBox.selectedItem = 1024 * 2
-                    } else if (typeComboBox.selectedItem == "ECDSA-SHA2-NISTP256") {
-                        lengthComboBox.addItem(256)
-                    } else if (typeComboBox.selectedItem == "ECDSA-SHA2-NISTP384") {
-                        lengthComboBox.addItem(384)
-                    } else if (typeComboBox.selectedItem == "ECDSA-SHA2-NISTP521") {
-                        lengthComboBox.addItem(521)
                     }
                 }
             }
@@ -422,17 +413,6 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay
             super.doCancelAction()
         }
 
-        private fun genKeyPair(): KeyPair {
-            val keyType = when (typeComboBox.selectedItem) {
-                "ED25519" -> KeyPairProvider.SSH_ED25519
-                "ECDSA-SHA2-NISTP256" -> KeyPairProvider.ECDSA_SHA2_NISTP256
-                "ECDSA-SHA2-NISTP384" -> KeyPairProvider.ECDSA_SHA2_NISTP384
-                "ECDSA-SHA2-NISTP521" -> KeyPairProvider.ECDSA_SHA2_NISTP521
-                else -> KeyPairProvider.SSH_RSA
-            }
-            return KeyUtils.generateKeyPair(keyType, lengthComboBox.selectedItem as Int)
-        }
-
         override fun doOKAction() {
 
             if (ohKeyPair == OhKeyPair.empty) {
@@ -442,7 +422,9 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay
                     return
                 }
 
-                val keyPair = genKeyPair()
+                val keyType = if (typeComboBox.selectedItem == "RSA")
+                    KeyPairProvider.SSH_RSA else KeyPairProvider.SSH_ED25519
+                val keyPair = KeyUtils.generateKeyPair(keyType, lengthComboBox.selectedItem as Int)
                 ohKeyPair = OhKeyPair(
                     id = randomUUID(),
                     name = nameTextField.text,

src/main/kotlin/app/termora/keymgr/OhKeyPairKeyPairProvider.kt

@@ -2,7 +2,6 @@ package app.termora.keymgr
 
 import app.termora.AES.decodeBase64
 import app.termora.RSA
-import org.apache.sshd.common.config.keys.impl.ECDSAPublicKeyEntryDecoder
 import org.apache.sshd.common.keyprovider.AbstractResourceKeyPairProvider
 import org.apache.sshd.common.session.SessionContext
 import org.apache.sshd.common.util.security.eddsa.Ed25519PublicKeyDecoder
@@ -26,8 +25,6 @@ class OhKeyPairKeyPairProvider(private val id: String) : AbstractResourceKeyPair
                 when (ohKeyPair.type) {
                     "RSA" -> RSA.generatePublic(ohKeyPair.publicKey.decodeBase64())
                     "ED25519" -> Ed25519PublicKeyDecoder.INSTANCE.generatePublicKey((X509EncodedKeySpec(ohKeyPair.publicKey.decodeBase64())))
-                    "ECDSA-SHA2-NISTP256","ECDSA-SHA2-NISTP384","ECDSA-SHA2-NISTP521" ->
-                        ECDSAPublicKeyEntryDecoder.INSTANCE.generatePublicKey(X509EncodedKeySpec(ohKeyPair.publicKey.decodeBase64()))
                     else -> throw UnsupportedOperationException("${ohKeyPair.type} is not supported")
                 }
             } as PublicKey
@@ -36,8 +33,6 @@ class OhKeyPairKeyPairProvider(private val id: String) : AbstractResourceKeyPair
                 when (ohKeyPair.type) {
                     "RSA" -> RSA.generatePrivate(ohKeyPair.privateKey.decodeBase64())
                     "ED25519" -> Ed25519PublicKeyDecoder.INSTANCE.generatePrivateKey(PKCS8EncodedKeySpec(ohKeyPair.privateKey.decodeBase64()))
-                    "ECDSA-SHA2-NISTP256","ECDSA-SHA2-NISTP384","ECDSA-SHA2-NISTP521" ->
-                        ECDSAPublicKeyEntryDecoder.INSTANCE.generatePrivateKey(PKCS8EncodedKeySpec(ohKeyPair.privateKey.decodeBase64()))
                     else -> throw UnsupportedOperationException("${ohKeyPair.type} is not supported")
                 }
             } as PrivateKey

src/main/kotlin/app/termora/plugin/internal/plugin/PluginPanel.kt

@@ -185,13 +185,6 @@ class PluginPanel(val descriptor: PluginPluginDescriptor) : JPanel(), Disposable
                 }
             }
 
-            MixpanelService.getInstance().push(
-                "uninstall-plugin", mapOf(
-                    "pluginName" to descriptor.plugin.getName(),
-                    "pluginVersion" to descriptor.version.toString(),
-                )
-            )
-
             // 询问是否重启
             TermoraRestarter.getInstance().scheduleRestart(owner)
         } else {
@@ -234,13 +227,6 @@ class PluginPanel(val descriptor: PluginPluginDescriptor) : JPanel(), Disposable
                     }
                 }, button == updateButton)
 
-                MixpanelService.getInstance().push(
-                    "${if (button == installButton) "install" else "update"}-plugin", mapOf(
-                        "pluginName" to descriptor.plugin.getName(),
-                        "pluginVersion" to descriptor.version.toString(),
-                    )
-                )
-
                 withContext(Dispatchers.Swing) {
                     installed.add(descriptor.id)
 

src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt

@@ -10,8 +10,6 @@ import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
-import org.apache.commons.lang3.Strings
-import org.apache.commons.lang3.SystemUtils
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.StringSelection
 import java.net.URI
@@ -66,15 +64,7 @@ internal class RDPProtocolProvider private constructor() : GenericProtocolProvid
         }
 
         val sb = StringBuilder()
-        sb.append("full address:s:")
-        if (SystemUtils.IS_OS_WINDOWS && Strings.CI.contains(host.host, ":")) {
-            var newHost = Strings.CI.removeStart(host.host, "[")
-            newHost = Strings.CI.removeEnd(newHost, "]")
-            sb.append('[').append(newHost).append(']')
-        } else {
-            sb.append(host.host)
-        }
-        sb.append(':').append(host.port).appendLine()
+        sb.append("full address:s:").append(host.host).append(':').append(host.port).appendLine()
         sb.append("username:s:").append(host.username).appendLine()
         val desktop = host.options.extras["desktop"]
         if (desktop.isNullOrBlank().not()) {

src/main/kotlin/app/termora/plugin/internal/ssh/CloneSessionTerminalTabbedContextMenuExtension.kt

@@ -27,14 +27,9 @@ class CloneSessionTerminalTabbedContextMenuExtension private constructor() : Ter
                     cloneSession.addActionListener(object : AnAction() {
                         override fun actionPerformed(evt: AnActionEvent) {
                             val terminalTabbedManager = evt.getData(DataProviders.TerminalTabbedManager) ?: return
-                            val index = terminalTabbedManager.indexOfTerminalTab(tab)
                             val handler = c.copy(channel = null)
                             val newTab = SSHTerminalTab(windowScope, tab.host, handler)
-                            if (index >= 0) {
-                                terminalTabbedManager.addTerminalTab(index + 1, newTab)
-                            } else {
-                                terminalTabbedManager.addTerminalTab(newTab)
-                            }
+                            terminalTabbedManager.addTerminalTab(newTab)
                             newTab.start()
                         }
                     })

src/main/kotlin/app/termora/terminal/ControlSequenceIntroducerProcessor.kt

@@ -332,12 +332,6 @@ class ControlSequenceIntroducerProcessor(terminal: Terminal, reader: TerminalRea
                 var top = sr.getOrElse(0) { 1 }
                 var bottom = sr.getOrElse(1) { terminalModel.getRows() }
 
-                // ";r" https://vt100.net/docs/vt510-rm/DECSTBM.html
-                if (sr.size == 1 && args.startsWith(';')) {
-                    bottom = top
-                    top = 1
-                }
-
                 if (bottom <= top) {
                     if (log.isWarnEnabled) {
                         log.warn("Set Scrolling Region Error. top: $top , bottom: $bottom")

src/main/kotlin/app/termora/terminal/panel/TerminalPanelKeyAdapter.kt

@@ -1,6 +1,5 @@
 package app.termora.terminal.panel
 
-import app.termora.actions.TerminalCopyAction
 import app.termora.keymap.KeyShortcut
 import app.termora.keymap.KeymapManager
 import app.termora.plugin.internal.AltKeyModifier
@@ -72,7 +71,6 @@ class TerminalPanelKeyAdapter(
         }
 
         val keyStroke = KeyStroke.getKeyStrokeForEvent(e)
-        val keymapActions = activeKeymap.getActionIds(KeyShortcut(keyStroke))
         for (action in terminalPanel.getTerminalActions()) {
             if (action.test(keyStroke, e)) {
                 action.actionPerformed(e)
@@ -106,9 +104,7 @@ class TerminalPanelKeyAdapter(
         }
 
         // 如果命中了全局快捷键，那么不处理
-        val copyShortcutWithoutSelection =
-            keymapActions.contains(TerminalCopyAction.COPY) && terminal.getSelectionModel().hasSelection().not()
-        if (keyStroke.modifiers != 0 && keymapActions.isNotEmpty() && !copyShortcutWithoutSelection) {
+        if (keyStroke.modifiers != 0 && activeKeymap.getActionIds(KeyShortcut(keyStroke)).isNotEmpty()) {
             return
         }
 
@@ -163,4 +159,4 @@ class TerminalPanelKeyAdapter(
         return Character.toLowerCase(e.keyCode.toChar())
     }
 
-}
+}

src/main/kotlin/app/termora/terminal/panel/TerminalPanelMouseSelectionAdapter.kt

@@ -53,31 +53,30 @@ class TerminalPanelMouseSelectionAdapter(private val terminalPanel: TerminalPane
         if (SwingUtilities.isRightMouseButton(e)) {
             // 如果有选中并且开启了选中复制，那么右键直接是粘贴
             if (selectionModel.hasSelection() && isSelectCopy.not()) {
-                if (rightClickMode != "Nothing") {
-                    triggerCopyAction(
+                triggerCopyAction(
+                    KeyEvent(
+                        e.component,
+                        KeyEvent.KEY_PRESSED,
+                        e.`when`,
+                        e.modifiersEx,
+                        KeyEvent.VK_C,
+                        'C'
+                    )
+                )
+
+                if (rightClickMode == "CopyAndPaste") {
+                    triggerPasteAction(
                         KeyEvent(
                             e.component,
                             KeyEvent.KEY_PRESSED,
                             e.`when`,
                             e.modifiersEx,
-                            KeyEvent.VK_C,
-                            'C'
+                            KeyEvent.VK_V,
+                            'V'
                         )
                     )
-
-                    if (rightClickMode == "CopyAndPaste") {
-                        triggerPasteAction(
-                            KeyEvent(
-                                e.component,
-                                KeyEvent.KEY_PRESSED,
-                                e.`when`,
-                                e.modifiersEx,
-                                KeyEvent.VK_V,
-                                'V'
-                            )
-                        )
-                    }
                 }
+
             } else {
                 // paste
                 triggerPasteAction(

src/main/kotlin/app/termora/transfer/TransferAnAction.kt

@@ -46,7 +46,6 @@ class TransferAnAction : AnAction(I18n.getString("termora.transport.sftp"), Icon
                 val panel = tabbed.getTransportPanel(i) ?: continue
                 if (panel.host.id == host.id) {
                     tabbed.selectedIndex = i
-                    terminalTabbedManager.setSelectedTerminalTab(sftpTab)
                     return
                 }
             }

src/main/kotlin/app/termora/transfer/TransportContextMenuExtension.kt

@@ -1,7 +1,7 @@
 package app.termora.transfer
 
+import app.termora.WindowScope
 import app.termora.plugin.Extension
-import java.awt.Window
 import java.nio.file.FileSystem
 import java.nio.file.Path
 import javax.swing.JMenuItem
@@ -14,7 +14,7 @@ internal interface TransportContextMenuExtension : Extension {
      * @param fileSystem 为 null 表示可能已经断线，处于不可用状态
      */
     fun createJMenuItem(
-        window: Window,
+        windowScope: WindowScope,
         fileSystem: FileSystem?,
         popupMenu: TransportPopupMenu,
         files: List<Pair<Path, TransportTableModel.Attributes>>

src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt

@@ -108,7 +108,7 @@ internal class TransportPopupMenu(
         for (extension in extensionManager.getExtensions(TransportContextMenuExtension::class.java)) {
             try {
                 val menu = extension.createJMenuItem(
-                    owner,
+                    ApplicationScope.forWindowScope(owner),
                     fileSystem,
                     this,
                     files

src/main/kotlin/app/termora/transfer/internal/sftp/CompressTransportContextMenuExtension.kt

@@ -1,6 +1,7 @@
 package app.termora.transfer.internal.sftp
 
 import app.termora.I18n
+import app.termora.WindowScope
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
 import app.termora.randomUUID
@@ -8,7 +9,6 @@ import app.termora.transfer.*
 import org.apache.commons.lang3.StringUtils
 import org.apache.sshd.common.file.util.MockPath
 import org.apache.sshd.sftp.client.fs.SftpFileSystem
-import java.awt.Window
 import java.nio.file.FileSystem
 import java.nio.file.Path
 import javax.swing.JMenu
@@ -23,7 +23,7 @@ internal class CompressTransportContextMenuExtension private constructor() : Tra
     }
 
     override fun createJMenuItem(
-        window: Window,
+        windowScope: WindowScope,
         fileSystem: FileSystem?,
         popupMenu: TransportPopupMenu,
         files: List<Pair<Path, TransportTableModel.Attributes>>

src/main/kotlin/app/termora/transfer/internal/sftp/ExtractTransportContextMenuExtension.kt

@@ -1,13 +1,13 @@
 package app.termora.transfer.internal.sftp
 
 import app.termora.I18n
+import app.termora.WindowScope
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
 import app.termora.randomUUID
 import app.termora.transfer.*
 import org.apache.commons.lang3.StringUtils
 import org.apache.sshd.sftp.client.fs.SftpFileSystem
-import java.awt.Window
 import java.nio.file.FileSystem
 import java.nio.file.Path
 import javax.swing.JMenu
@@ -21,7 +21,7 @@ internal class ExtractTransportContextMenuExtension private constructor() : Tran
     }
 
     override fun createJMenuItem(
-        window: Window,
+        windowScope: WindowScope,
         fileSystem: FileSystem?,
         popupMenu: TransportPopupMenu,
         files: List<Pair<Path, TransportTableModel.Attributes>>

src/main/kotlin/app/termora/transfer/internal/sftp/RmrfTransportContextMenuExtension.kt

@@ -3,11 +3,11 @@ package app.termora.transfer.internal.sftp
 import app.termora.I18n
 import app.termora.Icons
 import app.termora.OptionPane
+import app.termora.WindowScope
 import app.termora.transfer.TransportContextMenuExtension
 import app.termora.transfer.TransportPopupMenu
 import app.termora.transfer.TransportTableModel
 import org.apache.sshd.sftp.client.fs.SftpFileSystem
-import java.awt.Window
 import java.nio.file.FileSystem
 import java.nio.file.Path
 import javax.swing.JMenuItem
@@ -19,7 +19,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo
     }
 
     override fun createJMenuItem(
-        window: Window,
+        windowScope: WindowScope,
         fileSystem: FileSystem?,
         popupMenu: TransportPopupMenu,
         files: List<Pair<Path, TransportTableModel.Attributes>>
@@ -31,7 +31,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo
         val rmrfMenu = JMenuItem("rm -rf", Icons.warningIntroduction)
         rmrfMenu.addActionListener {
             if (OptionPane.showConfirmDialog(
-                    window,
+                    windowScope.window,
                     I18n.getString("termora.transport.table.contextmenu.rm-warning"),
                     messageType = JOptionPane.ERROR_MESSAGE
                 ) == JOptionPane.YES_OPTION

src/main/resources/i18n/messages.properties

@@ -59,7 +59,6 @@ termora.settings.terminal.hyperlink=Hyperlink
 termora.settings.terminal.select-copy=Select copy
 termora.settings.terminal.right-click=Right click
 termora.settings.terminal.right-click.copy-and-paste=Copy and Paste
-termora.settings.terminal.right-click.nothing=Nothing
 termora.settings.terminal.right-click.copy=${termora.copy}
 termora.settings.terminal.cursor-style=Cursor type
 termora.settings.terminal.cursor-blink=Cursor blink
@@ -90,9 +89,11 @@ termora.settings.plugin.install-from-disk-warning=<b>{0}</b> plugin will have ac
 termora.settings.plugin.not-compatible=The plugin <b>{0}</b> is incompatible with the current version. Please reinstall <b>{0}</b>
 
 termora.settings.account=Account
+termora.settings.account.register=Register
+termora.settings.account.not-support-register=This server does not support account registration
 termora.settings.account.login=Log in
 termora.settings.account.server=Server
-termora.settings.account.wait-login=Waiting for login in the default browser...
+termora.settings.account.mfa=MFA is optional
 termora.settings.account.locally=locally
 termora.settings.account.lifetime=Lifetime
 termora.settings.account.upgrade=Upgrade
@@ -115,7 +116,7 @@ termora.settings.keymap=Keymap
 termora.settings.keymap.shortcut=Shortcut
 termora.settings.keymap.action=Action
 termora.settings.keymap.already-exists=The shortcut [{0}] is already in use by [{1}]
-termora.settings.keymap.question=Select a line, press the <font color=rgb({0},{1},{2})> ⌫ (Backspace)</font> key to remove the shortcut
+
 
 termora.settings.sftp.edit-command=Edit Command
 termora.settings.sftp.db-click-behavior=Double-click

src/main/resources/i18n/messages_ru_RU.properties

@@ -49,26 +49,7 @@ termora.setting.security.enter-password-again=Повторите пароль
 termora.setting.security.password-is-different=Пароли отличаются
 termora.setting.security.mnemonic-note=Сохраните мнемоническую фразу в надежном месте, она может помочь восстановить данные, если вы забудете пароль
 
-termora.settings.account=Учётная запись
-termora.settings.account.login=Войти
-termora.settings.account.server=Сервер
-termora.settings.account.wait-login=Ожидание входа в браузере по умолчанию...
-termora.settings.account.locally=локально
-termora.settings.account.lifetime=Время действия
-termora.settings.account.upgrade=Обновить
-termora.settings.account.verify=Подтвердить
-termora.settings.account.subscription=Подписка
-termora.settings.account.valid-to=Действительна до
-termora.settings.account.synchronization-on=Синхронизация вкл
-termora.settings.account.sync-now = Синхронизировать сейчас
-termora.settings.account.logout = Выйти
-termora.settings.account.logout-confirm = Вы уверены, что хотите выйти?
-termora.settings.account.unsynced-logout-confirm = Несинхронизировано Вы уверены, что хотите выйти?
-termora.settings.account.server-singapore = Сингапур
-termora.settings.account.server-china = Материковый Китай
-termora.settings.account.new-server = Новый сервер
-termora.settings.account.deploy-server = Развернуть
-termora.settings.account.login-failed = Не удалось войти, повторите попытку позже
+
 
 
 termora.settings.terminal=Терминал
@@ -81,7 +62,6 @@ termora.settings.terminal.hyperlink=Ссылки
 termora.settings.terminal.select-copy=Копировать выделенное
 termora.settings.terminal.right-click=правой кнопкой мыши
 termora.settings.terminal.right-click.copy-and-paste=Копировать и вставить
-termora.settings.terminal.right-click.nothing=никто
 termora.settings.terminal.cursor-style=Вид курсора
 termora.settings.terminal.cursor-blink=Мигать курсором
 termora.settings.terminal.local-shell=Локальный терминал
@@ -100,7 +80,7 @@ termora.settings.keymap=Горяиче клавиши
 termora.settings.keymap.shortcut=Комбинация
 termora.settings.keymap.action=Команда
 termora.settings.keymap.already-exists=Комбинация [{0}] уже используется [{1}]
-termora.settings.keymap.question=Выберите строку и нажмите <font color=rgb({0},{1},{2})> ⌫ (клавишу Backspace)</font>, чтобы удалить сочетание клавиш
+
 
 termora.settings.sftp.edit-command=Редактировать команду
 termora.settings.sftp.db-click-behavior=двойной щелчок

src/main/resources/i18n/messages_zh_CN.properties

@@ -73,7 +73,6 @@ termora.settings.terminal.hyperlink=超链接
 termora.settings.terminal.select-copy=选中复制
 termora.settings.terminal.right-click=右键点击
 termora.settings.terminal.right-click.copy-and-paste=复制 & 粘贴
-termora.settings.terminal.right-click.nothing=无操作
 termora.settings.terminal.cursor-style=光标样式
 termora.settings.terminal.cursor-blink=光标闪烁
 termora.settings.terminal.local-shell=本地终端
@@ -104,8 +103,10 @@ termora.settings.plugin.not-compatible=插件 <b>{0}</b> 与当前版本不兼
 
 termora.settings.account=账号
 termora.settings.account.login=登录
+termora.settings.account.register=注册
+termora.settings.account.not-support-register=该服务器不支持注册账号
 termora.settings.account.server=服务器
-termora.settings.account.wait-login=正在等待默认浏览器中登录...
+termora.settings.account.mfa=多因素验证是可选的
 termora.settings.account.locally=本地的
 termora.settings.account.lifetime=长期
 termora.settings.account.verify=验证
@@ -126,7 +127,7 @@ termora.settings.keymap=键盘
 termora.settings.keymap.shortcut=快捷键
 termora.settings.keymap.action=操作
 termora.settings.keymap.already-exists=快捷键 [{0}] 已经被 [{1}] 占用
-termora.settings.keymap.question=选中一行，按下 <font color=rgb({0},{1},{2})> ⌫ (退格键)</font> 移除快捷键
+
 
 termora.settings.sftp.edit-command=编辑命令
 termora.settings.sftp.db-click-behavior=双击行为

src/main/resources/i18n/messages_zh_TW.properties

@@ -55,7 +55,6 @@ termora.settings.keymap=鍵盤
 termora.settings.keymap.shortcut=快捷鍵
 termora.settings.keymap.action=操作
 termora.settings.keymap.already-exists=快捷鍵 [{0}] 已經被 [{1}] 占用
-termora.settings.keymap.question=選取一行，按下 <font color=rgb({0},{1},{2})> ⌫ (退格鍵)</font> 移除快速鍵
 
 termora.settings.sftp.edit-command=編輯命令
 termora.settings.sftp.db-click-behavior=按兩下行為
@@ -85,7 +84,6 @@ termora.settings.terminal.hyperlink=超連結
 termora.settings.terminal.select-copy=選取複製
 termora.settings.terminal.right-click=右鍵點擊
 termora.settings.terminal.right-click.copy-and-paste=複製 & 貼上
-termora.settings.terminal.right-click.nothing=無操作
 termora.settings.terminal.cursor-style=遊標風格
 termora.settings.terminal.cursor-blink=遊標閃爍
 termora.settings.terminal.local-shell=本地端
@@ -116,8 +114,10 @@ termora.settings.plugin.not-compatible=插件 <b>{0}</b> 與目前版本不相
 
 termora.settings.account=帳號
 termora.settings.account.login=登入
+termora.settings.account.register=註冊
+termora.settings.account.not-support-register=此伺服器不支援註冊帳號
 termora.settings.account.server=伺服器
-termora.settings.account.wait-login=正在等待預設瀏覽器登入...
+termora.settings.account.mfa=多因素驗證是可選的
 termora.settings.account.locally=本地的
 termora.settings.account.lifetime=長期
 termora.settings.account.verify=驗證

src/test/kotlin/app/termora/KeyUtilsTest.kt

@@ -15,19 +15,6 @@ class KeyUtilsTest {
         assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair("ssh-rsa", 1024).public), 1024)
     }
 
-
-    @Test
-    fun test_ECDSA() {
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP256, 256).private), 256)
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP256, 256).public), 256)
-
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP384, 384).private), 384)
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP384, 384).public), 384)
-
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP521, 521).private), 521)
-        assertEquals(KeyUtils.getKeySize(KeyUtils.generateKeyPair(KeyPairProvider.ECDSA_SHA2_NISTP521, 521).public), 521)
-    }
-
     @Test
     fun test_ed25519() {
         val keyPair = KeyUtils.generateKeyPair(KeyPairProvider.SSH_ED25519, 256)

src/test/resources/sshd/Dockerfile

@@ -1,5 +1,5 @@
-FROM linuxserver/openssh-server:9.3_p2-r1-ls147
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories \
+FROM linuxserver/openssh-server
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
     && apk update && apk add wget tmux gcc zip p7zip g++ git make zsh htop stress-ng inetutils-telnet xclock xcalc xorg-server xinit && wget https://ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz \
     && tar -xf lrzsz-0.12.20.tar.gz && cd lrzsz-0.12.20 && ./configure && make && make install \
     && ln -s /usr/local/bin/lrz /usr/local/bin/rz && ln -s /usr/local/bin/lsz /usr/local/bin/sz
@@ -7,6 +7,3 @@ RUN sed -i 's/#AllowAgentForwarding yes/AllowAgentForwarding yes/g' /etc/ssh/ssh
 RUN sed -i 's/AllowTcpForwarding no/AllowTcpForwarding yes/g' /etc/ssh/sshd_config
 RUN sed -i 's/GatewayPorts no/GatewayPorts yes/g' /etc/ssh/sshd_config
 RUN sed -i 's/X11Forwarding no/X11Forwarding yes/g' /etc/ssh/sshd_config
-
-# docker build -t sshd .
-# docker run --rm -it -e SUDO_ACCESS=true -e PASSWORD_ACCESS=true -e USER_PASSWORD=123456 -p 2222:2222 sshd