Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-11 08:17:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[F] Fix mai2 error response

Browse Source
This commit is contained in:
Azalea
2024-03-27 23:05:46 -04:00
parent b7d2a97f05
commit b3fcf8dd5e
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/icu/samnyan/aqua/net/utils/ErrorResponse.kt
View File

@@ -13,13 +13,15 @@ class ApiException(val code: Int, message: Str) : RuntimeException(message) {
companion object { companion object {
val log = LoggerFactory.getLogger(ApiException::class.java) val log = LoggerFactory.getLogger(ApiException::class.java)
} }
fun resp() = ResponseEntity.status(code).body(message.toString())
} }
@ControllerAdvice @ControllerAdvice(basePackages = ["icu.samnyan"])
class GlobalExceptionHandler { class GlobalExceptionHandler {
@ExceptionHandler(ApiException::class) @ExceptionHandler(ApiException::class)
fun handleCustomApiException(e: ApiException): ResponseEntity<Any?> { fun handleCustomApiException(e: ApiException): ResponseEntity<String> {
// On error, return the error code and message // On error, return the error code and message
return ResponseEntity.status(e.code).body(e.message) return e.resp()
} }
} }

38
src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt
View File

@@ -1,10 +1,13 @@
package icu.samnyan.aqua.sega.maimai2 package icu.samnyan.aqua.sega.maimai2
import ext.* import ext.*
import icu.samnyan.aqua.net.utils.ApiException
import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.BaseHandler
import icu.samnyan.aqua.sega.maimai2.handler.* import icu.samnyan.aqua.sega.maimai2.handler.*
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
import io.ktor.client.request.*
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.* import org.springframework.web.bind.annotation.*
import kotlin.reflect.full.declaredMemberProperties import kotlin.reflect.full.declaredMemberProperties
@@ -253,24 +256,29 @@ class Maimai2ServletController(
@API("/{api}") @API("/{api}")
fun handle(@PathVariable api: String, @RequestBody request: Map<String, Any>): Any { fun handle(@PathVariable api: String, @RequestBody request: Map<String, Any>): Any {
logger.info("Mai2 < $api : ${request.toJson()}") // TODO: Optimize logging try {
logger.info("Mai2 < $api : ${request.toJson()}") // TODO: Optimize logging
if (api in noopEndpoint) { if (api in noopEndpoint) {
logger.info("Mai2 > $api no-op") logger.info("Mai2 > $api no-op")
return """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" return """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}"""
} }
if (api in staticEndpoint) { if (api in staticEndpoint) {
logger.info("Mai2 > $api static") logger.info("Mai2 > $api static")
return staticEndpoint[api]!! return staticEndpoint[api]!!
} }
return handlers[api]?.handle(request)?.let { if (it is String) it else it.toJson() }?.also { return handlers[api]?.handle(request)?.let { if (it is String) it else it.toJson() }?.also {
if (api !in setOf("GetUserItemApi", "GetGameEventApi")) if (api !in setOf("GetUserItemApi", "GetGameEventApi"))
logger.info("Mai2 > $api : $it") logger.info("Mai2 > $api : $it")
} ?: { } ?: {
logger.warn("Mai2 > $api not found") logger.warn("Mai2 > $api not found")
"""{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}"""
}
} catch (e: ApiException) {
logger.warn("Mai2 > $api : ${e.code} - ${e.message}")
return ResponseEntity.status(e.code).body("""{"returnCode":${e.code},"apiName":"com.sega.maimai2servlet.api.$api","message":"${e.message}"}""")
} }
} }
} }