Kaynağa Gözat

add 设置网桥初始值

18339543638 4 yıl önce
ebeveyn
işleme
c2e9c734fd

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

@@ -31,8 +31,8 @@ public class DefaultDeviceConfigManager implements DeviceConfigManager{
     }
     public static void register(String bridgeId,String originalIdentity,String productKey,String deviceName,String deviceSecret){
         DeviceIdentity deviceIdentity = new DeviceIdentity(productKey, deviceName, deviceSecret);
-        configCache.putIfAbsent(getConfigId(bridgeId,originalIdentity),deviceIdentity);
-        revertCache.putIfAbsent(getMapKey(deviceIdentity), originalIdentity);
+        configCache.put(getConfigId(bridgeId,originalIdentity),deviceIdentity);
+        revertCache.put(getMapKey(deviceIdentity), originalIdentity);
     }
 
     public static String getConfigId(String bridgeId,String originalIdentity){

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

@@ -206,6 +206,7 @@ public class AliBridgeServer extends AbstractClusterUniqueTask<AliBridgeServer>
             try {
                 oldChannel.close();
             }catch (Exception e){
+                log.warn(e.getMessage());
             }
         }
         if(broadcast){
@@ -379,12 +380,6 @@ public class AliBridgeServer extends AbstractClusterUniqueTask<AliBridgeServer>
                 return bridgeGateway.delBridgeServer(id,broadcast);
             case stop:
                 return bridgeGateway.pauseBridge(id,broadcast);
-//            case starting:
-//                return bridgeGateway.initBridge(params,broadcast);
-//            case running:
-//                return bridgeGateway.initBridge(params,broadcast);
-//            case fail:
-//                break;
             default:
                 return bridgeGateway.initBridge(params,broadcast);
         }