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 10:10:59 +08:00
parent f539633497
commit 6d1c4e6c85
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,8 +756,10 @@ public abstract class WebSocket<G extends Serializable, T> {
/**
* 当Single模式下用户重复登陆时回调函数，调用完之后关闭之前的WebSocket连接
*
* @return Future 可以为null
*/
public void onSingleRepeatConnect() {
public CompletableFuture<Integer> onSingleRepeatConnect() {
return null;
}
/**

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

@@ -242,14 +242,21 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
if (single && !anyuser) {
WebSocketServlet.this.node.existsWebSocket(userid).whenComplete((rs, nex) -> {
if (rs) {
webSocket.onSingleRepeatConnect();
node.forceCloseWebSocket(userid).whenComplete((fr, fex) -> {
WebSocketServlet.this.node.localEngine.add(webSocket);
WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
webSocket._runner = runner;
context.runAsync(runner);
response.finish(true);
});
CompletableFuture rcFuture = webSocket.onSingleRepeatConnect();
Runnable task = () -> {
node.forceCloseWebSocket(userid).whenComplete((fr, fex) -> {
WebSocketServlet.this.node.localEngine.add(webSocket);
WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
webSocket._runner = runner;
context.runAsync(runner);
response.finish(true);
});
};
if (rcFuture == null) {
task.run();
} else {
rcFuture.whenComplete((r, e) -> task.run());
}
} else {
WebSocketServlet.this.node.localEngine.add(webSocket);
WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());