From 7cd750b11cee442189a06af2a24bbef23137e545 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 25 Oct 2025 04:56:05 +0800 Subject: [PATCH] [O] Java > kt --- .../aqua/sega/chusan/handler/ChusanApis.kt | 2 +- .../sega/chusan/handler/ChusanUpsertApis.kt | 2 +- .../sega/chusan/model/request/Chu3UserAll.kt | 2 +- .../aqua/sega/general/dao/CardRepository.java | 18 ------- .../aqua/sega/general/dao/CardRepository.kt | 15 ++++++ .../general/dao/GameVersionRepository.java | 18 ------- .../general/dao/PropertyEntryRepository.java | 15 ------ .../general/dao/PropertyEntryRepository.kt | 14 +++++ .../filter/CompressRequestWrapper.java | 53 ------------------- .../general/filter/CompressRequestWrapper.kt | 24 +++++++++ .../aqua/sega/general/model/GameVersion.java | 21 -------- .../sega/general/model/PropertyEntry.java | 37 ------------- .../aqua/sega/general/model/PropertyEntry.kt | 27 ++++++++++ .../sega/general/model/UserRecentRating.kt | 10 ++++ .../model/response/UserRecentRating.java | 23 -------- .../aqua/sega/ongeki/OngekiUserApis.kt | 2 +- .../sega/ongeki/model/OngekiUpsertUserAll.kt | 2 +- .../db/80/V1000_60__drop_the_codebase.sql | 2 +- 18 files changed, 96 insertions(+), 191 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/dao/GameVersionRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/model/GameVersion.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt create mode 100644 src/main/java/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/general/model/response/UserRecentRating.java diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt index 7e41b153..5f7b702a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt @@ -8,7 +8,7 @@ import icu.samnyan.aqua.sega.chusan.model.request.UserCMissionResp import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating +import icu.samnyan.aqua.sega.general.model.UserRecentRating import java.time.format.DateTimeFormatter @Suppress("UNCHECKED_CAST") diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt index 47361fc7..85c3ebcd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt @@ -4,7 +4,7 @@ import ext.* import icu.samnyan.aqua.sega.chusan.ChusanController import icu.samnyan.aqua.sega.chusan.model.request.Chu3UserAll import icu.samnyan.aqua.sega.chusan.model.userdata.* -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating +import icu.samnyan.aqua.sega.general.model.UserRecentRating @Suppress("UNCHECKED_CAST") fun ChusanController.upsertApiInit() { diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt index 95e29052..f17c42aa 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.chusan.model.request import ext.JDict import icu.samnyan.aqua.sega.chusan.model.userdata.* -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating +import icu.samnyan.aqua.sega.general.model.UserRecentRating class UserCMissionResp { var missionId = 0 diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java b/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java deleted file mode 100644 index a5ce2a7e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.general.dao; - -import icu.samnyan.aqua.sega.general.model.Card; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("SegaCardRepository") -public interface CardRepository extends JpaRepository { - - Optional findByExtId(Long extId); - - Optional findByLuid(String luid); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.kt b/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.kt new file mode 100644 index 00000000..cfc577b1 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.kt @@ -0,0 +1,15 @@ +package icu.samnyan.aqua.sega.general.dao + +import icu.samnyan.aqua.sega.general.model.Card +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository +import java.util.* + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +@Repository("SegaCardRepository") +interface CardRepository : JpaRepository { + fun findByExtId(extId: Long): Optional + fun findByLuid(luid: String): Optional +} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/GameVersionRepository.java b/src/main/java/icu/samnyan/aqua/sega/general/dao/GameVersionRepository.java deleted file mode 100644 index 9ce4a749..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/dao/GameVersionRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.general.dao; - -import icu.samnyan.aqua.sega.general.model.GameVersion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("GameVersionRepository") -public interface GameVersionRepository extends JpaRepository { - Optional findByUuid(String uuid); - List findByLastTimeBefore(LocalDateTime time); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.java b/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.java deleted file mode 100644 index db09e6f6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package icu.samnyan.aqua.sega.general.dao; - -import icu.samnyan.aqua.sega.general.model.PropertyEntry; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface PropertyEntryRepository extends JpaRepository { - Optional findByPropertyKey(String key); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt b/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt new file mode 100644 index 00000000..8f0fd913 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt @@ -0,0 +1,14 @@ +package icu.samnyan.aqua.sega.general.dao + +import icu.samnyan.aqua.sega.general.model.PropertyEntry +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository +import java.util.* + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +@Repository +interface PropertyEntryRepository : JpaRepository { + fun findByPropertyKey(key: String): Optional +} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.java b/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.java deleted file mode 100644 index 291f758c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package icu.samnyan.aqua.sega.general.filter; - -import jakarta.servlet.ReadListener; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import java.io.ByteArrayInputStream; -import java.io.IOException; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public class CompressRequestWrapper extends HttpServletRequestWrapper { - - private final ByteArrayInputStream input; - private ServletInputStream filterInput; - - public CompressRequestWrapper(HttpServletRequest request, byte[] input) { - super(request); - this.input = new ByteArrayInputStream(input); - } - - - @Override - public ServletInputStream getInputStream() { - if (filterInput == null) { - filterInput = new ServletInputStream() { - @Override - public boolean isFinished() { - return false; - } - - @Override - public boolean isReady() { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - - @Override - public int read() { - return input.read(); - } - }; - - - } - return filterInput; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt b/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt new file mode 100644 index 00000000..5dcd44c5 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt @@ -0,0 +1,24 @@ +package icu.samnyan.aqua.sega.general.filter + +import jakarta.servlet.ReadListener +import jakarta.servlet.ServletInputStream +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequestWrapper +import java.io.ByteArrayInputStream + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +class CompressRequestWrapper(request: HttpServletRequest, input: ByteArray) : HttpServletRequestWrapper(request) { + val input: ByteArrayInputStream = ByteArrayInputStream(input) + var filterInput: ServletInputStream? = null + + override fun getInputStream(): ServletInputStream { + return filterInput ?: object : ServletInputStream() { + override fun isFinished() = false + override fun isReady() = false + override fun setReadListener(readListener: ReadListener) {} + override fun read() = input.read() + }.also { filterInput = it } + } +} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/GameVersion.java b/src/main/java/icu/samnyan/aqua/sega/general/model/GameVersion.java deleted file mode 100644 index 2e1ef9fd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/GameVersion.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.general.model; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.time.LocalDateTime; - -@Entity(name = "SegaGameVersion") -@Table(name = "sega_game_version") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameVersion { - @Id - private String uuid; - private String romVersion; - private String dataVersion; - private LocalDateTime lastTime; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java b/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java deleted file mode 100644 index b2b7bc64..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java +++ /dev/null @@ -1,37 +0,0 @@ -package icu.samnyan.aqua.sega.general.model; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ServerPropertyEntry") -@Table(name = "property") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class PropertyEntry implements Serializable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @Column(unique = true) - private String propertyKey; - - @Column(columnDefinition = "TEXT") - private String propertyValue; - - public PropertyEntry(String propertyKey, String propertyValue) { - this.propertyKey = propertyKey; - this.propertyValue = propertyValue; - } - public PropertyEntry(String propertyKey) { - this.propertyKey = propertyKey; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt b/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt new file mode 100644 index 00000000..8e9b5e9f --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt @@ -0,0 +1,27 @@ +package icu.samnyan.aqua.sega.general.model + +import jakarta.persistence.* + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +@Entity(name = "ServerPropertyEntry") +@Table(name = "property") +class PropertyEntry { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + var id: Long = 0 + + @Column(unique = true) + var propertyKey: String = "" + + @Column(columnDefinition = "TEXT") + var propertyValue: String? = null + + constructor(propertyKey: String, propertyValue: String?) { + this.propertyKey = propertyKey + this.propertyValue = propertyValue + } + + constructor() +} diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt b/src/main/java/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt new file mode 100644 index 00000000..2ae8f069 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt @@ -0,0 +1,10 @@ +package icu.samnyan.aqua.sega.general.model + +class UserRecentRating( + val musicId: Int = 0, + val difficultId: Int = 0, + val romVersionCode: String = "", + val score: Int = 0 +) { + override fun toString() = "$musicId:$difficultId:$score" +} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/response/UserRecentRating.java b/src/main/java/icu/samnyan/aqua/sega/general/model/response/UserRecentRating.java deleted file mode 100644 index 4d9fbeaa..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/response/UserRecentRating.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.general.model.response; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserRecentRating { - private int musicId; - private int difficultId; - private String romVersionCode; - private int score; - - @Override - public String toString() { - return musicId + ":" + difficultId + ":" + score; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt index 07788540..3f775afa 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt @@ -4,7 +4,7 @@ package icu.samnyan.aqua.sega.ongeki import ext.* import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating +import icu.samnyan.aqua.sega.general.model.UserRecentRating import icu.samnyan.aqua.sega.ongeki.model.OgkItemType import icu.samnyan.aqua.sega.ongeki.model.UserItem import org.springframework.data.domain.PageRequest diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt index e5b58f0b..2ca86841 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt @@ -1,5 +1,5 @@ package icu.samnyan.aqua.sega.ongeki.model -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating +import icu.samnyan.aqua.sega.general.model.UserRecentRating class OngekiUpsertUserAll { var userData: List? = null diff --git a/src/main/resources/db/80/V1000_60__drop_the_codebase.sql b/src/main/resources/db/80/V1000_60__drop_the_codebase.sql index e444827c..f50b0f25 100644 --- a/src/main/resources/db/80/V1000_60__drop_the_codebase.sql +++ b/src/main/resources/db/80/V1000_60__drop_the_codebase.sql @@ -12,4 +12,4 @@ drop table maimai_user_activity; drop table maimai_user_data; - +drop table sega_game_version; \ No newline at end of file