设置mqtt是开启还是关闭

mhfire-controller/src/main/resources/application-dev.properties

@@ -69,6 +69,7 @@ server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
 
 #mqttt
+mqtt.enabled=true
 mqtt.completionTimeout=5000
 mqtt.keep-alive-interval=60
 mqtt.username=usky

mhfire-controller/src/main/resources/application-prod.properties

@@ -19,15 +19,6 @@ spring.datasource.dynamic.primary=mhfire
 spring.datasource.dynamic.datasource.mhfire.url=jdbc:mysql://32.0.15.104:3306/mhxf?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
 spring.datasource.dynamic.datasource.mhfire.username=root
 spring.datasource.dynamic.datasource.mhfire.password=xfzdadmin#2021
-#À¶Ð¡°ï
-spring.datasource.dynamic.datasource.bulehelp.url=jdbc:mysql://101.133.214.75:3306/bulehelp?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
-spring.datasource.dynamic.datasource.bulehelp.username=root
-spring.datasource.dynamic.datasource.bulehelp.password=123456
-
-#³ÇÔËÊý¾Ý
-spring.datasource.dynamic.datasource.cy.url=jdbc:mysql://32.0.15.67:13306/mhdsj_xfdata?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
-spring.datasource.dynamic.datasource.cy.username=mysql
-spring.datasource.dynamic.datasource.cy.password=1qaz@WSX#mysql
 
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
@@ -74,6 +65,7 @@ server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
 
 #mqttt
+mqtt.enabled=false
 mqtt.completionTimeout=5000
 mqtt.keep-alive-interval=60
 mqtt.username=usky

mhfire-service/src/main/java/com/bizmatics/mhfire/service/config/mqtt/MqttBaseConfig.java

@@ -3,12 +3,14 @@ package com.bizmatics.mhfire.service.config.mqtt;
 import lombok.Data;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 import org.springframework.stereotype.Component;
 
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
 @Data
 @Component
 @ConfigurationProperties(prefix = "mqtt")

mhfire-service/src/main/java/com/bizmatics/mhfire/service/config/mqtt/MqttInConfig.java

@@ -1,6 +1,7 @@
 package com.bizmatics.mhfire.service.config.mqtt;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.channel.DirectChannel;
@@ -13,6 +14,7 @@ import org.springframework.messaging.MessageChannel;
  * @author yq
  * @date 2021/11/1 16:37
  */
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
 @Configuration
 public class MqttInConfig {
 

mhfire-service/src/main/java/com/bizmatics/mhfire/service/config/mqtt/MqttOutConfig.java

@@ -1,6 +1,7 @@
 package com.bizmatics.mhfire.service.config.mqtt;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.annotation.MessagingGateway;
@@ -12,6 +13,7 @@ import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.handler.annotation.Header;
 
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
 @Configuration
 public class MqttOutConfig {
 

mhfire-service/src/main/java/com/bizmatics/mhfire/service/listener/MqttListener.java

@@ -5,10 +5,9 @@ import com.bizmatics.mhfire.model.WaterAj;
 import com.bizmatics.mhfire.service.WaterAjService;
 import com.bizmatics.mhfire.service.api.mhWater.OneCardApi;
 import com.bizmatics.mhfire.service.config.mqtt.MqttInConfig;
-
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.MessageHandler;
@@ -20,6 +19,7 @@ import java.util.Map;
  * @author yq
  * @date 2021/11/3 8:13
  */
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
 @Slf4j
 @Component
 public class MqttListener {