diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java index b88293788..c11a3007a 100644 --- a/src/org/redkale/net/http/WebSocketNode.java +++ b/src/org/redkale/net/http/WebSocketNode.java @@ -92,13 +92,13 @@ public abstract class WebSocketNode { protected abstract CompletableFuture broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketRange wsrange, Object message, boolean last); - protected abstract CompletableFuture connect(Serializable userid, @RpcTargetAddress InetSocketAddress addr); + protected abstract CompletableFuture connect(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr); - protected abstract CompletableFuture disconnect(Serializable userid, @RpcTargetAddress InetSocketAddress addr); + protected abstract CompletableFuture disconnect(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr); - protected abstract CompletableFuture changeUserid(Serializable fromuserid, Serializable touserid, @RpcTargetAddress InetSocketAddress addr); + protected abstract CompletableFuture changeUserid(Serializable fromuserid, Serializable touserid, @RpcTargetAddress InetSocketAddress sncpAddr); - protected abstract CompletableFuture forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress addr); + protected abstract CompletableFuture forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress targetAddress); //-------------------------------------------------------------------------------- final CompletableFuture connect(final Serializable userid) { diff --git a/src/org/redkale/service/WebSocketNodeService.java b/src/org/redkale/service/WebSocketNodeService.java index 227c1d616..ea7ed4c6a 100644 --- a/src/org/redkale/service/WebSocketNodeService.java +++ b/src/org/redkale/service/WebSocketNodeService.java @@ -56,13 +56,13 @@ public class WebSocketNodeService extends WebSocketNode implements Service { } @Override - public CompletableFuture sendMessage(@RpcTargetAddress InetSocketAddress addr, Object message, boolean last, Serializable userid) { + public CompletableFuture sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable userid) { if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY); return this.localEngine.sendMessage(message, last, userid); } @Override - public CompletableFuture broadcastMessage(@RpcTargetAddress InetSocketAddress addr, final WebSocketRange wsrange, Object message, boolean last) { + public CompletableFuture broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketRange wsrange, Object message, boolean last) { if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY); return this.localEngine.broadcastMessage(wsrange, message, last); } @@ -125,14 +125,14 @@ public class WebSocketNodeService extends WebSocketNode implements Service { * 强制关闭用户的WebSocket * * @param userid Serializable - * @param sncpAddr InetSocketAddress + * @param targetAddress InetSocketAddress * * @return 无返回值 */ @Override - public CompletableFuture forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr) { + public CompletableFuture forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress targetAddress) { //不能从sncpNodeAddresses中移除,因为engine.forceCloseWebSocket 会调用到disconnect - if (logger.isLoggable(Level.FINEST)) logger.finest(WebSocketNodeService.class.getSimpleName() + ".event: " + userid + " forceCloseWebSocket from " + sncpAddr); + if (logger.isLoggable(Level.FINEST)) logger.finest(WebSocketNodeService.class.getSimpleName() + ".event: " + userid + " forceCloseWebSocket from " + targetAddress); if (localEngine == null) return CompletableFuture.completedFuture(0); return CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userid)); }