Skip to content

Commit 5c12b73

Browse files
BlankjBlankj
committed
see 02/26 log
1 parent 9304aa8 commit 5c12b73

File tree

4 files changed

+86
-59
lines changed

4 files changed

+86
-59
lines changed

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/http/Headers.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.blankj.utilcode.util.http;
2+
3+
import java.util.HashMap;
4+
import java.util.List;
5+
import java.util.Map;
6+
7+
public class Headers {
8+
9+
private Map<String, List<String>> header = new HashMap<>();
10+
11+
12+
13+
}

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/http/HttpUtils.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.io.OutputStream;
1313
import java.net.HttpURLConnection;
1414
import java.net.Proxy;
15+
import java.nio.charset.Charset;
1516
import java.util.Map;
1617
import java.util.concurrent.Executor;
1718

@@ -31,7 +32,7 @@ public final class HttpUtils {
3132
private static final String TWO_HYPHENS = "--";
3233

3334
private static final int CONNECT_TIMEOUT_TIME = 15000;
34-
private static final int READ_TIMEOUT_TIME = 19000;
35+
private static final int READ_TIMEOUT_TIME = 20000;
3536
private static final int BUFFER_SIZE = 8192;
3637

3738
private static final Config CONFIG = new Config();
@@ -64,6 +65,7 @@ private static HttpURLConnection getConnection(final Request request) throws IOE
6465
httpsConn.setSSLSocketFactory(CONFIG.sslConfig.mSSLSocketFactory);
6566
httpsConn.setHostnameVerifier(CONFIG.sslConfig.mHostnameVerifier);
6667
}
68+
System.out.println(conn.getHeaderField("USE"));
6769
addHeader(conn, request.mHeader);
6870
addBody(conn, request.mBody);
6971
conn.setConnectTimeout(CONFIG.connectTimeout);
@@ -179,13 +181,16 @@ private static boolean createOrExistsDir(final File file) {
179181
}
180182

181183
public static class Config {
182-
private int connectTimeout = CONNECT_TIMEOUT_TIME;
183-
private int readTimeout = READ_TIMEOUT_TIME;
184184

185-
private SSLConfig sslConfig = SSLConfig.DEFAULT_SSL_CONFIG;
186-
private Executor workExecutor = ExecutorFactory.getDefaultWorkExecutor();
187-
private Executor mainExecutor = ExecutorFactory.getDefaultMainExecutor();
188-
private Proxy proxy = null;
185+
private Executor workExecutor = ExecutorFactory.getDefaultWorkExecutor();
186+
private Executor mainExecutor = ExecutorFactory.getDefaultMainExecutor();
187+
188+
private SSLConfig sslConfig = SSLConfig.DEFAULT_SSL_CONFIG;
189+
private int connectTimeout = CONNECT_TIMEOUT_TIME;
190+
private int readTimeout = READ_TIMEOUT_TIME;
191+
private Charset charset = Charset.defaultCharset();
192+
193+
private Proxy proxy = null;
189194
}
190195

191196
static class Call implements Runnable {

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/http/Request.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*/
2323
public final class Request {
2424

25-
String methodName;
2625
URL mURL;
2726
Map<String, String> mHeader;
2827
Body mBody;

‎utilcode/lib/src/test/java/com/blankj/utilcode/util/http/HttpUtilsTest.java

Lines changed: 61 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
package com.blankj.utilcode.util.http;
22

33
import com.blankj.utilcode.util.BaseTest;
4+
import com.blankj.utilcode.util.FileIOUtils;
5+
import com.blankj.utilcode.util.FileUtils;
6+
import com.blankj.utilcode.util.GsonUtils;
7+
import com.blankj.utilcode.util.TestConfig;
8+
import com.blankj.utilcode.util.TimeUtils;
9+
10+
import org.junit.Test;
11+
12+
import java.io.File;
13+
import java.util.List;
414

515
/**
616
* <pre>
@@ -14,56 +24,56 @@ public class HttpUtilsTest extends BaseTest {
1424

1525
private static final String BASE_URL = "http://127.0.0.1:8081";
1626

17-
// @Test
18-
// public void getString() {
19-
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
20-
// @Override
21-
// public void onResponse(Response response) {
22-
// System.out.println(response.getHeaders());
23-
// System.out.println(response.getString());
24-
// }
25-
//
26-
// @Override
27-
// public void onFailed(Exception e) {
28-
// e.printStackTrace();
29-
// }
30-
// });
31-
// }
32-
//
33-
// @Test
34-
// public void getJson() {
35-
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
36-
// @Override
37-
// public void onResponse(Response response) {
38-
// System.out.println(response.getHeaders());
39-
// List<UserBean> users = response.getJson(GsonUtils.getListType(UserBean.class));
40-
// System.out.println(GsonUtils.toJson(users));
41-
// }
42-
//
43-
// @Override
44-
// public void onFailed(Exception e) {
45-
// e.printStackTrace();
46-
// }
47-
// });
48-
// }
49-
//
50-
// @Test
51-
// public void downloadFile() {
52-
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
53-
// @Override
54-
// public void onResponse(Response response) {
55-
// System.out.println(response.getHeaders());
56-
// File file = new File(TestConfig.PATH_HTTP + TimeUtils.getNowMills());
57-
// response.downloadFile(file);
58-
// System.out.println(FileIOUtils.readFile2String(file));
59-
// FileUtils.delete(file);
60-
// }
61-
//
62-
// @Override
63-
// public void onFailed(Exception e) {
64-
// e.printStackTrace();
65-
// }
66-
// });
67-
// }
27+
@Test
28+
public void getString() {
29+
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
30+
@Override
31+
public void onResponse(Response response) {
32+
System.out.println(response.getHeaders());
33+
System.out.println(response.getString());
34+
}
35+
36+
@Override
37+
public void onFailed(Exception e) {
38+
e.printStackTrace();
39+
}
40+
});
41+
}
42+
43+
@Test
44+
public void getJson() {
45+
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
46+
@Override
47+
public void onResponse(Response response) {
48+
System.out.println(response.getHeaders());
49+
List<UserBean> users = response.getJson(GsonUtils.getListType(UserBean.class));
50+
System.out.println(GsonUtils.toJson(users));
51+
}
52+
53+
@Override
54+
public void onFailed(Exception e) {
55+
e.printStackTrace();
56+
}
57+
});
58+
}
59+
60+
@Test
61+
public void downloadFile() {
62+
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
63+
@Override
64+
public void onResponse(Response response) {
65+
System.out.println(response.getHeaders());
66+
File file = new File(TestConfig.PATH_HTTP + TimeUtils.getNowMills());
67+
response.downloadFile(file);
68+
System.out.println(FileIOUtils.readFile2String(file));
69+
FileUtils.delete(file);
70+
}
71+
72+
@Override
73+
public void onFailed(Exception e) {
74+
e.printStackTrace();
75+
}
76+
});
77+
}
6878

6979
}

0 commit comments

Comments
 (0)