add CommonRequest.header

src/main/java/com/imyeyu/network/CommonRequest.java

@@ -1,6 +1,7 @@
 package com.imyeyu.network;
 
 import org.apache.hc.client5.http.fluent.Request;
+import org.apache.hc.core5.util.Timeout;
 
 import java.io.IOException;
 
@@ -28,6 +29,26 @@ public class CommonRequest {
 		return new CommonRequest(Request.post(url));
 	}
 
+	public CommonRequest timeout(long ms) {
+		request.connectTimeout(Timeout.ofMilliseconds(ms)).responseTimeout(Timeout.ofMilliseconds(ms));
+		return this;
+	}
+
+	public CommonRequest header(String key, String value) {
+		request.addHeader(key, value);
+		return this;
+	}
+
+	public CommonRequest token(String token) {
+		request.addHeader("Token", token);
+		return this;
+	}
+
+	public CommonRequest language(String langHeader) {
+		request.addHeader("Accept-Language", langHeader);
+		return this;
+	}
+
 	public String asString() throws IOException {
 		return request.execute().returnContent().asString();
 	}
@@ -39,4 +60,8 @@ public class CommonRequest {
 	public byte[] asBytes() throws IOException {
 		return request.execute().returnContent().asBytes();
 	}
+
+	public void execute() throws IOException {
+		request.execute();
+	}
 }

src/main/java/com/imyeyu/network/FileRequest.java

@@ -34,6 +34,27 @@ public class FileRequest extends CommonRequest {
 		return new FileRequest(Request.post(url));
 	}
 
+	@Override
+	public FileRequest timeout(long ms) {
+		super.timeout(ms);
+		return this;
+	}
+
+	public FileRequest header(String key, String value) {
+		request.addHeader(key, value);
+		return this;
+	}
+
+	public FileRequest token(String token) {
+		request.addHeader("Token", token);
+		return this;
+	}
+
+	public FileRequest language(String langHeader) {
+		request.addHeader("Accept-Language", langHeader);
+		return this;
+	}
+
 	public void toFile(String path, String fileName) throws IOException, NoPermissionException {
 		toFile(new File(IO.fitPath(path) + fileName));
 	}

src/main/java/com/imyeyu/network/GsonRequest.java

@@ -7,6 +7,7 @@ import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.imyeyu.java.TimiJava;
 import org.apache.hc.client5.http.fluent.Request;
+import org.apache.hc.core5.http.ContentType;
 
 import java.io.IOException;
 
@@ -45,6 +46,32 @@ public class GsonRequest extends CommonRequest {
 		return this;
 	}
 
+	@Override
+	public GsonRequest timeout(long ms) {
+		super.timeout(ms);
+		return this;
+	}
+
+	public GsonRequest header(String key, String value) {
+		request.addHeader(key, value);
+		return this;
+	}
+
+	public GsonRequest token(String token) {
+		request.addHeader("Token", token);
+		return this;
+	}
+
+	public GsonRequest language(String langHeader) {
+		request.addHeader("Accept-Language", langHeader);
+		return this;
+	}
+
+	public GsonRequest body(Object object) {
+		request.bodyString(getGson().toJson(object), ContentType.APPLICATION_JSON);
+		return this;
+	}
+
 	public <T> T resultAs(Class<T> clazz) throws IOException {
 		return getGson().fromJson(super.asString(), clazz);
 	}

src/main/java/com/imyeyu/network/ProgressiveRequest.java

@@ -42,6 +42,27 @@ public class ProgressiveRequest extends FileRequest {
 		return new ProgressiveRequest(Request.post(url), callback);
 	}
 
+	@Override
+	public ProgressiveRequest timeout(long ms) {
+		super.timeout(ms);
+		return this;
+	}
+
+	public ProgressiveRequest header(String key, String value) {
+		request.addHeader(key, value);
+		return this;
+	}
+
+	public ProgressiveRequest token(String token) {
+		request.addHeader("Token", token);
+		return this;
+	}
+
+	public ProgressiveRequest language(String langHeader) {
+		request.addHeader("Accept-Language", langHeader);
+		return this;
+	}
+
 	@Override
 	public void toFile(Path outputPath) throws IOException, NoPermissionException {
 		processResponse(request.execute(), IO.getOutputStream(outputPath.toFile()));

src/main/java/com/imyeyu/network/TimiRequest.java

@@ -28,6 +28,33 @@ public class TimiRequest extends GsonRequest {
 		return new TimiRequest(Request.post(url));
 	}
 
+	@Override
+	public TimiRequest timeout(long ms) {
+		super.timeout(ms);
+		return this;
+	}
+
+	public TimiRequest header(String key, String value) {
+		request.addHeader(key, value);
+		return this;
+	}
+
+	public TimiRequest token(String token) {
+		request.addHeader("Token", token);
+		return this;
+	}
+
+	public TimiRequest language(String langHeader) {
+		request.addHeader("Accept-Language", langHeader);
+		return this;
+	}
+
+	@Override
+	public TimiRequest body(Object object) {
+		super.body(object);
+		return this;
+	}
+
 	@Override
 	public String asString() throws IOException {
 		return resultAs(String.class);
@@ -53,4 +80,12 @@ public class TimiRequest extends GsonRequest {
 		}
 		return resp.getData();
 	}
+
+	@Override
+	public void execute() throws IOException {
+		TimiResponse<?> resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, Object.class).getType());
+		if (resp.isFail()) {
+			throw resp.toException();
+		}
+	}
 }