diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java deleted file mode 100644 index 102226be..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.maimai2.model.response.UserLoginResp; -import icu.samnyan.aqua.sega.util.jackson.BasicMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component("Maimai2UserLoginHandler") -public class UserLoginHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(UserLoginHandler.class); - - private final BasicMapper mapper; - - public UserLoginHandler(BasicMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - //String userId = Integer.toString((int)request.get("userId")); - - UserLoginResp resp = new UserLoginResp(); - - String json = mapper.write(resp); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt new file mode 100644 index 00000000..6f5e5207 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt @@ -0,0 +1,25 @@ +package icu.samnyan.aqua.sega.maimai2.handler.impl + +import icu.samnyan.aqua.sega.general.dao.CardRepository +import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.util.jackson.BasicMapper +import org.springframework.stereotype.Component +import java.time.LocalDateTime +import kotlin.jvm.optionals.getOrNull + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +@Component("Maimai2UserLoginHandler") +class UserLoginHandler(mapper: BasicMapper, val cardRepo: CardRepository) : BaseHandler { + val resp = mapper.write(mapOf( + "returnCode" to 1, + "lastLoginDate" to "2020-01-01 00:00:00.0", + "loginCount" to 1, + "consecutiveLoginCount" to 0, + "loginId" to 1, + "Bearer" to "meow" // Isn't actually used by the game + )) + + override fun handle(request: Map) = resp +} diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/response/UserLoginResp.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/response/UserLoginResp.java deleted file mode 100644 index 6c7c56da..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/response/UserLoginResp.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.maimai2.model.response; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserLoginResp { - public int returnCode = 1; - public String lastLoginDate = "2020-01-01 00:00:00.0"; - public int loginCount = 1; - public int consecutiveLoginCount = 0; - public int loginId = 1; // What is this? - public String Bearer = "AQUATOKEN"; -}