modify password

Author: lz1998

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.12"
+version = "0.0.13"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {

src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt

@@ -9,10 +9,7 @@ import net.lz1998.mirai.service.MyLoginSolver
 import net.lz1998.mirai.utils.*
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.BotFactory
-import net.mamoe.mirai.event.events.BotEvent
-import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
-import net.mamoe.mirai.event.events.MemberJoinRequestEvent
-import net.mamoe.mirai.event.events.NewFriendRequestEvent
+import net.mamoe.mirai.event.events.*
 import okhttp3.*
 import okio.ByteString
 import okio.ByteString.Companion.toByteString
@@ -34,7 +31,7 @@ class WebsocketBotClient(override var botId: Long, override var password: String
     private var lastWsConnectTime: Long = 0
     var connecting: Boolean = false
 
-    private var wsClient: WebSocket? = null
+    var wsClient: WebSocket? = null
     private var httpClient: OkHttpClient = OkHttpClient.Builder()
             .callTimeout(20, TimeUnit.SECONDS)
             .connectTimeout(20, TimeUnit.SECONDS)

src/main/kotlin/net/lz1998/mirai/service/BotService.kt

@@ -1,27 +1,29 @@
 package net.lz1998.mirai.service
 
 import dto.HttpDto
-import net.lz1998.mirai.entity.RemoteBot
 import net.lz1998.mirai.entity.WebsocketBotClient
 import net.lz1998.mirai.properties.ClientProperties
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 @Service
 class BotService {
-    val botMap = mutableMapOf<Long, RemoteBot>()
+    val botMap = mutableMapOf<Long, WebsocketBotClient>()
 
     @Autowired
     lateinit var clientProperties: ClientProperties
 
     @Synchronized
     suspend fun createBot(botId: Long, password: String) {
         var bot = botMap[botId]
-        if (bot == null) {
-            bot = WebsocketBotClient(botId, password, wsUrl = clientProperties.wsUrl)
-            botMap[botId] = bot
-            bot.initBot()
-        }
+        // 如果有旧的，关掉旧的
+        bot?.bot?.close()
+        bot?.wsClient?.close(1001, "")
+
+        // 开新的
+        bot = WebsocketBotClient(botId, password, wsUrl = clientProperties.wsUrl)
+        botMap[botId] = bot
+        bot.initBot()
     }
 
     fun listBot(): Collection<HttpDto.Bot> {

src/main/kotlin/net/lz1998/mirai/service/MyLoginSolver.kt

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Service
 object MyLoginSolver : LoginSolver() {
     // TODO 通过轮询查询 loginMap
     val loginMap = mutableMapOf<Long, LoginData>()
+    override val isSliderCaptchaSupported: Boolean
+        get() = true
 
     // 图片验证码登陆
     override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? {