diff --git a/src/org/redkale/cluster/CacheClusterAgent.java b/src/org/redkale/cluster/CacheClusterAgent.java
index 60ca26655..a22aae381 100644
--- a/src/org/redkale/cluster/CacheClusterAgent.java
+++ b/src/org/redkale/cluster/CacheClusterAgent.java
@@ -225,22 +225,16 @@ public class CacheClusterAgent extends ClusterAgent implements Resourcable {
     }
 
     @Override
-    protected void register(NodeServer ns, String protocol, Service service) {
+    protected ClusterEntry register(NodeServer ns, String protocol, Service service) {
         deregister(ns, protocol, service, false);
         //
-        String serviceid = generateServiceId(ns, protocol, service);
-        String servicename = generateServiceName(ns, protocol, service);
-        InetSocketAddress address = ns.isSNCP() ? ns.getSncpAddress() : ns.getServer().getSocketAddress();
-        String host = address.getHostString();
-        if ("0.0.0.0".equals(host)) {
-            host = this.appAddress.getHostString();
-            address = new InetSocketAddress(host, address.getPort());
-        }
+        ClusterEntry clusterEntry = new ClusterEntry(ns, protocol, service);
         AddressEntry entry = new AddressEntry();
-        entry.addr = address;
+        entry.addr = clusterEntry.address;
         entry.nodeid = this.nodeid;
         entry.time = System.currentTimeMillis();
-        source.hset(servicename, serviceid, AddressEntry.class, entry);
+        source.hset(clusterEntry.servicename, clusterEntry.serviceid, AddressEntry.class, entry);
+        return clusterEntry;
     }
 
     @Override
diff --git a/src/org/redkale/cluster/ClusterAgent.java b/src/org/redkale/cluster/ClusterAgent.java
index 35b7cb620..35df53612 100644
--- a/src/org/redkale/cluster/ClusterAgent.java
+++ b/src/org/redkale/cluster/ClusterAgent.java
@@ -107,14 +107,12 @@ public abstract class ClusterAgent {
         //注册本地模式
         for (Service service : localServices) {
             if (!canRegister(protocol, service)) continue;
-            register(ns, protocol, service);
-            ClusterEntry htentry = new ClusterEntry(ns, protocol, service);
+            ClusterEntry htentry = register(ns, protocol, service);
             localEntrys.put(htentry.serviceid, htentry);
             if (protocol.toLowerCase().startsWith("http")) {
                 MessageMultiConsumer mmc = service.getClass().getAnnotation(MessageMultiConsumer.class);
                 if (mmc != null) {
-                    register(ns, "mqtp", service);
-                    ClusterEntry mqentry = new ClusterEntry(ns, "mqtp", service);
+                    ClusterEntry mqentry = register(ns, "mqtp", service);
                     localEntrys.put(mqentry.serviceid, mqentry);
                     htentry.submqtp = true;
                 }
@@ -177,7 +175,7 @@ public abstract class ClusterAgent {
     protected abstract CompletableFuture<Collection<InetSocketAddress>> queryAddress(ClusterEntry entry);
 
     //注册服务
-    protected abstract void register(NodeServer ns, String protocol, Service service);
+    protected abstract ClusterEntry register(NodeServer ns, String protocol, Service service);
 
     //注销服务
     protected abstract void deregister(NodeServer ns, String protocol, Service service);
@@ -322,7 +320,13 @@ public abstract class ClusterAgent {
             this.checkid = generateCheckId(ns, protocol, service);
             this.checkname = generateCheckName(ns, protocol, service);
             this.protocol = protocol;
-            this.address = ns.getSocketAddress();
+            InetSocketAddress addr = ns.getSocketAddress();
+            String host = addr.getHostString();
+            if ("0.0.0.0".equals(host)) {
+                host = appAddress.getHostString();
+                addr = new InetSocketAddress(host, addr.getPort());
+            }
+            this.address = addr;
             this.serviceref = new WeakReference(service);
             Server server = ns.getServer();
             this.netprotocol = server instanceof SncpServer ? ((SncpServer) server).getNetprotocol() : Transport.DEFAULT_PROTOCOL;