|
|
@@ -1,5 +1,6 @@
|
|
|
package org.jetlinks.community.standalone.configuration.cluster;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -15,7 +16,6 @@ import org.jetlinks.core.message.Headers;
|
|
|
import org.jetlinks.core.message.Message;
|
|
|
import org.jetlinks.core.server.MessageHandler;
|
|
|
import org.jetlinks.core.server.session.DeviceSessionManager;
|
|
|
-import org.springframework.util.ConcurrentReferenceHashMap;
|
|
|
import reactor.core.Disposable;
|
|
|
import reactor.core.publisher.Flux;
|
|
|
import reactor.core.publisher.Mono;
|
|
|
@@ -26,6 +26,7 @@ import java.time.LocalDateTime;
|
|
|
import java.time.ZoneOffset;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author lifang
|
|
|
@@ -103,6 +104,9 @@ public class ClusterDeviceMessageConnector extends DeviceMessageConnector {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
Set<String> keySet = messageServerMap.keySet();
|
|
|
List<String> removeKeys = new LinkedList<>();
|
|
|
+ if(CollectionUtil.isNotEmpty(keySet)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
for (String key : keySet) {
|
|
|
ClusterMessage message = messageServerMap.get(key);
|
|
|
if(message!=null){
|