github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-25 15:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
#	tools/gradle-plugin/src/VersionConstants.kt
This commit is contained in:
Him188 2020-12-28 17:54:54 +08:00
commit c76df4d7c1
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/mirai-console/src/MiraiConsoleImplementation.kt
View File

@ -219,6 +219,7 @@ public interface MiraiConsoleImplementation : CoroutineScope {
}.onFailure { }.onFailure {
it.printStackTrace() it.printStackTrace()
} }
Thread.sleep(3000L) // 保证信息打印完成
exitProcess(1) exitProcess(1)
} }
} }

4
backend/mirai-console/src/internal/MiraiConsoleBuildConstants.kt
View File

@ -14,8 +14,8 @@ import java.time.Instant
internal object MiraiConsoleBuildConstants { // auto-filled on build (task :mirai-console:fillBuildConstants) internal object MiraiConsoleBuildConstants { // auto-filled on build (task :mirai-console:fillBuildConstants)
@JvmStatic @JvmStatic
val buildDate: Instant = Instant.ofEpochSecond(1608391573) val buildDate: Instant = Instant.ofEpochSecond(1609063576)
const val versionConst: String = "2.0-M1-1" const val versionConst: String = "2.0-M2-dev-10"
@JvmStatic @JvmStatic
val version: SemVersion = SemVersion(versionConst) val version: SemVersion = SemVersion(versionConst)

1
frontend/mirai-console-terminal/src/MiraiConsoleImplementationTerminal.kt
View File

@ -78,6 +78,7 @@ class MiraiConsoleImplementationTerminal
override val isAnsiSupported: Boolean get() = true override val isAnsiSupported: Boolean get() = true
override fun createLoginSolver(requesterBot: Long, configuration: BotConfiguration): LoginSolver { override fun createLoginSolver(requesterBot: Long, configuration: BotConfiguration): LoginSolver {
LoginSolver.Default?.takeIf { it !is StandardCharImageLoginSolver }?.let { return it }
return StandardCharImageLoginSolver(input = { requestInput("LOGIN> ") }) return StandardCharImageLoginSolver(input = { requestInput("LOGIN> ") })
} }