From 91ef5e3bc3249a3d04a820a8ac0df82b144b5743 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Sat, 19 Jul 2025 17:27:29 +0800
Subject: [PATCH] fix GsonRequest serialize fail

---
 .../java/com/imyeyu/network/GsonRequest.java  | 24 ++++++++++-------
 .../java/com/imyeyu/network/TimiRequest.java  | 26 ++++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/imyeyu/network/GsonRequest.java b/src/main/java/com/imyeyu/network/GsonRequest.java
index cd19417..5d7a4d9 100644
--- a/src/main/java/com/imyeyu/network/GsonRequest.java
+++ b/src/main/java/com/imyeyu/network/GsonRequest.java
@@ -14,7 +14,7 @@ import java.io.IOException;
  * @author 夜雨
  * @since 2025-07-15 14:27
  */
-public class GsonRequest<T> {
+public class GsonRequest {
 
 	private static final Gson GSON = new Gson();
 
@@ -30,25 +30,29 @@ public class GsonRequest<T> {
 		return TimiJava.firstNotNull(gson, GSON);
 	}
 
-	public static <T> GsonRequest<T> wrap(Request request) {
-		return new GsonRequest<>(request);
+	public static GsonRequest wrap(Request request) {
+		return new GsonRequest(request);
 	}
 
-	public static <T> GsonRequest<T> get(String url) {
-		return new GsonRequest<>(Request.get(url));
+	public static GsonRequest get(String url) {
+		return new GsonRequest(Request.get(url));
 	}
 
-	public static <T> GsonRequest<T> post(String url) {
-		return new GsonRequest<>(Request.post(url));
+	public static GsonRequest post(String url) {
+		return new GsonRequest(Request.post(url));
 	}
 
-	public GsonRequest<T> gson(Gson gson) {
+	public GsonRequest gson(Gson gson) {
 		this.gson = gson;
 		return this;
 	}
 
-	public T result() throws IOException {
-		return getGson().fromJson(request.execute().returnContent().asString(), new TypeToken<T>() {}.getType());
+	public <T> T resultAs(Class<T> clazz) throws IOException {
+		return getGson().fromJson(request.execute().returnContent().asString(), clazz);
+	}
+
+	public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
+		return getGson().fromJson(request.execute().returnContent().asString(), typeToken);
 	}
 
 	public JsonObject asJsonObject() throws IOException {
diff --git a/src/main/java/com/imyeyu/network/TimiRequest.java b/src/main/java/com/imyeyu/network/TimiRequest.java
index 5d058f3..bb18e7c 100644
--- a/src/main/java/com/imyeyu/network/TimiRequest.java
+++ b/src/main/java/com/imyeyu/network/TimiRequest.java
@@ -10,26 +10,34 @@ import java.io.IOException;
  * @author 夜雨
  * @since 2025-07-15 14:34
  */
-public class TimiRequest<T> extends GsonRequest<T> {
+public class TimiRequest extends GsonRequest {
 
 	protected TimiRequest(Request request) {
 		super(request);
 	}
 
-	public static <T> TimiRequest<T> wrap(Request request) {
-		return new TimiRequest<>(request);
+	public static TimiRequest wrap(Request request) {
+		return new TimiRequest(request);
 	}
 
-	public static <T> TimiRequest<T> get(String url) {
-		return new TimiRequest<>(Request.get(url));
+	public static TimiRequest get(String url) {
+		return new TimiRequest(Request.get(url));
 	}
 
-	public static <T> TimiRequest<T> post(String url) {
-		return new TimiRequest<>(Request.post(url));
+	public static TimiRequest post(String url) {
+		return new TimiRequest(Request.post(url));
 	}
 
-	public T result() throws IOException {
-		TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), new TypeToken<TimiResponse<T>>() {}.getType());
+	public <T> T resultAs(Class<T> clazz) throws IOException {
+		TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, clazz).getType());
+		if (resp.isFail()) {
+			throw resp.toException();
+		}
+		return resp.getData();
+	}
+
+	public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
+		TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, typeToken.getType()).getType());
 		if (resp.isFail()) {
 			throw resp.toException();
 		}