V0.7.1

1、修改了MQTTBase类的spdlog日志输出，去掉了logger

module/mqtt/MQTTBase.cpp

@@ -4,17 +4,18 @@
 
 
 #include "qmqtt_message.h"
+#include "spdlog/spdlog.h"
 
 
 MQTTBase::MQTTBase(QObject* parent) : QObject(parent)
 {
     /* 获取日志 */
-    m_logger = spdlog::get("MQTT");
-    if(m_logger == nullptr)
-    {
-        SPDLOG_ERROR("获取MQTT logger 失败！");
-        exit(-1);
-    }
+    // m_logger = spdlog::get("MQTT");
+    // if(m_logger == nullptr)
+    // {
+    //     SPDLOG_ERROR("获取MQTT logger 失败！");
+    //     exit(-1);
+    // }
 
     /* 连接信号和槽 */
     connect(&m_client,SIGNAL(connected()),this,SLOT(do_connected()));
@@ -40,7 +41,7 @@ void MQTTBase::addSubcribe(const QString& topic, int qos)
 {
     if(qos > 2)
     {
-        SPDLOG_LOGGER_ERROR(m_logger,"QoS值不合法:{}", qos);
+        SPDLOG_ERROR("QoS值不合法:{}", qos);
         return;
     }
     if(m_isConnected)
@@ -72,14 +73,14 @@ void MQTTBase::sendMessage(const QString& topic, const QByteArray& message, int
 {
     if(m_isConnected == false)
     {
-        SPDLOG_LOGGER_ERROR(m_logger,"MQTT未连接到服务器，发送消息失败");
+        SPDLOG_ERROR("MQTT未连接到服务器，发送消息失败");
         return;
     }
     QMQTT::Message msg(0, topic, message, qos);
     auto ret = m_client.publish(msg);
     if(ret != 0)
     {
-        SPDLOG_LOGGER_ERROR(m_logger,"发送消息失败:{}, 错误代码:{}", topic.toStdString(), ret);
+        SPDLOG_ERROR("发送消息失败:{}, 错误代码:{}", topic.toStdString(), ret);
     }
 }
 
@@ -87,7 +88,7 @@ void MQTTBase::sendMessage(const QString& topic, const QByteArray& message, int
 /* 连接成功 */
 void MQTTBase::do_connected()
 {
-    SPDLOG_LOGGER_INFO(m_logger,"MQTT IP:{} ,Port:{} 连接成功!", m_mqttIP.toStdString(), m_mqttPort);
+    SPDLOG_INFO("MQTT IP:{} ,Port:{} 连接成功!", m_mqttIP.toStdString(), m_mqttPort);
     m_isConnected = true;
     /* 订阅所有的主题 */
     for(auto& it : m_mapTopic.keys())
@@ -100,25 +101,25 @@ void MQTTBase::do_connected()
 /* 断开连接 */
 void MQTTBase::do_disconnect()
 {
-    SPDLOG_LOGGER_INFO(m_logger,"断开连接!");
+    SPDLOG_INFO("断开连接!");
 }
 
 /* 错误 */
 void MQTTBase::do_error(const QMQTT::ClientError error)
 {
-    SPDLOG_LOGGER_ERROR(m_logger,"错误:{}", (int)error);
+    SPDLOG_ERROR("错误:{}", (int)error);
 }
 
 /* 订阅成功 */
 void MQTTBase::do_subscribed(const QString& topic, const quint8 qos)
 {
-    SPDLOG_LOGGER_INFO(m_logger,"订阅:{}, QoS:{} 成功", topic.toStdString(), qos);
+    SPDLOG_INFO("订阅:{}, QoS:{} 成功", topic.toStdString(), qos);
 }
 
 /* 接收到消息 */
 void MQTTBase::do_received(const QMQTT::Message& message)
 {
-    // SPDLOG_LOGGER_INFO(m_logger,"MQTTBase接收到一条消息:{}", message.topic().toStdString());
+    // SPDLOG_INFO("MQTTBase接收到一条消息:{}", message.topic().toStdString());
     recvMessage(message);
 }
 

module/mqtt/MQTTBase.h

@@ -5,7 +5,6 @@
 #include <QMap>
 
 #include "qmqtt.h"
-#include "spdlog/spdlog.h"
 
 
 /**
@@ -51,7 +50,7 @@ protected slots:
 
 
 protected:
-    std::shared_ptr<spdlog::logger> m_logger = nullptr;
+    // std::shared_ptr<spdlog::logger> m_logger = nullptr;
     bool m_isConnected = false;                     /* 是否连接成功 */
     QString m_mqttIP;                               /* MQTT服务器IP */
     int m_mqttPort;                                 /* MQTT服务器端口 */