From 0d290d146437d9500fcf3bf70265da8a2435e1c3 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Mon, 2 Mar 2020 23:53:09 +0800
Subject: [PATCH] Update Core to 0.24
---
gradle.properties | 4 ++--
.../kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 2d14c5396..c4898ce7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
# style guide
kotlin.code.style=official
# config
-miraiVersion=0.23.0
+miraiVersion=0.24.0
mirai_console_version=0.3.1
kotlin.incremental.multiplatform=true
kotlin.parallel.tasks.in.project=true
@@ -17,4 +17,4 @@ coroutinesIoVersion=0.1.16
ktorVersion=1.3.1
klockVersion=1.7.0
# gradle plugin
-protobufJavaVersion=3.10.0
\ No newline at end of file
+protobufJavaVersion=3.10.0
diff --git a/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt b/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
index e3cdef8d5..142eedee6 100644
--- a/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
+++ b/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
@@ -30,6 +30,7 @@ import java.io.File
import java.io.OutputStream
import java.io.PrintStream
import java.io.RandomAccessFile
+import java.nio.ByteBuffer
import java.nio.charset.Charset
import java.util.*
import java.util.concurrent.ConcurrentHashMap
@@ -147,14 +148,14 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
override fun createLoginSolver(): LoginSolver {
return object : LoginSolver() {
- override suspend fun onSolvePicCaptcha(bot: Bot, data: IoBuffer): String? {
+ override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? {
val tempFile: File = createTempFile(suffix = ".png").apply { deleteOnExit() }
withContext(Dispatchers.IO) {
tempFile.createNewFile()
pushLog(0, "[Login Solver]需要图片验证码登录, 验证码为 4 字母")
try {
tempFile.writeChannel().apply {
- writeFully(data)
+ writeFully(ByteBuffer.wrap(data))
close()
}
pushLog(0, "请查看文件 ${tempFile.absolutePath}")