diff --git a/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java b/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java index eb5bce54..94f8bca8 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java @@ -25,6 +25,6 @@ public class ApiAimeController { @PostMapping("getByAccessCode") public Optional getByAccessCode(@RequestBody Map request) { - return cardRepository.findByLuid(request.get("accessCode")); + return cardRepository.findByLuid(request.get("accessCode").replaceAll("-","")); } } diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java index e9850e97..847cf1a5 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java @@ -1,13 +1,19 @@ package icu.samnyan.aqua.api.controller.sega.diva; +import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaCustomizeRepository; +import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaModuleRepository; +import icu.samnyan.aqua.sega.diva.model.gamedata.DivaCustomize; +import icu.samnyan.aqua.sega.diva.model.gamedata.DivaModule; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Paths; +import java.util.List; /** * @author samnyan (privateamusement@protonmail.com) @@ -16,8 +22,26 @@ import java.nio.file.Paths; @RequestMapping("api/game/diva/data") public class ApiDivaGameDataController { + private final DivaModuleRepository divaModuleRepository; + private final DivaCustomizeRepository divaCustomizeRepository; + + public ApiDivaGameDataController(DivaModuleRepository divaModuleRepository, DivaCustomizeRepository divaCustomizeRepository) { + this.divaModuleRepository = divaModuleRepository; + this.divaCustomizeRepository = divaCustomizeRepository; + } + @GetMapping(value = "musicList", produces = MediaType.APPLICATION_JSON_VALUE) - public byte[] musicList() throws IOException { - return Files.readAllBytes(Paths.get("data/diva_musiclist.json")); + public Resource musicList() throws IOException { + return new FileSystemResource(Paths.get("data/diva_musiclist.json")); + } + + @GetMapping(value = "moduleList") + public List moduleList() throws IOException { + return divaModuleRepository.findAll(); + } + + @GetMapping(value = "customizeList") + public List customizeList() throws IOException { + return divaCustomizeRepository.findAll(); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/Impl/RegisterHandler.java b/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/Impl/RegisterHandler.java index fcbef963..c5c2c450 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/Impl/RegisterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/handler/Impl/RegisterHandler.java @@ -51,7 +51,7 @@ public class RegisterHandler implements BaseHandler { return; } - if (((String) requestMap.get("luid")).equals("0c1ea200000000000000")) { + if (((String) requestMap.get("luid")).equals("37deac01000000000000")) { ctx.close(); return; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java index 3a1b89f1..c32d01bc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; -import com.fasterxml.jackson.annotation.JsonIgnore; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.util.URIEncoder; @@ -27,7 +26,6 @@ public class DivaCustomize implements Serializable, Internalizable { private static final long serialVersionUID = 1L; @Id - @JsonIgnore private int id; private String name; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java index 65fea984..23b2d7e8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; -import com.fasterxml.jackson.annotation.JsonIgnore; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.util.URIEncoder; @@ -27,7 +26,6 @@ public class DivaModule implements Serializable, Internalizable { private static final long serialVersionUID = 1L; @Id - @JsonIgnore private int id; private String name;