This commit is contained in:
Redkale
2017-05-21 20:56:57 +08:00
parent 88942c61b5
commit 58271c803b
6 changed files with 144 additions and 118 deletions

View File

@@ -9,6 +9,7 @@ import org.redkale.net.http.WebServlet;
import org.redkale.net.http.WebSocketServlet;
import org.redkale.net.http.WebSocket;
import java.io.*;
import java.lang.reflect.Type;
import java.util.concurrent.atomic.*;
import org.redkale.convert.json.JsonConvert;
import org.redkale.util.Utility;
@@ -55,11 +56,11 @@ public class ChatWebSocketServlet extends WebSocketServlet {
return new WebSocket() {
@Override
public void onMessage(String text) {
public void onMessage(Object text) {
icounter.incrementAndGet();
counter.incrementAndGet();
ChatMessage message = jsonConvert.convertFrom(ChatMessage.class, text);
if (debug) System.out.println("收到消息: " + text + ", " + message);
ChatMessage message = (ChatMessage) text;//jsonConvert.convertFrom(ChatMessage.class, text.toString());
if (debug) System.out.println("收到消息: " + message);
super.getWebSocketGroup().getWebSockets().forEach(x -> x.send(message));
}
@@ -67,6 +68,11 @@ public class ChatWebSocketServlet extends WebSocketServlet {
protected Serializable createGroupid() {
return "";
}
@Override
public Type getTextMessageType(){
return ChatMessage.class;
}
};
}

View File

@@ -87,7 +87,7 @@ public class VideoWebSocketServlet extends WebSocketServlet {
}
@Override
public void onMessage(String text) {
public void onMessage(Object text) {
//System.out.println("接收到消息: " + text);
super.getWebSocketGroup().getWebSockets().filter(x -> x != this).forEach(x -> {
x.send(text);