diff --git a/plugins/editor/build.gradle.kts b/plugins/editor/build.gradle.kts index 91ae5a6..4cb2e65 100644 --- a/plugins/editor/build.gradle.kts +++ b/plugins/editor/build.gradle.kts @@ -4,7 +4,7 @@ plugins { -project.version = "0.0.3" +project.version = "0.0.4" dependencies { diff --git a/src/main/kotlin/app/termora/account/AccountOption.kt b/src/main/kotlin/app/termora/account/AccountOption.kt index b2436b8..2404dd1 100644 --- a/src/main/kotlin/app/termora/account/AccountOption.kt +++ b/src/main/kotlin/app/termora/account/AccountOption.kt @@ -97,7 +97,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("https://www.termora.app/pricing")) + if (I18n.isChinaMainland()) { + Application.browse(URI.create("https://www.termora.cn/pricing")) + } else { + Application.browse(URI.create("https://www.termora.app/pricing")) + } } }) upgrade.isFocusable = false diff --git a/src/main/kotlin/app/termora/account/LoginServerDialog.kt b/src/main/kotlin/app/termora/account/LoginServerDialog.kt index 6fb5a81..e0c520c 100644 --- a/src/main/kotlin/app/termora/account/LoginServerDialog.kt +++ b/src/main/kotlin/app/termora/account/LoginServerDialog.kt @@ -77,13 +77,8 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) { var rows = 1 val step = 2 - - if (Application.isUnknownVersion()) { - serverComboBox.addItem(Server("Localhost", "http://127.0.0.1:8080")) - } - // serverComboBox.addItem(singaporeServer) -// serverComboBox.addItem(chinaServer) + serverComboBox.addItem(chinaServer) val properties = DatabaseManager.getInstance().properties val servers = (runCatching { @@ -288,8 +283,8 @@ class LoginServerDialog(owner: Window) : DialogWrapper(owner) { .add("${I18n.getString("termora.new-host.general.name")}:").xy(1, rows) .add(nameTextField).xyw(3, rows, 3).apply { rows += step } .add("${I18n.getString("termora.settings.account.server")}:").xy(1, rows) - .add(serverTextField).xy(3, rows) - .add(deploy).xy(5, rows).apply { rows += step } + .add(serverTextField).xyw(3, rows, 3) +// .add(deploy).xy(5, rows).apply { rows += step } .build() } diff --git a/src/main/kotlin/app/termora/account/ServerManager.kt b/src/main/kotlin/app/termora/account/ServerManager.kt index 37b0e24..f89c3b6 100644 --- a/src/main/kotlin/app/termora/account/ServerManager.kt +++ b/src/main/kotlin/app/termora/account/ServerManager.kt @@ -58,8 +58,8 @@ class ServerManager private constructor() { // 解密 val salt = "${serverInfo.salt}:${username}".toByteArray() - val privateKeySecureKey = PBKDF2.hash(salt, username.toCharArray(), 1024, 256) - val privateKeySecureIv = PBKDF2.hash(salt, username.toCharArray(), 1024, 128) + val privateKeySecureKey = PBKDF2.hash(salt, password.toCharArray(), 1024, 256) + val privateKeySecureIv = PBKDF2.hash(salt, password.toCharArray(), 1024, 128) val privateKeyEncoded = AES.CBC.decrypt( privateKeySecureKey, privateKeySecureIv, Base64.decodeBase64(meResponse.privateKey)