فهرست منبع

add 设置网桥初始值

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

+ 1 - 1
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/core/DefaultIoTServiceClient.java

@@ -76,7 +76,7 @@ public class DefaultIoTServiceClient {
 		response.setId(id);
 		calls.put(id, response);
 		logger.info("Sending request[{}] to iot at [{}]", requestString, System.currentTimeMillis());
-		MessageToken token = Http2MessageClientFactory.getClient().publish(requestTopic, message);
+		MessageToken token = DefaultHttp2MessageClientFactory.getClient(((DefaultBridgeConfigManager)bridgeConfigManager).getBridgeId()).publish(requestTopic, message);
 		token.getPublishFuture().thenAccept(new Consumer<Message>() {
 			@Override
 			public void accept(Message t) {

+ 1 - 1
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/core/DefaultUplinkChannelHandler.java

@@ -192,7 +192,7 @@ public class DefaultUplinkChannelHandler {
         message.setQos(qos);
 
         logger.info("Publish message : {}", message);
-        MessageToken token = Http2MessageClientFactory.getClient().publish(publishTopic, message);
+        MessageToken token = DefaultHttp2MessageClientFactory.getClient(bridgeId).publish(publishTopic, message);
         CompletableFuture<ProtocolMessage> future = token.getPublishFuture().thenApply(msg -> {
             String serizlizedPayload = new String(msg.getPayload(), StandardCharsets.UTF_8);
             BridgeMessagePayload bridgePayloadSent = JSON.parseObject(serizlizedPayload, BridgeMessagePayload.class);

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

@@ -117,7 +117,7 @@ public class DefaultAliBridgeChannel {
         }else if(msg.isOffline()){
             uplinkChannelHandler.doOffline(this.originalIdentity);
         }else {
-            uplinkChannelHandler.doPublishAsync(this.originalIdentity, msg.getTopic(), msg.getPayload(), 1);
+            uplinkChannelHandler.doPublishAsync(this.originalIdentity, msg.getTopic(), msg.getPayload(), 0);
         }
     }