فهرست منبع

add 自动启动

18339543638 4 سال پیش
والد
کامیت
55e9949786

+ 4 - 0
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/core/DefaultDeviceConfigManager.java

@@ -4,6 +4,7 @@
  */
 package org.jetlinks.community.bridge.core;
 
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -14,6 +15,8 @@ import com.aliyun.iot.as.bridge.core.model.DeviceIdentity;
 import com.aliyun.openservices.iot.api.util.StringUtil;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import org.hswebframework.web.cache.supports.RedisReactiveCache;
+import org.jetlinks.supports.cluster.redis.RedisClusterCache;
 
 /**
  * Default implementation of {@link DeviceConfigManager device configuration manager}. 
@@ -25,6 +28,7 @@ public class DefaultDeviceConfigManager implements DeviceConfigManager{
     private static ConcurrentMap<String, DeviceIdentity> configCache = new ConcurrentHashMap<>(500000);
     private static ConcurrentMap<String, String> revertCache = new ConcurrentHashMap<>(500000);
     private DefaultDeviceConfigManager() {
+
     }
 
     public static DefaultDeviceConfigManager getInstance(){

+ 2 - 3
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/entity/AliIotBridgeEntity.java

@@ -41,7 +41,7 @@ public class AliIotBridgeEntity extends GenericEntity<String> {
     private String productId;
 
     @Comment("说明")
-    @Column(name = "description",nullable = false)
+    @Column(name = "description")
     @Schema(description = "说明")
     private String description;
 
@@ -63,8 +63,7 @@ public class AliIotBridgeEntity extends GenericEntity<String> {
     @ColumnType(javaType = String.class)
     @DefaultValue("running")
     @Schema(
-        description = "状态(只读)"
-        ,accessMode = Schema.AccessMode.READ_ONLY
+        description = "状态"
         , defaultValue = "running"
     )
     private BridgeStatus state;

+ 2 - 2
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/enums/BridgeStatus.java

@@ -23,10 +23,10 @@ public enum BridgeStatus implements EnumDict<String> {
     private String text;
     @Override
     public String getValue() {
-        return null;
+        return name();
     }
 
     @Override
     public String getText() {
-        return null;
+        return text;
     }}

+ 0 - 1
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/server/aliyun/AliBridgeServer.java

@@ -18,7 +18,6 @@ import org.jetlinks.community.bridge.server.Channel;
 import org.jetlinks.core.device.DeviceOperator;
 import org.jetlinks.core.device.DeviceRegistry;
 import org.jetlinks.core.event.EventBus;
-import org.springframework.boot.CommandLineRunner;
 import reactor.core.publisher.*;
 import reactor.util.function.Tuple4;
 

+ 0 - 1
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/server/aliyun/DefaultAliBridgeChannel.java

@@ -66,7 +66,6 @@ public class DefaultAliBridgeChannel implements Channel {
         this.productKey=productKey;
         this.deviceName=deviceName;
         this.uplinkChannelHandler = uplinkChannelHandler;
-
     }
 
     @Override