lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-05-28 17:19:06 +08:00
parent 6d1c4e6c85
commit 0d0663a7de
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/redkale/net/http/WebSocket.java
View File

@@ -754,12 +754,12 @@ public abstract class WebSocket<G extends Serializable, T> {
} }
/** /**
* 当Single模式下用户重复登陆时回调函数，调用完之后关闭之前的WebSocket连接 * 当Single模式下用户重复登陆时回调函数，默认处理方式: 关闭旧连接
* *
* @return Future 可以为null * @return Future 可以为null, 为null或者Future值为false表示关闭新连接， Future值为true表示关闭旧连接
*/ */
public CompletableFuture<Integer> onSingleRepeatConnect() { public CompletableFuture<Boolean> onSingleRepeatConnect() {
return null; return forceCloseWebSocket(getUserid()).thenApply((r) -> true);
} }
/** /**

22
src/org/redkale/net/http/WebSocketServlet.java
View File

@@ -13,7 +13,7 @@ import java.nio.channels.CompletionHandler;
import java.security.*; import java.security.*;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer; import java.util.function.*;
import java.util.logging.*; import java.util.logging.*;
import javax.annotation.*; import javax.annotation.*;
import org.redkale.convert.Convert; import org.redkale.convert.Convert;
@@ -242,20 +242,28 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
if (single && !anyuser) { if (single && !anyuser) {
WebSocketServlet.this.node.existsWebSocket(userid).whenComplete((rs, nex) -> { WebSocketServlet.this.node.existsWebSocket(userid).whenComplete((rs, nex) -> {
if (rs) { if (rs) {
CompletableFuture rcFuture = webSocket.onSingleRepeatConnect(); CompletableFuture<Boolean> rcFuture = webSocket.onSingleRepeatConnect();
Runnable task = () -> { Consumer<Boolean> task = (oldkilled) -> {
node.forceCloseWebSocket(userid).whenComplete((fr, fex) -> { if (oldkilled) {
WebSocketServlet.this.node.localEngine.add(webSocket); WebSocketServlet.this.node.localEngine.add(webSocket);
WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel()); WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
webSocket._runner = runner; webSocket._runner = runner;
context.runAsync(runner); context.runAsync(runner);
response.finish(true); response.finish(true);
}); } else { //关闭新连接
response.finish(true);
}
}; };
if (rcFuture == null) { if (rcFuture == null) {
task.run(); task.accept(false);
} else { } else {
rcFuture.whenComplete((r, e) -> task.run()); rcFuture.whenComplete((r, e) -> {
if (e != null) {
response.finish(true);
} else {
task.accept(r);
}
});
} }
} else { } else {
WebSocketServlet.this.node.localEngine.add(webSocket); WebSocketServlet.this.node.localEngine.add(webSocket);