From 7271ff375d9e93d762be277bba84d4e838acab71 Mon Sep 17 00:00:00 2001
From: Karlatemp <karlatemp@vip.qq.com>
Date: Fri, 24 Apr 2020 21:32:56 +0800
Subject: [PATCH] =?UTF-8?q?#257=20=E7=9A=84=E8=BF=BD=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#267)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rename

* Fix resource missing

* Fix typo
---
 .../kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt  | 12 ++++++------
 .../net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt   |  4 +++-
 .../mirai/utils/{JWTHelper.kt => WindowHelperJvm.kt} |  0
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/{JWTHelper.kt => WindowHelperJvm.kt} (100%)

diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
index 8ea55e482..6df638cde 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
@@ -37,26 +37,26 @@ class DefaultLoginSolver(
     val input: suspend () -> String,
     val overrideLogger: MiraiLogger? = null
 ) : LoginSolver() {
-    private val degelate: LoginSolver
+    private val delegate: LoginSolver
 
     init {
         if (Desktop.isDesktopSupported()) {
-            degelate = SwingSolver
+            delegate = SwingSolver
         } else {
-            degelate = DefaultLoginSolverImpl(input, overrideLogger)
+            delegate = DefaultLoginSolverImpl(input, overrideLogger)
         }
     }
 
     override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? {
-        return degelate.onSolvePicCaptcha(bot, data)
+        return delegate.onSolvePicCaptcha(bot, data)
     }
 
     override suspend fun onSolveSliderCaptcha(bot: Bot, url: String): String? {
-        return degelate.onSolveSliderCaptcha(bot, url)
+        return delegate.onSolveSliderCaptcha(bot, url)
     }
 
     override suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String? {
-        return degelate.onSolveUnsafeDeviceLoginVerify(bot, url)
+        return delegate.onSolveUnsafeDeviceLoginVerify(bot, url)
     }
 }
 
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
index 80ceb4bdc..0855c4cc6 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
@@ -44,7 +44,9 @@ object SwingSolver : LoginSolver() {
                 需要进行账户安全认证<br>
                 该账户有[设备锁]/[不常用登录地点]/[不常用设备登录]的问题<br>
                 完成以下账号认证即可成功登录|理论本认证在mirai每个账户中最多出现1次<br>
-                完成后请关闭该窗口
+                请将该链接在QQ浏览器中打开并完成认证<br>
+                成功后请关闭该窗口<br>
+                这步操作将在后续的版本中优化
                 """.trimIndent()
             ).last()
             JTextField(url).append()
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/JWTHelper.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/WindowHelperJvm.kt
similarity index 100%
rename from mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/JWTHelper.kt
rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/WindowHelperJvm.kt