From 20b6af11cca268634037058e7c4a2306fa1e2968 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:51:14 +0800 Subject: [PATCH] [M] Move --- .../samnyan/aqua/sega/diva/DivaController.kt | 34 +++++++++---------- .../samnyan/aqua/sega/diva/DivaServices.kt | 2 +- .../aqua/sega/diva/handler/InitHandlers.kt | 2 +- .../diva/handler/card/CardProcedureHandler.kt | 2 +- .../diva/handler/card/ChangeNameHandler.kt | 2 +- .../diva/handler/card/ChangePasswdHandler.kt | 2 +- .../diva/handler/card/RegistrationHandler.kt | 2 +- .../handler/databank/ContestInfoHandler.kt | 2 +- .../diva/handler/databank/FestaInfoHandler.kt | 2 +- .../diva/handler/databank/NvRankingHandler.kt | 2 +- .../diva/handler/databank/PsRankingHandler.kt | 2 +- .../diva/handler/databank/PvListHandler.kt | 2 +- .../handler/databank/ShopCatalogHandler.kt | 2 +- .../diva/handler/ingame/BuyCstmzItmHandler.kt | 2 +- .../diva/handler/ingame/BuyModuleHandler.kt | 2 +- .../diva/handler/ingame/GetPvPdHandler.kt | 2 +- .../diva/handler/ingame/ShopExitHandler.kt | 2 +- .../diva/handler/ingame/StageResultHandler.kt | 2 +- .../diva/handler/ingame/StageStartHandler.kt | 2 +- .../diva/handler/ingame/StoreSsHandler.kt | 2 +- .../aqua/sega/diva/handler/user/EndHandler.kt | 2 +- .../sega/diva/handler/user/PdUnlockHandler.kt | 2 +- .../sega/diva/handler/user/PreStartHandler.kt | 2 +- .../diva/handler/user/SpendCreditHandler.kt | 2 +- .../sega/diva/handler/user/StartHandler.kt | 2 +- ...eResultRequest.kt => DivaRequestModels.kt} | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) rename src/main/java/icu/samnyan/aqua/sega/diva/model/{request/StageResultRequest.kt => DivaRequestModels.kt} (98%) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt index 91ed5342..9f342d94 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt @@ -13,23 +13,23 @@ import icu.samnyan.aqua.sega.diva.handler.card.RegistrationHandler import icu.samnyan.aqua.sega.diva.handler.databank.* import icu.samnyan.aqua.sega.diva.handler.ingame.* import icu.samnyan.aqua.sega.diva.handler.user.* -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.request.BuyCstmzItmRequest -import icu.samnyan.aqua.sega.diva.model.request.BuyModuleRequest -import icu.samnyan.aqua.sega.diva.model.request.CardProcedureRequest -import icu.samnyan.aqua.sega.diva.model.request.ChangeNameRequest -import icu.samnyan.aqua.sega.diva.model.request.ChangePasswdRequest -import icu.samnyan.aqua.sega.diva.model.request.GetPvPdRequest -import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest -import icu.samnyan.aqua.sega.diva.model.request.ShopExitRequest -import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest -import icu.samnyan.aqua.sega.diva.model.request.StageStartRequest -import icu.samnyan.aqua.sega.diva.model.request.StoreSsRequest -import icu.samnyan.aqua.sega.diva.model.request.PsRankingRequest -import icu.samnyan.aqua.sega.diva.model.request.PdUnlockRequest -import icu.samnyan.aqua.sega.diva.model.request.PreStartRequest -import icu.samnyan.aqua.sega.diva.model.request.SpendCreditRequest -import icu.samnyan.aqua.sega.diva.model.request.StartRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmRequest +import icu.samnyan.aqua.sega.diva.model.BuyModuleRequest +import icu.samnyan.aqua.sega.diva.model.CardProcedureRequest +import icu.samnyan.aqua.sega.diva.model.ChangeNameRequest +import icu.samnyan.aqua.sega.diva.model.ChangePasswdRequest +import icu.samnyan.aqua.sega.diva.model.GetPvPdRequest +import icu.samnyan.aqua.sega.diva.model.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.ShopExitRequest +import icu.samnyan.aqua.sega.diva.model.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.StageStartRequest +import icu.samnyan.aqua.sega.diva.model.StoreSsRequest +import icu.samnyan.aqua.sega.diva.model.PsRankingRequest +import icu.samnyan.aqua.sega.diva.model.PdUnlockRequest +import icu.samnyan.aqua.sega.diva.model.PreStartRequest +import icu.samnyan.aqua.sega.diva.model.SpendCreditRequest +import icu.samnyan.aqua.sega.diva.model.StartRequest import icu.samnyan.aqua.sega.diva.util.DivaMapper import icu.samnyan.aqua.sega.diva.util.DivaTime import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt index 521dd5a8..d54d401c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.diva -import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.RegistrationRequest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerCustomize import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerModule import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt index ee7a6fd5..15001446 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.handler import ext.csv -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.operation.PingResponse import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository import icu.samnyan.aqua.sega.general.model.PropertyEntry diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt index 8cce143c..185a821e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.common.StartMode -import icu.samnyan.aqua.sega.diva.model.request.CardProcedureRequest +import icu.samnyan.aqua.sega.diva.model.CardProcedureRequest import icu.samnyan.aqua.sega.diva.model.response.card.CardProcedureResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt index 3eab7fec..91892e33 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ChangeNameRequest +import icu.samnyan.aqua.sega.diva.model.ChangeNameRequest import icu.samnyan.aqua.sega.diva.model.response.card.ChangeNameResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt index 2c5d533c..cfbd8a1b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.PassStat import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ChangePasswdRequest +import icu.samnyan.aqua.sega.diva.model.ChangePasswdRequest import icu.samnyan.aqua.sega.diva.model.response.card.ChangePasswdResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt index fcc9939e..518673c4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.PlayerProfileService import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.RegistrationRequest import icu.samnyan.aqua.sega.diva.model.response.card.RegistrationResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt index 58d83aee..3fa5eb30 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.ContestInfoResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt index cc16037b..d5cafbe4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.FestaRepository import icu.samnyan.aqua.sega.diva.model.common.collection.FestaCollection -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.FestaInfoResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt index 332bc54c..702277f5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.NvRankingResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt index ec59b8e3..b237a8f7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt @@ -5,7 +5,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Difficulty import icu.samnyan.aqua.sega.diva.model.common.Edition import icu.samnyan.aqua.sega.diva.model.common.collection.PsRankingCollection -import icu.samnyan.aqua.sega.diva.model.request.PsRankingRequest +import icu.samnyan.aqua.sega.diva.model.PsRankingRequest import icu.samnyan.aqua.sega.diva.model.response.databank.PsRankingResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt index 7cda7c14..de7026fa 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Difficulty import icu.samnyan.aqua.sega.diva.model.db.gamedata.PvEntry -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.PvListResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt index 698f54a4..c2727b93 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.DivaModuleRepository -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest +import icu.samnyan.aqua.sega.diva.model.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.ShopCatalogResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt index b3f0e8c9..b2a20ba5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.invoke import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.BuyCstmzItmRequest +import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyCstmzItmResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt index 52fd5629..c52e3980 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.BuyModuleRequest +import icu.samnyan.aqua.sega.diva.model.BuyModuleRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyModuleResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt index e2097784..cc2ca22e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Difficulty import icu.samnyan.aqua.sega.diva.model.common.Edition -import icu.samnyan.aqua.sega.diva.model.request.GetPvPdRequest +import icu.samnyan.aqua.sega.diva.model.GetPvPdRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.GetPvPdResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt index 4c966ac3..405b05e1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.csv import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ShopExitRequest +import icu.samnyan.aqua.sega.diva.model.ShopExitRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.ShopExitResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt index 5bd8ae8d..4d5c458b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt @@ -4,7 +4,7 @@ import ext.logger import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.* import icu.samnyan.aqua.sega.diva.model.db.userdata.* -import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.StageResultRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse import icu.samnyan.aqua.sega.diva.util.DivaCalculator import org.apache.commons.lang3.StringUtils diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt index b1de2585..f8392a3f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.emptyMap import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.StageStartRequest +import icu.samnyan.aqua.sega.diva.model.StageStartRequest import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt index 83f7f679..1cc9ce52 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt @@ -5,7 +5,7 @@ import ext.logger import icu.samnyan.aqua.sega.diva.DIVA_BAD import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.StoreSsRequest +import icu.samnyan.aqua.sega.diva.model.StoreSsRequest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerScreenShot import org.springframework.stereotype.Component import org.springframework.web.multipart.MultipartFile diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt index af49650d..c8cb1087 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt @@ -8,7 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.common.Edition import icu.samnyan.aqua.sega.diva.model.common.SortMode import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest -import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.StageResultRequest import icu.samnyan.aqua.sega.diva.util.DivaStringUtils import org.springframework.stereotype.Component import java.lang.String diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt index 69020560..332d3d80 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.PdUnlockRequest +import icu.samnyan.aqua.sega.diva.model.PdUnlockRequest import org.springframework.stereotype.Component @Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt index 39e92a25..f2542fe9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt @@ -5,7 +5,7 @@ import ext.logger import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.PreStartResult import icu.samnyan.aqua.sega.diva.model.common.StartMode -import icu.samnyan.aqua.sega.diva.model.request.PreStartRequest +import icu.samnyan.aqua.sega.diva.model.PreStartRequest import icu.samnyan.aqua.sega.diva.model.response.user.PreStartResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt index b2c051a8..b95572cc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.SpendCreditRequest +import icu.samnyan.aqua.sega.diva.model.SpendCreditRequest import icu.samnyan.aqua.sega.diva.model.response.user.SpendCreditResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt index a4679c8b..d4b8c8d5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt @@ -7,7 +7,7 @@ import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord -import icu.samnyan.aqua.sega.diva.model.request.StartRequest +import icu.samnyan.aqua.sega.diva.model.StartRequest import icu.samnyan.aqua.sega.diva.model.response.user.StartResponse import icu.samnyan.aqua.sega.diva.util.PvRecordDataException import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt similarity index 98% rename from src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt rename to src/main/java/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt index 5c17e4ae..98292f25 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.request +package icu.samnyan.aqua.sega.diva.model import java.time.ZonedDateTime