Merge pull request 'v0.0.4' (#4) from dev into master
Reviewed-on: #4
This commit was merged in pull request #4.
This commit is contained in:
43
pom.xml
43
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.imyeyu.network</groupId>
|
<groupId>com.imyeyu.network</groupId>
|
||||||
<artifactId>timi-network</artifactId>
|
<artifactId>timi-network</artifactId>
|
||||||
<version>0.0.3</version>
|
<version>0.0.4</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -28,10 +28,42 @@
|
|||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>3.3.1</version>
|
<version>3.3.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok-maven-plugin</artifactId>
|
||||||
|
<version>1.18.20.0</version>
|
||||||
|
<configuration>
|
||||||
|
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
|
||||||
|
<outputDirectory>${project.build.directory}/delombok</outputDirectory>
|
||||||
|
<addOutputDirectory>false</addOutputDirectory>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>generate-sources</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>delombok</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.36</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.11.2</version>
|
<version>3.11.2</version>
|
||||||
|
<configuration>
|
||||||
|
<sourcepath>${project.build.directory}/delombok</sourcepath>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
<charset>UTF-8</charset>
|
||||||
|
<docencoding>UTF-8</docencoding>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
@@ -65,12 +97,17 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents.client5</groupId>
|
<groupId>org.apache.httpcomponents.client5</groupId>
|
||||||
<artifactId>httpclient5-fluent</artifactId>
|
<artifactId>httpclient5-fluent</artifactId>
|
||||||
<version>5.2.1</version>
|
<version>5.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.code.gson</groupId>
|
<groupId>com.google.code.gson</groupId>
|
||||||
<artifactId>gson</artifactId>
|
<artifactId>gson</artifactId>
|
||||||
<version>2.11.0</version>
|
<version>2.13.2</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.40</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
|
|||||||
@@ -1,22 +1,22 @@
|
|||||||
package com.imyeyu.network;
|
package com.imyeyu.network;
|
||||||
|
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.apache.hc.client5.http.fluent.Request;
|
import org.apache.hc.client5.http.fluent.Request;
|
||||||
import org.apache.hc.core5.util.Timeout;
|
import org.apache.hc.core5.util.Timeout;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author 夜雨
|
* @author 夜雨
|
||||||
* @since 2025-07-15 14:27
|
* @since 2025-07-15 14:27
|
||||||
*/
|
*/
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class CommonRequest {
|
public class CommonRequest {
|
||||||
|
|
||||||
protected final Request request;
|
protected final Request request;
|
||||||
|
|
||||||
protected CommonRequest(Request request) {
|
|
||||||
this.request = request;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CommonRequest wrap(Request request) {
|
public static CommonRequest wrap(Request request) {
|
||||||
return new CommonRequest(request);
|
return new CommonRequest(request);
|
||||||
}
|
}
|
||||||
@@ -61,6 +61,10 @@ public class CommonRequest {
|
|||||||
return request.execute().returnContent().asBytes();
|
return request.execute().returnContent().asBytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public InputStream asStream() throws IOException {
|
||||||
|
return request.execute().returnContent().asStream();
|
||||||
|
}
|
||||||
|
|
||||||
public void execute() throws IOException {
|
public void execute() throws IOException {
|
||||||
request.execute();
|
request.execute();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,16 +40,19 @@ public class FileRequest extends CommonRequest {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public FileRequest header(String key, String value) {
|
public FileRequest header(String key, String value) {
|
||||||
request.addHeader(key, value);
|
request.addHeader(key, value);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public FileRequest token(String token) {
|
public FileRequest token(String token) {
|
||||||
request.addHeader("Token", token);
|
request.addHeader("Token", token);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public FileRequest language(String langHeader) {
|
public FileRequest language(String langHeader) {
|
||||||
request.addHeader("Accept-Language", langHeader);
|
request.addHeader("Accept-Language", langHeader);
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@@ -52,16 +52,19 @@ public class GsonRequest extends CommonRequest {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public GsonRequest header(String key, String value) {
|
public GsonRequest header(String key, String value) {
|
||||||
request.addHeader(key, value);
|
request.addHeader(key, value);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public GsonRequest token(String token) {
|
public GsonRequest token(String token) {
|
||||||
request.addHeader("Token", token);
|
request.addHeader("Token", token);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public GsonRequest language(String langHeader) {
|
public GsonRequest language(String langHeader) {
|
||||||
request.addHeader("Accept-Language", langHeader);
|
request.addHeader("Accept-Language", langHeader);
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ public class Network {
|
|||||||
dp.browse(URI.create(Encoder.url(url)));
|
dp.browse(URI.create(Encoder.url(url)));
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,16 +48,19 @@ public class ProgressiveRequest extends FileRequest {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public ProgressiveRequest header(String key, String value) {
|
public ProgressiveRequest header(String key, String value) {
|
||||||
request.addHeader(key, value);
|
request.addHeader(key, value);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public ProgressiveRequest token(String token) {
|
public ProgressiveRequest token(String token) {
|
||||||
request.addHeader("Token", token);
|
request.addHeader("Token", token);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public ProgressiveRequest language(String langHeader) {
|
public ProgressiveRequest language(String langHeader) {
|
||||||
request.addHeader("Accept-Language", langHeader);
|
request.addHeader("Accept-Language", langHeader);
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@@ -34,16 +34,19 @@ public class TimiRequest extends GsonRequest {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public TimiRequest header(String key, String value) {
|
public TimiRequest header(String key, String value) {
|
||||||
request.addHeader(key, value);
|
request.addHeader(key, value);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public TimiRequest token(String token) {
|
public TimiRequest token(String token) {
|
||||||
request.addHeader("Token", token);
|
request.addHeader("Token", token);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public TimiRequest language(String langHeader) {
|
public TimiRequest language(String langHeader) {
|
||||||
request.addHeader("Accept-Language", langHeader);
|
request.addHeader("Accept-Language", langHeader);
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
Reference in New Issue
Block a user