Jelajahi Sumber

changed 自动启动 改为集群模式

18339543638 4 tahun lalu
induk
melakukan
f26a35b383

+ 3 - 7
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/service/AliBridgeService.java

@@ -32,19 +32,15 @@ public class AliBridgeService extends GenericReactiveCacheSupportCrudService<Ali
     public void run(String... args) {
         this.createQuery()
             .where(AliIotBridgeEntity::getState, BridgeStatus.running)
-            .where(AliIotBridgeEntity::getNodeId,clusterManager.getClusterName())
+            .where(AliIotBridgeEntity::getNodeId,clusterManager.getCurrentServerId())
             .fetch()
             .flatMap(bridgeParam->bridgeGateway.initBridge(bridgeParam)
                 .concatWith(bridgeDeviceService.createQuery()
                     .where(AliIotBridgeDeviceConfig::getBridgeId,bridgeParam.getId())
                     .fetch()
                     .flatMap(deviceConfig->
-                        bridgeGateway.getBridgeServer()
-                            .flatMap(bridgeServe->
-                                bridgeServe
-                                    .register(deviceConfig.getOriginalIdentity(),deviceConfig.getProductKey(),deviceConfig.getDeviceName(),deviceConfig.getDeviceSecret()))
-                            .then(Mono.empty()))
-                ))
+                        bridgeGateway.registerDevice(clusterManager.getCurrentServerId(),deviceConfig)
+                )))
             .subscribe();
     }
 }