18339543638 4 éve
szülő
commit
cff84507c9

+ 3 - 3
jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/cluster/ClusterDeviceMessageConnector.java

@@ -157,10 +157,10 @@ public class ClusterDeviceMessageConnector extends DeviceMessageConnector {
                             return super.handleMessage(device,message);
                         }
                         return clusterManager
-                            .getTopic(ClusterMessageType.topicOf(serverId,ClusterMessageType.up))
+                            .getTopic(ClusterMessageType.topicOf(fromServerId,ClusterMessageType.up))
                             .publish(Mono.just(message)
-                                .doOnNext(msg->msg.addHeader(Headers.serverId,serverId))
-                                .map(msg->new ClusterMessage(msg,serverId,ClusterMessageType.topicOf(serverId,ClusterMessageType.up))))
+                                .doOnNext(msg->msg.addHeader(Headers.serverId,this.serverId))
+                                .map(msg->new ClusterMessage(msg,this.serverId,ClusterMessageType.topicOf(serverId,ClusterMessageType.up))))
                             .flatMap(result->result==0?Mono.just(false):Mono.just(true));
                     }
                 });