فهرست منبع

fixed 集群网桥

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

+ 1 - 1
jetlinks-core/src/main/java/org/jetlinks/core/cluster/ClusterUniqueTask.java

@@ -74,7 +74,7 @@ public abstract class ClusterUniqueTask<T> implements Serializable {
                              RedissonClient redissonClient) {
         this.id=id;
         this.currentSeverId=clusterManager.getCurrentServerId();
-        this.workerId=currentSeverId;
+        this.workerId=null;
         this.clusterManager=clusterManager;
         this.pingTopic=String.format(this.pingTopic,this.id);
         this.operationTopic=String.format(this.operationTopic,this.id);

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

@@ -276,13 +276,13 @@ public class AliBridgeServer extends ClusterUniqueTask<AliBridgeServer> {
         }
         if(msg instanceof  OperationMessage){
             OperationMessage message= (OperationMessage) msg;
-            if(message.register){
+            if(message.isRegister()){
                 //设备注册
                 return this.register(message.getBridgeId(),message.getOriginalIdentity(),message.getProductKey(),message.getDeviceName(),message.getDeviceSecret(),false);
-            }else if(message.unRegister){
+            }else if(message.isUnRegister()){
                 return this.unRegister(message.getOriginalIdentity(),false);
             }
-            else if(message.init){
+            else if(message.isInit()){
                 return bridgeGateway.initBridge(params,false);
             }
         }