From db8c94f4338b891c635968ce9693eddf1428a5a6 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Mon, 1 Jun 2020 21:19:47 +0800
Subject: [PATCH]
---
src/org/redkale/boot/NodeServer.java | 1 +
src/org/redkale/net/http/WebSocketNode.java | 6 ++++++
src/org/redkale/service/WebSocketNodeService.java | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index 89e3ace61..9732f33ca 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -359,6 +359,7 @@ public abstract class NodeServer {
if (groups.isEmpty() && isSNCP() && NodeServer.this.sncpGroup != null) groups.add(NodeServer.this.sncpGroup);
nodeService = Sncp.createLocalService(serverClassLoader, resourceName, WebSocketNodeService.class, application.getResourceFactory(), application.getSncpTransportFactory(), NodeServer.this.sncpAddress, groups, (AnyValue) null);
(isSNCP() ? appResFactory : resourceFactory).register(resourceName, WebSocketNode.class, nodeService);
+ ((WebSocketNodeService) nodeService).setName(resourceName);
}
resourceFactory.inject(nodeService, self);
field.set(src, nodeService);
diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java
index 0ccecfba0..7d5ee607d 100644
--- a/src/org/redkale/net/http/WebSocketNode.java
+++ b/src/org/redkale/net/http/WebSocketNode.java
@@ -41,6 +41,8 @@ public abstract class WebSocketNode {
@Resource(name = Application.RESNAME_SNCP_ADDR)
protected InetSocketAddress localSncpAddress; //为SncpServer的服务address
+ protected String name;
+
//如果不是分布式(没有SNCP) 值为null
@RpcRemote
protected WebSocketNode remoteNode;
@@ -128,6 +130,10 @@ public abstract class WebSocketNode {
return changeUserid(olduserid, newuserid, localSncpAddress);
}
+ public final String getName() {
+ return name;
+ }
+
//--------------------------------------------------------------------------------
/**
* 获取目标地址
diff --git a/src/org/redkale/service/WebSocketNodeService.java b/src/org/redkale/service/WebSocketNodeService.java
index eea5f28fd..6b397aecf 100644
--- a/src/org/redkale/service/WebSocketNodeService.java
+++ b/src/org/redkale/service/WebSocketNodeService.java
@@ -36,6 +36,10 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
super.destroy(conf);
}
+ public final void setName(String name) {
+ this.name = name;
+ }
+
@Override
public CompletableFuture> getWebSocketAddresses(final @RpcTargetAddress InetSocketAddress targetAddress, final Serializable groupid) {
if (localSncpAddress == null || !localSncpAddress.equals(targetAddress)) return remoteWebSocketAddresses(targetAddress, groupid);