18339543638 пре 4 година
родитељ
комит
07041a889a

+ 1 - 0
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/entity/AliIotBridgeEntity.java

@@ -148,6 +148,7 @@ public class AliIotBridgeEntity extends GenericEntity<String>  implements Record
         if (o == null || getClass() != o.getClass()) return false;
         AliIotBridgeEntity that = (AliIotBridgeEntity) o;
         return Objects.equals(getAccessConfig(), that.getAccessConfig()) &&
+            Objects.equals(getState(), that.getState())&&
             Objects.equals(getId(), that.getId());
     }
 

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

@@ -109,7 +109,7 @@ public class AliBridgeServer extends AbstractClusterUniqueTask<AliBridgeServer>
         }
         this.params=params;
         //非主节点、非运行状态、已启动
-        if(isReplica()||(!BridgeStatus.running.equals(params.getState())&&!BridgeStatus.starting.equals(params.getState()))||start.get()){
+        if(isReplica()||BridgeStatus.del.equals(this.params.getState())||BridgeStatus.stop.equals(this.params.getState())||start.get()){
             return Mono.just(this);
         }
         if (start.compareAndSet(false, true)) {