Browse Source

Merge pull request #14658 from thingsboard/lts-4.2

LTS 4.2
pull/14659/head
Viacheslav Klimov 9 months ago
committed by GitHub
parent
commit
ac4b711da3
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/TbMqttSslTransportComponent.java

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/TbMqttSslTransportComponent.java

@ -27,5 +27,5 @@ import java.lang.annotation.RetentionPolicy;
@Inherited @Inherited
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.mqtt.enabled:true}'=='true' && '${transport.mqtt.ssl.enabled:false}'=='true')") @ConditionalOnExpression("'${transport.mqtt.ssl.enabled:false}'=='true' && ('${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.mqtt.enabled:true}'=='true'))")
public @interface TbMqttSslTransportComponent {} public @interface TbMqttSslTransportComponent {}

Loading…
Cancel
Save