add 集群

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/configuration/DeviceManagerConfiguration.java

@@ -29,11 +29,6 @@ public class DeviceManagerConfiguration {
     }
 
 
-    @Bean
-    @ConditionalOnProperty(prefix = "device.message.writer.time-series", name = "enabled", havingValue = "true", matchIfMissing = true)
-    public TimeSeriesMessageWriterConnector timeSeriesMessageWriterConnector(DeviceDataService dataService
-        ,DeviceRegistry registry) {
-        return new TimeSeriesMessageWriterConnector(dataService,registry);
-    }
+
 
 }

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/message/writer/TimeSeriesMessageWriterConnector.java

@@ -24,17 +24,12 @@ import java.util.*;
  * @since 1.0
  */
 @Slf4j
+@AllArgsConstructor
 public class TimeSeriesMessageWriterConnector {
     private final DeviceDataService dataService;
     private final DeviceRegistry registry;
+    private final String serverId;
 
-    public TimeSeriesMessageWriterConnector(DeviceDataService dataService, DeviceRegistry registry) {
-        this.dataService = dataService;
-        this.registry = registry;
-    }
-
-    @Value("${jetlinks.server-id}")
-    private String serverId;
     /**
      * 订阅设备消息 入库
      *

jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksConfiguration.java

@@ -11,7 +11,9 @@ import org.hswebframework.web.authorization.token.redis.RedisUserTokenManager;
 import org.jetlinks.community.device.entity.DeviceInstanceEntity;
 import org.jetlinks.community.device.entity.DeviceProductEntity;
 import org.jetlinks.community.device.message.DeviceMessageConnector;
+import org.jetlinks.community.device.message.writer.TimeSeriesMessageWriterConnector;
 import org.jetlinks.community.device.service.AutoDiscoverDeviceRegistry;
+import org.jetlinks.community.device.service.data.DeviceDataService;
 import org.jetlinks.community.device.timeseries.DeviceTimeSeriesMetric;
 import org.jetlinks.community.micrometer.MeterRegistryManager;
 import org.jetlinks.community.standalone.configuration.cluster.ClusterDeviceMessageBrokeMessageBroker;
@@ -53,8 +55,6 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.ReactiveRedisOperations;
 import org.springframework.data.redis.core.ReactiveRedisTemplate;
 
@@ -65,6 +65,12 @@ import java.util.Optional;
 @Slf4j
 public class JetLinksConfiguration {
 
+    @Bean
+    @ConditionalOnProperty(prefix = "device.message.writer.time-series", name = "enabled", havingValue = "true", matchIfMissing = true)
+    public TimeSeriesMessageWriterConnector timeSeriesMessageWriterConnector(DeviceDataService dataService
+        , DeviceRegistry registry,JetLinksProperties properties) {
+        return new TimeSeriesMessageWriterConnector(dataService,registry,properties.getServerId());
+    }
     @Bean
     public WebServerFactoryCustomizer<NettyReactiveWebServerFactory> webServerFactoryWebServerFactoryCustomizer() {
         //解决请求参数最大长度问题