From bda682cfed723ca3be4ff39ab1972b8a69197bfb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 07 十月 2023 10:18:24 +0800
Subject: [PATCH] 取消mapper注解 HttpUtils替换RestTemplate 增加HttpUtils日志
---
src/main/java/com/ard/utils/mqtt/MqttConsumer.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ard/utils/mqtt/MqttConsumer.java b/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
index 55af6ec..fc03b39 100644
--- a/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
+++ b/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
@@ -4,6 +4,7 @@
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
@@ -23,13 +24,29 @@
@Slf4j(topic = "mqtt")
@Order(1)
public class MqttConsumer implements ApplicationRunner {
+ @Value("${spring.mqtt.enabled}")
+ private Boolean MQTT_ENABLED;
+ @Value("${spring.mqtt.topic}")
+ private String MQTT_TOPIC;
+ @Value("${spring.mqtt.host}")
+ private String MQTT_HOST;
+ @Value("${spring.mqtt.clientId}")
+ private String MQTT_CLIENT_ID;
+ @Value("${spring.mqtt.username}")
+ private String MQTT_USER_NAME;
+ @Value("${spring.mqtt.password}")
+ private String MQTT_PASSWORD;
+ @Value("${spring.mqtt.timeout}")
+ private int MQTT_TIMEOUT;
+ @Value("${spring.mqtt.keepalive}")
+ private int MQTT_KEEP_ALIVE;
private static MqttClient client;
@Override
public void run(ApplicationArguments args) {
- log.info("鍒濆鍖栧苟鍚姩mqtt......");
- if (PropertiesUtil.MQTT_ENABLED) {
+ log.debug("鍒濆鍖栧苟鍚姩mqtt......");
+ if (MQTT_ENABLED) {
this.connect();
}
}
@@ -43,7 +60,7 @@
getClient();
// 2 璁剧疆閰嶇疆
MqttConnectOptions options = getOptions();
- String[] topic = PropertiesUtil.MQTT_TOPIC.split(",");
+ String[] topic = MQTT_TOPIC.split(",");
// 3 娑堟伅鍙戝竷璐ㄩ噺
int[] qos = getQos(topic.length);
// 4 鏈�鍚庤缃�
@@ -59,9 +76,9 @@
public void getClient() {
try {
if (null == client) {
- client = new MqttClient(PropertiesUtil.MQTT_HOST, PropertiesUtil.MQTT_CLIENT_ID, new MemoryPersistence());
+ client = new MqttClient(MQTT_HOST, MQTT_CLIENT_ID, new MemoryPersistence());
}
- log.info("--鍒涘缓mqtt瀹㈡埛绔�");
+ log.debug("--鍒涘缓mqtt瀹㈡埛绔�");
} catch (Exception e) {
log.error("鍒涘缓mqtt瀹㈡埛绔紓甯革細" + e);
}
@@ -73,15 +90,15 @@
public MqttConnectOptions getOptions() {
MqttConnectOptions options = new MqttConnectOptions();
//璁剧疆鐢ㄦ埛鍚嶅瘑鐮�
- options.setUserName(PropertiesUtil.MQTT_USER_NAME);
- options.setPassword(PropertiesUtil.MQTT_PASSWORD.toCharArray());
+ options.setUserName(MQTT_USER_NAME);
+ options.setPassword(MQTT_PASSWORD.toCharArray());
// 璁剧疆瓒呮椂鏃堕棿
- options.setConnectionTimeout(PropertiesUtil.MQTT_TIMEOUT);
+ options.setConnectionTimeout(MQTT_TIMEOUT);
// 璁剧疆浼氳瘽蹇冭烦鏃堕棿
- options.setKeepAliveInterval(PropertiesUtil.MQTT_KEEP_ALIVE);
+ options.setKeepAliveInterval(MQTT_KEEP_ALIVE);
// 鏄惁娓呴櫎session
options.setCleanSession(true);
- log.info("--鐢熸垚mqtt閰嶇疆瀵硅薄");
+ log.debug("--鐢熸垚mqtt閰嶇疆瀵硅薄");
return options;
}
@@ -101,7 +118,7 @@
*/
qos[i] = 1;
}
- log.info("--璁剧疆娑堟伅鍙戝竷璐ㄩ噺");
+ log.debug("--璁剧疆娑堟伅鍙戝竷璐ㄩ噺");
return qos;
}
@@ -111,7 +128,7 @@
public void create(MqttConnectOptions options, String[] topic, int[] qos) {
try {
client.setCallback(new MqttConsumerCallback(client, options, topic, qos));
- log.info("--娣诲姞鍥炶皟澶勭悊绫�");
+ log.debug("--娣诲姞鍥炶皟澶勭悊绫�");
client.connect(options);
} catch (Exception e) {
log.info("瑁呰浇瀹炰緥鎴栬闃呬富棰樺紓甯革細" + e);
@@ -126,7 +143,7 @@
*/
public void subscribe(String topic, int qos) {
try {
- log.info("topic:" + topic);
+ log.debug("topic:" + topic);
client.subscribe(topic, qos);
} catch (MqttException e) {
e.printStackTrace();
@@ -150,7 +167,7 @@
*/
public static void publish(int qos, boolean retained, String topic, String pushMessage) {
if (client != null) {
- log.info("銆愪富棰樸��:" + topic + "銆恞os銆�:" + qos + "銆恜ushMessage銆�:" + pushMessage);
+ log.debug("銆愪富棰樸��:" + topic + "銆恞os銆�:" + qos + "銆恜ushMessage銆�:" + pushMessage);
MqttMessage message = new MqttMessage();
message.setQos(qos);
message.setRetained(retained);
@@ -168,7 +185,7 @@
token = mTopic.publish(message);
token.waitForCompletion();
if (token.isComplete()) {
- log.info("娑堟伅鍙戦�佹垚鍔�");
+ log.debug("娑堟伅鍙戦�佹垚鍔�");
}
} catch (MqttPersistenceException e) {
log.error("mqtt鎸佷箙寮傚父锛�" + e.getMessage());
--
Gitblit v1.9.3