|
|
@@ -120,7 +120,8 @@ public class AliBridgeServer extends AbstractClusterUniqueTask<AliBridgeServer>
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
- }) .flatMap(ignore->bridgeService.createUpdate().set(AliIotBridgeEntity::getState,BridgeStatus.running)
|
|
|
+ })
|
|
|
+ .flatMap(ignore->bridgeService.createUpdate().set(AliIotBridgeEntity::getState,BridgeStatus.running)
|
|
|
.where(AliIotBridgeEntity::getId,id).execute())
|
|
|
.onErrorResume(Exception.class,
|
|
|
e->Mono.justOrEmpty(isReplica())
|
|
|
@@ -230,13 +231,19 @@ public class AliBridgeServer extends AbstractClusterUniqueTask<AliBridgeServer>
|
|
|
if(online){
|
|
|
channel.online();
|
|
|
}else {
|
|
|
- try {
|
|
|
- channel.doOffline();
|
|
|
- }catch (Exception e){}
|
|
|
+ channel.doOffline();
|
|
|
}
|
|
|
})
|
|
|
.thenReturn(channel)
|
|
|
)
|
|
|
+ .flatMap(channel->
|
|
|
+ bridgeDeviceService
|
|
|
+ .createUpdate().set(AliIotBridgeDeviceConfig::getState, BridgeDeviceStatus.success)
|
|
|
+ .set(AliIotBridgeDeviceConfig::getState,BridgeDeviceStatus.success)
|
|
|
+ .where(AliIotBridgeDeviceConfig::getOriginalIdentity,originalIdentity)
|
|
|
+ .execute()
|
|
|
+ .thenReturn(channel)
|
|
|
+ )
|
|
|
.onErrorResume(Exception.class,
|
|
|
e->Mono.just(isReplica())
|
|
|
.filter(Boolean.FALSE::equals)
|