controller

Author: lz1998

src/main/kotlin/net/lz1998/mirai/controller/BotController.kt

@@ -4,6 +4,7 @@ import dto.HttpDto
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.lz1998.mirai.service.BotService
+import net.lz1998.mirai.service.MyLoginSolver
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.*
 
@@ -14,6 +15,9 @@ class BotController {
     @Autowired
     lateinit var botService: BotService
 
+    @Autowired
+    lateinit var myLoginSolver: MyLoginSolver
+
 
     // 创建一个机器人并登陆
     @RequestMapping("/create/v1", produces = ["application/x-protobuf"], consumes = ["application/x-protobuf"])
@@ -23,7 +27,7 @@ class BotController {
     }
 
     @RequestMapping("/list/v1", produces = ["application/x-protobuf"], consumes = ["application/x-protobuf"])
-    fun listBot(@RequestBody param: HttpDto.ListBotReq): HttpDto.ListBotResp {
+    fun listBot(): HttpDto.ListBotResp {
         val botList = botService.listBot()
         return HttpDto.ListBotResp.newBuilder().addAllBotList(botList).build()
     }

src/main/kotlin/net/lz1998/mirai/controller/CaptchaController.kt

@@ -15,7 +15,7 @@ class CaptchaController {
     lateinit var myLoginSolver: MyLoginSolver
 
     @RequestMapping("/list/v1", produces = ["application/x-protobuf"], consumes = ["application/x-protobuf"])
-    fun getCaptchaList(@RequestBody param: HttpDto.GetCaptchaListReq): HttpDto.GetCaptchaListResp {
+    fun getCaptchaList(): HttpDto.GetCaptchaListResp {
         val captchaList = myLoginSolver.getCaptchaList()
         return HttpDto.GetCaptchaListResp.newBuilder().addAllCaptchaList(captchaList).build()
     }

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

@@ -21,7 +21,13 @@ class BotService {
 
     fun listBot(): Collection<HttpDto.Bot> {
         return botMap.values.map { remoteBot ->
-            HttpDto.Bot.newBuilder().setBotId(remoteBot.botId).setIsOnline(remoteBot.bot.isOnline).build()
+            HttpDto.Bot.newBuilder().setBotId(remoteBot.botId).setIsOnline(
+                    try {
+                        remoteBot.bot.isOnline
+                    } catch (e: Exception) {
+                        false
+                    }
+            ).build()
         }
     }
 

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

@@ -16,34 +16,32 @@ class MyLoginSolver : LoginSolver() {
     // 图片验证码登陆
     override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? {
         val def = CompletableDeferred<String>()
-        loginMap[bot.id] = LoginData(bot.id, LoginDataType.PIC_CAPTCHA, def, data, null)
+        val loginData = LoginData(bot.id, LoginDataType.PIC_CAPTCHA, def, data, null)
+        loginMap[bot.id] = loginData
         return def.await().trim()
     }
 
     // 滑动验证
     override suspend fun onSolveSliderCaptcha(bot: Bot, url: String): String? {
         val def = CompletableDeferred<String>()
-        loginMap[bot.id] = LoginData(bot.id, LoginDataType.SLIDER_CAPTCHA, def, null, url)
+        val loginData = LoginData(bot.id, LoginDataType.SLIDER_CAPTCHA, def, null, url)
+        loginMap[bot.id] = loginData
         return def.await().trim()
     }
 
     // 设备锁扫码验证
     override suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String? {
         val def = CompletableDeferred<String>()
-        loginMap[bot.id] = LoginData(bot.id, LoginDataType.UNSAFE_DEVICE_LOGIN_VERIFY, def, null, url)
+        val loginData = LoginData(bot.id, LoginDataType.UNSAFE_DEVICE_LOGIN_VERIFY, def, null, url)
+        loginMap[bot.id] = loginData
         return def.await().trim()
     }
 
     fun solveLogin(botId: Long, result: String) {
         val loginData = loginMap[botId] ?: return
-        loginMap.remove(botId)
         loginData.def.complete(result)
     }
 
-    fun getLoginData(botId: Long): LoginData? {
-        return loginMap[botId]
-    }
-
     fun getCaptchaList(): Collection<HttpDto.Captcha> {
         return loginMap.values.map { loginData ->
             val captcha = HttpDto.Captcha.newBuilder()
@@ -78,7 +76,7 @@ data class LoginData(
 enum class LoginDataType(val type: String) {
     PIC_CAPTCHA("pic_captcha"),
     SLIDER_CAPTCHA("slider_captcha"),
-    UNSAFE_DEVICE_LOGIN_VERIFY("unsafe_device_login)verify"),
+    UNSAFE_DEVICE_LOGIN_VERIFY("unsafe_device_login_verify"),
 }
 
 val myLoginSolver = MyLoginSolver()