diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt index ec11af6fcb..a2ff96d6dd 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt @@ -20,8 +20,8 @@ data class ConnectRequest( @Serializable data class AppendTaskRequest( - @SerialName("host") - val host: String, + @SerialName("id") + val id: String, @SerialName("type") val type: String, @SerialName("params") @@ -30,8 +30,8 @@ data class AppendTaskRequest( @Serializable data class SetTaskParamsRequest( - @SerialName("host") - val host: String, + @SerialName("id") + val id: String, @SerialName("type") val type: String, @SerialName("taskId") @@ -146,14 +146,14 @@ data class Copilot( @Serializable data class Start( - @SerialName("host") - val host: String + @SerialName("id") + val id: String, ) @Serializable data class Stop( - @SerialName("host") - val host: String + @SerialName("id") + val id: String, ) @SerialName("connect") diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt index 8abc76969d..ab4c860e20 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt @@ -86,6 +86,7 @@ data class CallBackLog( ) : BaseData() +@Serializable object EmptyBaseData : BaseData() fun BaseData.toJsonElement() = diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt index aae34991d4..2f6211519e 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt @@ -6,6 +6,7 @@ import io.ktor.server.application.* import io.ktor.server.request.* import io.ktor.server.response.* import io.ktor.server.routing.* +import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive @@ -26,9 +27,9 @@ fun Application.httpRouting() { post("/appendTask") { with(call.receive()) { MaaService.appendTask( - host, + id, type, - params.jsonPrimitive.content + params.jsonObject.toString() ) } call.respond(EmptyBaseData.wapperToResponse()) @@ -36,32 +37,28 @@ fun Application.httpRouting() { post("/setTaskParams") { with(call.receive()) { MaaService.setTaskParams( - host, + id, type, taskId, - params.jsonPrimitive.content + params.jsonObject.toString() ) } call.respond(EmptyBaseData.wapperToResponse()) } post("/start") { val start = call.receive() - MaaService.start(start.host) + MaaService.start(start.id) call.respond(EmptyBaseData.wapperToResponse()) } post("/stop") { val stop = call.receive() - MaaService.stop(stop.host) + MaaService.stop(stop.id) call.respond(EmptyBaseData.wapperToResponse()) } get("/listInstance") { val list = MaaService.listInstance() call.respond(ListInstance(list).wapperToResponse()) } - get("/getLog") { - val list = MaaService.listInstance() - call.respond(ListInstance(list).wapperToResponse()) - } } } }