params) {
* 设置 请求报文体
* @param body 请求报文体，可以是：
*
- * byte[] - 字节数组（直接作为报文体）
- * String - 字符串（比如：JSON 字符串、键值对字符串，也是直接作为报文体）
- * POJO - 普通 Java 数据对象（由 {@link MsgConvertor } 来序列化）
+ * byte[] - 字节数组（直接作为报文体）
+ * String - 字符串（比如：JSON 字符串、键值对字符串，也是直接作为报文体）
+ * POJO - 普通 Java 数据对象（由 {@link MsgConvertor } 来序列化）
* InputStream - 输入流（v3.5.0 开始支持）
*
* @return HttpTask 实例
@@ -530,7 +503,7 @@ public C addFilePara(String name, String filePath) {
/**
* 添加文件参数（以 multipart/form-data 形式上传）
* @param name 参数名
- * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等，参考 {@link HTTP.Builder#getMediaTypes() }
+ * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等，参考 @{ HTTP$Builder#mediaTypes }
* @param filePath 文件路径
* @return HttpTask 实例
*/
@@ -563,7 +536,7 @@ public C addFilePara(String name, File file) {
public C addFilePara(String name, String type, File file) {
if (name != null && file != null && file.exists()) {
if (files == null) {
- files = new ArrayListMap<>();
+ files = new HashMap<>();
}
files.put(name, new FilePara(type, file.getName(), file));
}
@@ -581,26 +554,6 @@ public C addFilePara(String name, String type, byte[] content) {
return addFilePara(name, type, name + DOT + type, content);
}
- /**
- * 添加文件参数（以 multipart/form-data 形式上传）
- * @param name 参数名
- * @param content 文件内容
- * @param fileName 文件名: 如 xxx.txt、xxx.png、xxx.doc 等
- * @return HttpTask 实例
- * @since v3.5.1
- */
- public C addFilePara(String name, byte[] content, String fileName) {
- if (fileName != null) {
- int dotIdx = fileName.indexOf(DOT);
- if (dotIdx >= 0 && dotIdx < fileName.length() - 1) {
- String type = fileName.substring(dotIdx + 1);
- return addFilePara(name, type, fileName, content);
- }
- return addFilePara(name, null, fileName, content);
- }
- return (C) this;
- }
-
/**
* 添加文件参数（以 multipart/form-data 形式上传）
* @param name 参数名
@@ -612,7 +565,7 @@ public C addFilePara(String name, byte[] content, String fileName) {
public C addFilePara(String name, String type, String fileName, byte[] content) {
if (name != null && content != null) {
if (files == null) {
- files = new ArrayListMap<>();
+ files = new HashMap<>();
}
files.put(name, new FilePara(type, fileName, content));
}
@@ -631,26 +584,6 @@ public C addFilePara(String name, String type, InputStream stream) {
return addFilePara(name, type, name + DOT + type, stream);
}
- /**
- * 添加文件参数（以 multipart/form-data 形式上传）
- * @param name 参数名
- * @param stream 文件输入流
- * @param fileName 文件名: 如 xxx.txt、xxx.png、xxx.doc 等
- * @return HttpTask 实例
- * @since v3.5.1
- */
- public C addFilePara(String name, InputStream stream, String fileName) {
- if (fileName != null) {
- int dotIdx = fileName.indexOf(DOT);
- if (dotIdx >= 0 && dotIdx < fileName.length() - 1) {
- String type = fileName.substring(dotIdx + 1);
- return addFilePara(name, type, fileName, stream);
- }
- return addFilePara(name, null, fileName, stream);
- }
- return (C) this;
- }
-
/**
* 添加文件参数（以 multipart/form-data 形式上传）
* @param name 参数名
@@ -663,7 +596,7 @@ public C addFilePara(String name, InputStream stream, String fileName) {
public C addFilePara(String name, String type, String fileName, InputStream stream) {
if (name != null && stream != null) {
if (files == null) {
- files = new ArrayListMap<>();
+ files = new HashMap<>();
}
files.put(name, new FilePara(type, fileName, stream));
}
@@ -681,7 +614,6 @@ public String boundary() {
/**
* 设置 MultipartBody 的边界符
* @since v3.4.2
- * @param boundary 边界符
* @return this
*/
public C boundary(String boundary) {
@@ -766,10 +698,12 @@ private long contentLength(RequestBody reqBody) {
private void buildHeaders(Request.Builder builder) {
if (headers != null) {
- headers.forEach((name, value) -> {
- if (value == null) return;
- builder.addHeader(name, value);
- });
+ for (String name : headers.keySet()) {
+ String value = headers.get(name);
+ if (value != null) {
+ builder.addHeader(name, value);
+ }
+ }
}
}
@@ -788,35 +722,27 @@ protected State toState(IOException e) {
}
private RequestBody buildRequestBody() {
- if (bodyParams != null && (OkHttps.FORM_DATA.equals(bodyType) || bodyType.startsWith(MULTIPART))
+ if (bodyParams != null && (OkHttps.FORM_DATA.equalsIgnoreCase(bodyType) || bodyType.startsWith("multipart"))
|| files != null) {
MultipartBody.Builder builder = multipartBodyBuilder();
if (bodyParams != null) {
- bodyParams.forEach((key, value) -> {
+ Platform.forEach(bodyParams, (key, value) -> {
if (value == null) return;
- MediaType contentType = null;
- String bodyValue;
- if (value instanceof BodyPara) {
- BodyPara para = (BodyPara) value;
- contentType = httpClient.mediaType(para.getType());
- bodyValue = para.getValue().toString();
- } else {
- bodyValue = value.toString();
- }
- byte[] content = bodyValue.getBytes(charset);
- RequestBody body = RequestBody.create(contentType, content);
+ byte[] content = value.toString().getBytes(charset);
+ RequestBody body = RequestBody.create(null, content);
builder.addPart(MultipartBody.Part.createFormData(key, null, body));
});
}
if (files != null) {
- files.forEach((name, file) -> {
+ for (String name : files.keySet()) {
+ FilePara file = files.get(name);
MediaType type = httpClient.mediaType(file.getType());
builder.addFormDataPart(
name,
file.getFileName(),
file.toRequestBody(type)
);
- });
+ }
}
return builder.build();
}
@@ -826,9 +752,9 @@ private RequestBody buildRequestBody() {
if (bodyParams == null) {
return emptyRequestBody();
}
- if (OkHttps.FORM.equals(bodyType) || bodyType.endsWith(FORM)) {
+ if (OkHttps.FORM.equalsIgnoreCase(bodyType)) {
FormBody.Builder builder = new FormBody.Builder(charset);
- bodyParams.forEach((key, value) -> {
+ Platform.forEach(bodyParams, (key, value) -> {
if (value == null) return;
builder.add(key, value.toString());
});
@@ -844,7 +770,7 @@ private MultipartBody.Builder multipartBodyBuilder() {
} else {
builder = new MultipartBody.Builder();
}
- if (bodyType.startsWith(MULTIPART)) {
+ if (bodyType.startsWith("multipart")) {
try {
builder.setType(MediaType.get(bodyType));
} catch (IllegalArgumentException ignore) { }
@@ -878,67 +804,72 @@ private RequestBody toRequestBody(Object bodyObj) {
}
private String buildUrlPath() {
- if (Platform.isBlank(urlPath)) {
+ String url = urlPath;
+ if (url == null || url.trim().isEmpty()) {
throw new OkHttpsException("url 不能为空！");
}
- StringBuilder sb = new StringBuilder(urlPath);
if (pathParams != null) {
- pathParams.forEach((name, value) -> {
+ for (String name : pathParams.keySet()) {
String target = "{" + name + "}";
- int start = sb.indexOf(target);
- if (start >= 0) {
- String newValue = value != null ? value.toString() : "";
- sb.replace(start, start + target.length(), newValue);
+ if (url.contains(target)) {
+ Object value = pathParams.get(name);
+ url = url.replace(target, value != null ? value.toString() : "");
} else {
- throw new OkHttpsException("PathPara [ " + name + " ] 不存在于 url [ " + urlPath + " ]");
+ throw new OkHttpsException("pathPara [ " + name + " ] 不存在于 url [ " + urlPath + " ]");
}
- });
+ }
+ }
+ if (url.matches(PATH_PARAM_REGEX)) {
+ throw new OkHttpsException("url 里有 pathPara 没有设置，你必须先调用 addPathPara 为其设置！");
}
if (urlParams != null) {
- if (sb.indexOf("?") >= 0) { // contains("?")
- int lastIndex = sb.length() - 1;
- if (sb.lastIndexOf("?") < lastIndex) { // !endsWith("?")
- if (sb.lastIndexOf("=") < sb.lastIndexOf("?") + 2) {
- throw new OkHttpsException("url 格式错误，'?' 后没有发现 '='");
- }
- if (sb.lastIndexOf("&") < lastIndex) { // !endsWith("&")
- sb.append('&');
- }
+ url = buildUrl(url.trim());
+ }
+ return url;
+ }
+
+ private String buildUrl(String url) {
+ StringBuilder sb = new StringBuilder(url);
+ if (url.contains("?")) {
+ if (!url.endsWith("?")) {
+ if (url.lastIndexOf("=") < url.lastIndexOf("?") + 2) {
+ throw new OkHttpsException("url 格式错误，'?' 后没有发现 '='");
+ }
+ if (!url.endsWith("&")) {
+ sb.append('&');
}
- } else {
- sb.append('?');
}
- urlParams.forEach((name, value) -> {
- if (value == null) return;
- sb.append(name).append('=').append(value).append('&');
- });
- sb.delete(sb.length() - 1, sb.length());
+ } else {
+ sb.append('?');
+ }
+ for (String name : urlParams.keySet()) {
+ sb.append(name).append('=').append(urlParams.get(name)).append('&');
}
+ sb.delete(sb.length() - 1, sb.length());
return sb.toString();
}
/**
* 参数冲突校验
- * @param bodyCantUsed 报文体是否不可用
*/
protected void assertNotConflict(boolean bodyCantUsed) {
if (bodyCantUsed) {
if (requestBody != null) {
- throw new OkHttpsException("GET | HEAD request can not call setBodyPara(..) method!");
+ throw new OkHttpsException("GET | HEAD 请求 不能调用 setBodyPara 方法！");
}
if (isNotEmpty(bodyParams)) {
- throw new OkHttpsException("GET | HEAD request can not call addBodyPara(..) method!");
+ throw new OkHttpsException("GET | HEAD 请求 不能调用 addBodyPara 方法！");
}
if (isNotEmpty(files)) {
- throw new OkHttpsException("GET | HEAD request can not call addFilePara(..) method!");
+ throw new OkHttpsException("GET | HEAD 请求 不能调用 addFilePara 方法！");
}
}
if (requestBody != null) {
if (isNotEmpty(bodyParams)) {
- throw new OkHttpsException("can not call addBodyPara(..) and setBodyPara(..) at the same time!");
+ throw new OkHttpsException("方法 addBodyPara 与 setBodyPara 不能同时使用！");
}
if (isNotEmpty(files)) {
- throw new OkHttpsException("can not call addFilePara(..) and setBodyPara(..) at the same time!");
+ throw new OkHttpsException("方法 addFilePara 与 setBodyPara 不能同时使用！");
}
}
}
@@ -956,7 +887,7 @@ protected boolean timeoutAwait(CountDownLatch latch) {
return !latch.await(httpClient.preprocTimeoutMillis(),
TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- throw new OkHttpsException("execute timeout: " + urlPath, e);
+ throw new OkHttpsException("执行超时: " + urlPath, e);
}
}
@@ -964,7 +895,7 @@ protected HttpResult timeoutResult() {
if (nothrow) {
return new RealHttpResult(this, State.TIMEOUT);
}
- throw new OkHttpsException(State.TIMEOUT, "execute timeout: " + urlPath);
+ throw new OkHttpsException(State.TIMEOUT, "执行超时: " + urlPath);
}
public Charset charset(Response response) {
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java
similarity index 98%
rename from okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java
index 00c2c4f0..a2404a3d 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java
@@ -1,4 +1,4 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
import okhttp3.Call;
import okhttp3.Request;
@@ -20,6 +20,7 @@ public class HttpUtils {
* 配置HttpUtils持有的HTTP实例（不调用此方法前默认使用一个没有没有经过任何配置的HTTP懒实例）
* @param http HTTP实例
*/
+ @Deprecated
public static void of(HTTP http) {
if (http != null) {
HttpUtils.http = http;
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java b/okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java
similarity index 89%
rename from okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java
index 090660f7..7f167e35 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java
@@ -1,9 +1,9 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
-import cn.zhxu.data.Array;
-import cn.zhxu.data.DataConvertor;
-import cn.zhxu.data.DataSet;
-import cn.zhxu.data.Mapper;
+import com.ejlchina.data.Array;
+import com.ejlchina.data.DataConvertor;
+import com.ejlchina.data.DataSet;
+import com.ejlchina.data.Mapper;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -47,7 +47,7 @@ public FormConvertor(DataConvertor convertor, boolean urlEncoded) {
@Override
public String mediaType() {
- return "application/x-www-form-urlencoded";
+ return "application/x-www-form-urlencoded; charset={charset}";
}
@Override
@@ -61,7 +61,7 @@ public Array toArray(InputStream in, Charset charset) {
}
@Override
- public byte[] serialize(Object object, Charset charset, boolean pretty) {
+ public byte[] serialize(Object object, Charset charset) {
byte[] result = convertor.serialize(object, charset);
Mapper mapper = convertor.toMapper(new ByteArrayInputStream(result), charset);
StringBuilder sb = new StringBuilder();
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java
similarity index 84%
rename from okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java
index e592c917..56aca586 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java
@@ -1,4 +1,4 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
import okhttp3.Call;
import okhttp3.Request;
@@ -20,23 +20,19 @@ public final class OkHttps {
public static final String PROTOBUF = "protobuf";
public static final String MSGPACK = "msgpack";
- private static HTTP instance;
+ private static HTTP http;
private OkHttps() {}
- public static HTTP getHttp() {
- if (instance != null) {
- return instance;
- }
- synchronized (OkHttps.class) {
- if (instance == null) {
- HTTP.Builder builder = HTTP.builder();
- ConvertProvider.inject(builder);
- Config.config(builder);
- instance = builder.build();
- }
- return instance;
+ public static synchronized HTTP getHttp() {
+ if (http != null) {
+ return http;
}
+ HTTP.Builder builder = HTTP.builder();
+ ConvertProvider.inject(builder);
+ Config.config(builder);
+ http = builder.build();
+ return http;
}
/**
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttpsException.java
similarity index 96%
rename from okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/OkHttpsException.java
index 67993955..3817aa51 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttpsException.java
@@ -1,4 +1,4 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
/**
* Created by 周旭（Troy.Zhou） on 2016/8/30.
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java b/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java
new file mode 100644
index 00000000..bfeeaa3e
--- /dev/null
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java
@@ -0,0 +1,11 @@
+package com.ejlchina.okhttps;
+
+/**
+ * 数据回调接口
+ * Created by 15735 on 2017/1/3.
+ */
+public interface OnCallback {
+
+ void on(T data);
+
+}
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java b/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java
new file mode 100644
index 00000000..88ec9c1b
--- /dev/null
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java
@@ -0,0 +1,15 @@
+package com.ejlchina.okhttps;
+
+import okio.ByteString;
+
+/**
+ * 心跳数据提供者
+ */
+public interface PingSupplier {
+
+ /**
+ * @return 心跳数据
+ */
+ ByteString getPing();
+
+}
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Platform.java b/okhttps/src/main/java/com/ejlchina/okhttps/Platform.java
similarity index 75%
rename from okhttps/src/main/java/cn/zhxu/okhttps/Platform.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/Platform.java
index 1766bb0e..82293ed2 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/Platform.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/Platform.java
@@ -1,4 +1,4 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -90,44 +90,4 @@ public static void forEach(Map map, BiConsumer task, AHttpTask.OkHttpCall call, Consumer onResponse, HttpResult result, boolean onIo) {
+ public void executeOnResponse(HttpTask task, AHttpTask.OkHttpCall call, OnCallback onResponse, HttpResult result, boolean onIo) {
Runnable runnable = () -> {
- if (!call.isCanceled()) onResponse.accept(result);
+ if (!call.isCanceled()) onResponse.on(result);
};
if (responseListener != null) {
if (responseListener.listen(task, result) && onResponse != null) {
@@ -79,10 +78,10 @@ public void executeOnResponse(HttpTask task, AHttpTask.OkHttpCall call, Consu
}
}
- public boolean executeOnException(HttpTask task, AHttpTask.OkHttpCall call, Consumer onException, IOException error, boolean onIo) {
+ public boolean executeOnException(HttpTask task, AHttpTask.OkHttpCall call, OnCallback onException, IOException error, boolean onIo) {
Runnable runnable = () -> {
if (!call.isCanceled()) {
- onException.accept(error);
+ onException.on(error);
}
call.finish();
};
@@ -101,13 +100,13 @@ public boolean executeOnException(HttpTask task, AHttpTask.OkHttpCall call, C
return true;
}
- public void executeOnComplete(HttpTask task, Consumer onComplete, State state, boolean onIo) {
+ public void executeOnComplete(HttpTask task, OnCallback onComplete, State state, boolean onIo) {
if (completeListener != null) {
if (completeListener.listen(task, state) && onComplete != null) {
- execute(() -> onComplete.accept(state), onIo);
+ execute(() -> onComplete.on(state), onIo);
}
} else if (onComplete != null) {
- execute(() -> onComplete.accept(state), onIo);
+ execute(() -> onComplete.on(state), onIo);
}
}
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java b/okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java
similarity index 91%
rename from okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java
index 96e11a84..54f734d1 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java
@@ -1,4 +1,4 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
/**
* 任务监听接口
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Toable.java b/okhttps/src/main/java/com/ejlchina/okhttps/Toable.java
similarity index 89%
rename from okhttps/src/main/java/cn/zhxu/okhttps/Toable.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/Toable.java
index 4b5f562d..06c62016 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/Toable.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/Toable.java
@@ -1,8 +1,8 @@
-package cn.zhxu.okhttps;
+package com.ejlchina.okhttps;
-import cn.zhxu.data.Array;
-import cn.zhxu.data.Mapper;
-import cn.zhxu.data.TypeRef;
+import com.ejlchina.data.Array;
+import com.ejlchina.data.Mapper;
+import com.ejlchina.data.TypeRef;
import okio.ByteString;
import java.io.InputStream;
@@ -23,10 +23,8 @@ public interface Toable {
byte[] toBytes();
/**
- * will be removed in next version
* @return ByteString
*/
- @Deprecated
ByteString toByteString();
/**
diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/WHttpTask.java
similarity index 88%
rename from okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java
rename to okhttps/src/main/java/com/ejlchina/okhttps/WHttpTask.java
index 3c24331a..9e4a63bc 100644
--- a/okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java
+++ b/okhttps/src/main/java/com/ejlchina/okhttps/WHttpTask.java
@@ -1,11 +1,11 @@
-package cn.zhxu.okhttps;
-
-import cn.zhxu.okhttps.WebSocket.Close;
-import cn.zhxu.okhttps.WebSocket.Listener;
-import cn.zhxu.okhttps.WebSocket.Message;
-import cn.zhxu.okhttps.internal.AbstractHttpClient;
-import cn.zhxu.okhttps.internal.RealHttpResult;
-import cn.zhxu.okhttps.internal.WebSocketMsg;
+package com.ejlchina.okhttps;
+
+import com.ejlchina.okhttps.WebSocket.Close;
+import com.ejlchina.okhttps.WebSocket.Listener;
+import com.ejlchina.okhttps.WebSocket.Message;
+import com.ejlchina.okhttps.internal.AbstractHttpClient;
+import com.ejlchina.okhttps.internal.RealHttpResult;
+import com.ejlchina.okhttps.internal.WebSocketMsg;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.WebSocketListener;
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
public class WHttpTask extends HttpTask {
@@ -41,7 +40,7 @@ public class WHttpTask extends HttpTask {
private long lastPongSecs = 0;
// 心跳数据提供者
- private Supplier pingSupplier;
+ private PingSupplier pingSupplier;
private WebSocketImpl webSocket;
@@ -72,14 +71,14 @@ public boolean isWebsocket() {
*
* 由于 OkHttp 底层并未暴露 websocket 协议里 opcode 的接口，所以该心跳的 opcode 始终是 2，并不是 websocket 协议里定义的 9
* 所以如果服务器要求客户端心跳的 opcode 必须是 9 的话，请使用 OkHttp 的原生心跳：
- * https://ok.zhxu.cn/v3/websocket.html#%E5%85%A8%E5%B1%80%E5%BF%83%E8%B7%B3%E9%85%8D%E7%BD%AE
+ * [http://okhttps.ejlchina.com/v2/websocket.html#%E5%85%A8%E5%B1%80%E5%BF%83%E8%B7%B3%E9%85%8D%E7%BD%AE]
*
- * 另若需要 可使用 {@link #pingSupplier(Supplier)} 方法指定心跳发送的具体内容
+ * 另若需要 可使用 {@link #pingSupplier(PingSupplier)} 方法指定心跳发送的具体内容
*
* @since v2.3.0
* @param pingSeconds 客户端心跳间隔秒数（0 表示不需要心跳）
* @param pongSeconds 服务器心跳间隔秒数（0 表示不需要心跳）
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask heatbeat(int pingSeconds, int pongSeconds) {
if (pingSeconds < 0 || pongSeconds < 0) {
@@ -94,7 +93,7 @@ public WHttpTask heatbeat(int pingSeconds, int pongSeconds) {
* 用于兼容某些强制客户端必须以固定的时间间隔发送心跳的服务器
* @since v2.5.0
* @param flexiblePing Ping 的间隔是否灵活可变（默认为 true, 为 false 时客户端 Ping 的间隔固定，普通的消息不做为 Ping）
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask flexiblePing(boolean flexiblePing) {
this.flexiblePing = flexiblePing;
@@ -103,14 +102,14 @@ public WHttpTask flexiblePing(boolean flexiblePing) {
/**
* @param pingSupplier 心跳数据提供者
- * @return WHttpTask
+ * @return WebSocketTask
*/
- public WHttpTask pingSupplier(Supplier pingSupplier) {
+ public WHttpTask pingSupplier(PingSupplier pingSupplier) {
this.pingSupplier = pingSupplier;
return this;
}
- public Supplier pingSupplier() {
+ public PingSupplier pingSupplier() {
return pingSupplier;
}
@@ -202,6 +201,7 @@ public void onMessage(okhttp3.WebSocket webSocket, String text) {
}
if (pongSeconds > 0) {
lastPongSecs = nowSeconds();
+ Platform.logInfo("PONG <<< " + text);
}
}
@@ -214,29 +214,30 @@ public void onMessage(okhttp3.WebSocket webSocket, ByteString bytes) {
}
if (pongSeconds > 0) {
lastPongSecs = nowSeconds();
+ Platform.logInfo("PONG <<< " + bytes.utf8());
}
}
@Override
- public void onClosing(okhttp3.WebSocket ws, int code, String reason) {
+ public void onClosing(okhttp3.WebSocket webSocket, int code, String reason) {
this.webSocket.setStatus(WebSocket.STATUS_DISCONNECTED);
Listener listener = onClosing;
if (listener != null) {
execute(() -> listener.on(this.webSocket, new Close(code, reason)), closingOnIO);
}
httpClient.executor().requireScheduler().schedule(() -> {
- doOnClose(HttpResult.State.RESPONSED, code, reason);
+ doOnClose(webSocket, HttpResult.State.RESPONSED, code, reason);
}, maxClosingSecs, TimeUnit.SECONDS);
}
@Override
- public void onClosed(okhttp3.WebSocket ws, int code, String reason) {
- doOnClose(HttpResult.State.RESPONSED, code, reason);
+ public void onClosed(okhttp3.WebSocket webSocket, int code, String reason) {
+ doOnClose(webSocket, HttpResult.State.RESPONSED, code, reason);
}
- private void doOnClose(HttpResult.State state, int code, String reason) {
+ private void doOnClose(okhttp3.WebSocket webSocket, HttpResult.State state, int code, String reason) {
synchronized(WHttpTask.this) {
- if (WHttpTask.this.webSocket == null || this.webSocket != WHttpTask.this.webSocket) {
+ if (WHttpTask.this.webSocket == null || this.webSocket.webSocket != webSocket) {
return; // 回调已经执行过
}
WHttpTask.this.webSocket = null;
@@ -275,9 +276,9 @@ private Close updateStatus(HttpResult.State state, int code, String reason) {
}
@Override
- public void onFailure(okhttp3.WebSocket ws, Throwable t, Response response) {
+ public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response response) {
IOException e = t instanceof IOException ? (IOException) t : new IOException(t.getMessage(), t);
- doOnClose(toState(e), 0, t.getMessage());
+ doOnClose(webSocket, toState(e), 0, t.getMessage());
TaskListener listener = httpClient.executor().getExceptionListener();
Listener exceptionListener = onException;
if (listener != null) {
@@ -315,7 +316,8 @@ private void schedulePing() {
}
WebSocket ws = webSocket;
if (nowSeconds() - lastPingSecs >= pingSeconds && ws != null) {
- ws.send(pingSupplier != null ? pingSupplier.get() : ByteString.EMPTY);
+ ByteString ping = pingSupplier != null ? pingSupplier.getPing() : ByteString.EMPTY;
+ ws.send(ping);
lastPingSecs = nowSeconds();
}
schedulePing();
@@ -351,7 +353,7 @@ private void schedulePong() {
* @return 当前时间戳（秒）
*/
private long nowSeconds() {
- return System.currentTimeMillis() / 1000;
+ return System.nanoTime() / 1000_000_000;
}
class WebSocketImpl implements WebSocket {
@@ -469,7 +471,7 @@ boolean send(okhttp3.WebSocket webSocket, Object msg) {
/**
* 连接打开监听
* @param onOpen 监听器
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask setOnOpen(Listener onOpen) {
this.onOpen = onOpen;
@@ -481,7 +483,7 @@ public WHttpTask setOnOpen(Listener onOpen) {
/**
* 连接异常监听
* @param onException 监听器
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask setOnException(Listener onException) {
this.onException = onException;
@@ -493,7 +495,7 @@ public WHttpTask setOnException(Listener onException) {
/**
* 消息监听
* @param onMessage 监听器
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask setOnMessage(Listener onMessage) {
this.onMessage = onMessage;
@@ -505,7 +507,7 @@ public WHttpTask setOnMessage(Listener onMessage) {
/**
* 正在关闭监听
* @param onClosing 监听器
- * @return WHttpTask
+ * @return WebSocketTask
*/
public WHttpTask setOnClosing(Listener
- 
- 
+ 
+ 
* 由于近期交流群的二维码被爬，扫码入群方式已被关闭
库的使用上若有疑问，可先加微信【18556739726】（请备注 OkHttps）再入群交流
+* 邮箱：zhou.xu@ejlchina.com
## 友情链接
@@ -120,7 +121,7 @@ Websocket 方法：
[**[ hrun4j ]** 接口自动化测试解决方案 --工具选得好，下班回家早；测试用得对，半夜安心睡 ](https://github.com/lematechvip/hrun4j)
-[**[ Json Kit ]** 超轻量级 JSON 门面工具，用法简单，不依赖具体实现，让业务代码与 Jackson、Gson、Fastjson 等解耦！](https://gitee.com/troyzhxu/jsonkit)
+[**[ Json Kit ]** 超轻量级 JSON 门面工具，用法简单，不依赖具体实现，让业务代码与 Jackson、Gson、Fastjson 等解耦！](https://gitee.com/ejlchina-zhxu/jsonkit)
## 参与贡献
@@ -129,3 +130,8 @@ Websocket 方法：
3. 提交代码
4. 新建 Pull Request
+## Next
+
+* Java 9 的模块系统
+* 请求参数支持重复的 key
+* 验证 nps 代理
diff --git a/okhttps-fastjson/README.md b/okhttps-fastjson/README.md
index bbf641f0..3e857ab4 100644
--- a/okhttps-fastjson/README.md
+++ b/okhttps-fastjson/README.md
@@ -9,16 +9,16 @@
```xml