test: 1.5.33

README.md

@@ -44,7 +44,7 @@ Forest是一个高层的、极简的声明式HTTP调用API框架<br>
 -------------------------------------
 * [项目主页](http://forest.dtflyx.com/) 
 
-* [中文文档](https://forest.dtflyx.com/pages/1.5.32/intro/) 
+* [中文文档](https://forest.dtflyx.com/pages/1.5.33/intro/) 
 
 * [JavaDoc](https://apidoc.gitee.com/dt_flys/forest/)
 
@@ -86,7 +86,7 @@ Forest有哪些特性？
 <dependency>
  <groupId>com.dtflys.forest</groupId>
  <artifactId>forest-spring-boot-starter</artifactId>
- <version>1.5.32</version>
+ <version>1.5.33</version>
 </dependency>
 ```
 

forest-core/src/main/java/com/dtflys/forest/http/ForestProxy.java

@@ -85,10 +85,26 @@ public String cacheKey() {
  return builder.toString();
  }
 
+ /**
+ * 获取代理的协议类型
+ *
+ * @return 代理的协议类型
+ * @since 1.5.33
+ */
  public ForestProxyType getType() {
  return type;
  }
 
+ /**
+ * 获取代理的协议类型
+ *
+ * @return 代理的协议类型
+ * @since 1.5.33
+ */
+ public ForestProxyType type() {
+ return type;
+ }
+
  /**
  * 获取代理主机地址
  *
@@ -98,6 +114,16 @@ public String getHost() {
  return host;
  }
 
+ /**
+ * 获取代理主机地址
+ *
+ * @return 代理主机地址
+ * @since 1.5.33
+ */
+ public String host() {
+ return host;
+ }
+
  /**
  * 获取代理主机端口
  *
@@ -107,6 +133,16 @@ public int getPort() {
  return port;
  }
 
+ /**
+ * 获取代理主机端口
+ *
+ * @return 代理主机端口
+ * @since 1.5.33
+ */
+ public int port() {
+ return port;
+ }
+
  /**
  * 获取代理用户名
  *
@@ -132,6 +168,7 @@ public ForestProxy setUsername(String username) {
  *
  * @param username 代理用户名
  * @return {@link ForestProxy}对象实例
+ * @since 1.5.33
  */
  public ForestProxy username(String username) {
  this.username = username;
@@ -143,6 +180,7 @@ public String getCharset() {
  return charset;
  }
 
+
  public ForestProxy setCharset(String charset) {
  this.charset = charset;
  return this;
@@ -154,6 +192,8 @@ public ForestProxy charset(String charset) {
  }
 
 
+
+
  /**
  * 获取代理密码
  *
@@ -178,7 +218,8 @@ public ForestProxy setPassword(String password) {
  * 获取代理密码
  *
  * @param password 代理密码
- * @return
+ * @return {@link ForestProxy}类实例
+ * @since 1.5.33
  */
  public ForestProxy password(String password) {
  this.password = password;

forest-core/src/test/java/com/dtflys/test/http/proxy/HTTPProxyClient.java

@@ -23,7 +23,7 @@ public interface HTTPProxyClient {
  ForestRequest<String> sendHostPortSocks(String host, int port);
 
  @Post("/")
- @SocksProxy(host = "${0}", port = "${1}")
+ @SocksProxy(host = "${0}", port = "${1}", username = "", password = "")
  ForestRequest<String> sendHostPortSocks2(String host, int port);
 
 

forest-core/src/test/java/com/dtflys/test/http/proxy/MyHTTPProxySource.java

@@ -12,6 +12,6 @@ public class MyHTTPProxySource implements HTTPProxySource {
 
  @Override
  public ForestProxy getProxy(ForestRequest request) {
- return new ForestProxy("127.0.0.1", (Integer) request.variableValue("port"));
+ return ForestProxy.http("127.0.0.1", (Integer) request.variableValue("port"));
  }
 }

forest-solon-plugin/src/test/java/com/dtflys/forest/solon/test/Test0.java

@@ -134,19 +134,29 @@ public void testRetry() {
  String backendName = backend.getName();
  Mockito.verify(logger).info("[Forest] Request (" + backendName + "): \n" +
  "\t[Retry]: 1\n" +
- "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS");
+ "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS\n" +
+ "\tHeaders: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
  Mockito.verify(logger).info("[Forest] Request (" + backendName + "): \n" +
  "\t[Retry]: 2\n" +
- "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS");
+ "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS\n" +
+ "\tHeaders: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
  Mockito.verify(logger).info("[Forest] Request (" + backendName + "): \n" +
  "\t[Retry]: 3\n" +
- "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS");
+ "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS\n" +
+ "\tHeaders: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
  Mockito.verify(logger).info("[Forest] Request (" + backendName + "): \n" +
  "\t[Retry]: 4\n" +
- "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS");
+ "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS\n" +
+ "\tHeaders: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
  Mockito.verify(logger).info("[Forest] Request (" + backendName + "): \n" +
  "\t[Retry]: 5\n" +
- "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS");
+ "\tGET https://www.thebeastshop.com/autopage/shops.htm HTTPS\n" +
+ "\tHeaders: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
 // Mockito.verify(logger).info("[Forest] [Network Error]: connect timed out");
 
  }

forest-solon-plugin/src/test/java/com/dtflys/forest/solon/test/Test2.java

@@ -50,7 +50,9 @@ public void testClient2() {
  String result = (String) request.execute();
  assertThat(result.startsWith("Global: ")).isTrue();
  Mockito.verify(logger).info("[Forest] [Test2] 请求: \n" +
- "\tGET https://gitee.com/dt_flys HTTPS");
+ "\tGET https://gitee.com/dt_flys HTTPS\n" +
+ "\t请求头: \n" +
+ "\t\tUser-Agent: forest/1.5.33");
  }
 
 

forest-solon-plugin/src/test/resources/app-test2.yml

@@ -8,7 +8,7 @@ forest:
  read-timeout: 6000
  max-retry-count: 0
  interceptors:
- com.dtflys.forest.solon.test.interceptor.GlobalInterceptor
+ - com.dtflys.forest.solon.test.interceptor.GlobalInterceptor
 
 
 test: