[API] get module and customize list from server, allow slash on login request

pull/1/head
samnyan 2020-01-17 15:10:10 +09:00
parent 136dd1989b
commit 0ebfec6daf
5 changed files with 29 additions and 9 deletions

View File

@ -25,6 +25,6 @@ public class ApiAimeController {
@PostMapping("getByAccessCode") @PostMapping("getByAccessCode")
public Optional<Card> getByAccessCode(@RequestBody Map<String, String> request) { public Optional<Card> getByAccessCode(@RequestBody Map<String, String> request) {
return cardRepository.findByLuid(request.get("accessCode")); return cardRepository.findByLuid(request.get("accessCode").replaceAll("-",""));
} }
} }

View File

@ -1,13 +1,19 @@
package icu.samnyan.aqua.api.controller.sega.diva; 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.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.List;
/** /**
* @author samnyan (privateamusement@protonmail.com) * @author samnyan (privateamusement@protonmail.com)
@ -16,8 +22,26 @@ import java.nio.file.Paths;
@RequestMapping("api/game/diva/data") @RequestMapping("api/game/diva/data")
public class ApiDivaGameDataController { 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) @GetMapping(value = "musicList", produces = MediaType.APPLICATION_JSON_VALUE)
public byte[] musicList() throws IOException { public Resource musicList() throws IOException {
return Files.readAllBytes(Paths.get("data/diva_musiclist.json")); return new FileSystemResource(Paths.get("data/diva_musiclist.json"));
}
@GetMapping(value = "moduleList")
public List<DivaModule> moduleList() throws IOException {
return divaModuleRepository.findAll();
}
@GetMapping(value = "customizeList")
public List<DivaCustomize> customizeList() throws IOException {
return divaCustomizeRepository.findAll();
} }
} }

View File

@ -51,7 +51,7 @@ public class RegisterHandler implements BaseHandler {
return; return;
} }
if (((String) requestMap.get("luid")).equals("0c1ea200000000000000")) { if (((String) requestMap.get("luid")).equals("37deac01000000000000")) {
ctx.close(); ctx.close();
return; return;
} }

View File

@ -1,6 +1,5 @@
package icu.samnyan.aqua.sega.diva.model.gamedata; 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.model.Internalizable;
import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
import icu.samnyan.aqua.sega.util.URIEncoder; import icu.samnyan.aqua.sega.util.URIEncoder;
@ -27,7 +26,6 @@ public class DivaCustomize implements Serializable, Internalizable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@JsonIgnore
private int id; private int id;
private String name; private String name;

View File

@ -1,6 +1,5 @@
package icu.samnyan.aqua.sega.diva.model.gamedata; 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.model.Internalizable;
import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
import icu.samnyan.aqua.sega.util.URIEncoder; import icu.samnyan.aqua.sega.util.URIEncoder;
@ -27,7 +26,6 @@ public class DivaModule implements Serializable, Internalizable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@JsonIgnore
private int id; private int id;
private String name; private String name;