From 4cf60c504d92c409b5469cf1bbd18c19cd9d79eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com> Date: Wed, 19 Aug 2015 16:30:11 +0800 Subject: [PATCH] --- .../wentch/redkale/net/http/WebSocket.java | 12 +++++----- .../redkale/net/http/WebSocketNode.java | 24 +++++++++++++++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/com/wentch/redkale/net/http/WebSocket.java b/src/com/wentch/redkale/net/http/WebSocket.java index f1d4528e3..f4bb7bfcf 100644 --- a/src/com/wentch/redkale/net/http/WebSocket.java +++ b/src/com/wentch/redkale/net/http/WebSocket.java @@ -151,8 +151,8 @@ public abstract class WebSocket { * @param text 不可为空 * @return 为0表示成功, 其他值表示异常 */ - public final int sendMessage(Serializable groupid, String text) { - return sendMessage(groupid, text, true); + public final int sendEachMessage(Serializable groupid, String text) { + return sendEachMessage(groupid, text, true); } /** @@ -162,8 +162,8 @@ public abstract class WebSocket { * @param data 不可为空 * @return 为0表示成功, 其他值表示异常 */ - public final int sendMessage(Serializable groupid, byte[] data) { - return sendMessage(groupid, data, true); + public final int sendEachMessage(Serializable groupid, byte[] data) { + return WebSocket.this.sendEachMessage(groupid, data, true); } /** @@ -174,7 +174,7 @@ public abstract class WebSocket { * @param last * @return 为0表示成功, 其他值表示异常 */ - public final int sendMessage(Serializable groupid, String text, boolean last) { + public final int sendEachMessage(Serializable groupid, String text, boolean last) { return sendMessage(groupid, false, text, last); } @@ -186,7 +186,7 @@ public abstract class WebSocket { * @param last 是否最后一条 * @return 为0表示成功, 其他值表示异常 */ - public final int sendMessage(Serializable groupid, byte[] data, boolean last) { + public final int sendEachMessage(Serializable groupid, byte[] data, boolean last) { return sendMessage(groupid, false, data, last); } diff --git a/src/com/wentch/redkale/net/http/WebSocketNode.java b/src/com/wentch/redkale/net/http/WebSocketNode.java index 04205f11f..09238b758 100644 --- a/src/com/wentch/redkale/net/http/WebSocketNode.java +++ b/src/com/wentch/redkale/net/http/WebSocketNode.java @@ -145,14 +145,22 @@ public abstract class WebSocketNode { } //-------------------------------------------------------------------------------- - public final int sendMessage(Serializable groupid, String text) { + public final int sendEachMessage(Serializable groupid, String text) { return sendMessage(groupid, false, text); } - public final int sendMessage(Serializable groupid, String text, boolean last) { + public final int sendEachMessage(Serializable groupid, String text, boolean last) { return sendMessage(groupid, false, text, last); } + public final int sendRecentMessage(Serializable groupid, String text) { + return sendMessage(groupid, true, text); + } + + public final int sendRecentMessage(Serializable groupid, String text, boolean last) { + return sendMessage(groupid, true, text, last); + } + public final int sendMessage(Serializable groupid, boolean recent, String text) { return sendMessage(groupid, recent, text, true); } @@ -162,14 +170,22 @@ public abstract class WebSocketNode { } //-------------------------------------------------------------------------------- - public final int sendMessage(Serializable groupid, byte[] data) { + public final int sendEachMessage(Serializable groupid, byte[] data) { return sendMessage(groupid, false, data); } - public final int sendMessage(Serializable groupid, byte[] data, boolean last) { + public final int sendEachMessage(Serializable groupid, byte[] data, boolean last) { return sendMessage(groupid, false, data, last); } + public final int sendRecentMessage(Serializable groupid, byte[] data) { + return sendMessage(groupid, true, data); + } + + public final int sendRecentMessage(Serializable groupid, byte[] data, boolean last) { + return sendMessage(groupid, true, data, last); + } + public final int sendMessage(Serializable groupid, boolean recent, byte[] data) { return sendMessage(groupid, recent, data, true); }