1.日志更新使用方式为不用参数

backup/fmbackup.cpp

@@ -41,9 +41,9 @@ bool FMBackup::connect()
         isOk =_db.open();
     }
 
-    VIP_INFO() << QString::fromLocal8Bit("连接数据库：") << dbname;
+    FMP_INFO() << QString::fromLocal8Bit("连接数据库：") << dbname;
     if(!isOk) {
-        VIP_WARN() << QString::fromLocal8Bit("连接失败：") << _db.lastError().text();
+        FMP_WARN() << QString::fromLocal8Bit("连接失败：") << _db.lastError().text();
     }
 
     return isOk;
@@ -58,9 +58,9 @@ bool FMBackup::createTable(const QString &dbname)
     //  创建表
     bool isOk = query.exec("create table tbl_req(id integer PRIMARY KEY autoincrement, url varchar(200), req text)");
 
-    VIP_INFO() << QString::fromLocal8Bit("创建数据库：") << dbname;
+    FMP_INFO() << QString::fromLocal8Bit("创建数据库：") << dbname;
     if (!isOk) {
-        VIP_WARN() << QString::fromLocal8Bit("创建数据库失败：") << query.lastError().text();
+        FMP_WARN() << QString::fromLocal8Bit("创建数据库失败：") << query.lastError().text();
     }
     return isOk;
 }
@@ -93,9 +93,9 @@ bool FMBackup::updateReqData(const int id, const QString url, const QString &req
                            .arg(reqData)
                            .arg(id));
 
-    VIP_INFO() << QString::fromLocal8Bit("备份数据：") << reqData;
+    FMP_INFO() << QString::fromLocal8Bit("备份数据：") << reqData;
     if (!isOk) {
-        VIP_WARN() << QString::fromLocal8Bit("备份失败：") << query.lastError().text();
+        FMP_WARN() << QString::fromLocal8Bit("备份失败：") << query.lastError().text();
     }
     return isOk;
 }
@@ -105,7 +105,7 @@ bool FMBackup::removeReqData(const int &id)
     QSqlQuery query(_db);
     bool isOk = query.exec(QString("delete from tbl_req where id==%1").arg(id));
     if(!isOk) {
-        VIP_WARN() << QString::fromLocal8Bit("删除数据时出现错误：") << query.lastError().text();
+        FMP_WARN() << QString::fromLocal8Bit("删除数据时出现错误：") << query.lastError().text();
     }
     return isOk;
 }
@@ -115,7 +115,7 @@ QSqlQuery FMBackup::reqDataQuery() const
     QSqlQuery query(_db);
     bool isOk = query.exec("select * from tbl_req");
     if(!isOk) {
-        VIP_WARN() << QString::fromLocal8Bit("查询数据时出现错误：") << query.lastError().text();
+        FMP_WARN() << QString::fromLocal8Bit("查询数据时出现错误：") << query.lastError().text();
     }
     return query;
 }
@@ -124,6 +124,6 @@ bool FMBackup::reset()
 {
     QSqlQuery query(_db);
     bool isOk = query.exec("VACUUM");
-    VIP_INFO() << QString::fromLocal8Bit("数据库重置: ") << isOk;
+    FMP_INFO() << QString::fromLocal8Bit("数据库重置: ") << isOk;
     return isOk;
 }

backup/resend.cpp

@@ -35,7 +35,7 @@ void ReSend::trySend()
             break;
         } else{
             FMBackup::instance()->removeReqData(id);
-            VIP_INFO() << QString::fromLocal8Bit("重发响应成功：")<< rspData;
+            FMP_INFO() << QString::fromLocal8Bit("重发响应成功：")<< rspData;
         }
     }
 }

fmnetwork.cpp

@@ -27,8 +27,8 @@ int FMNetwork::send(const QString &url, const QByteArray &reqData, QByteArray &r
 {
     error = FM_API_SUCCESS;
 
-    VIP_INFO() << "Send Url: " << url;
-    VIP_INFO() << "Send Data: " << reqData;
+    FMP_INFO() << "Send Url: " << url;
+    FMP_INFO() << "Send Data: " << reqData;
 
     _req->setUrl(url);
 

fmp_ve_handlers.cpp

@@ -20,10 +20,10 @@ void FMPStartEventHandler::handleEvent(const ctkEvent &event)
             _vip->StartVip();
         }
         else {
-            FMP_WARN_CTX(_ctx) << "Refused start request" << event.getTopic();
+            FMP_WARN() << "Refused start request" << event.getTopic();
         }
     }
     else {
-        FMP_DEBUG_CTX(_ctx) << "No handler instance for event" << event.getTopic();
+        FMP_DEBUG() << "No handler instance for event" << event.getTopic();
     }
 }

fmp_vip.cpp

@@ -9,6 +9,8 @@ FMPVip::FMPVip(ctkPluginContext *context)
       d_ptr(new FMPVipPrivate(this))
 {
     FMPStartEventHandler *handler = new FMPStartEventHandler(_ctx, this);
+
+    FMPLoggerInterface::InitContext(context);
 }
 
 int FMPVip::StopService()

fmp_vip_p.cpp

@@ -20,11 +20,10 @@ int FMPVipPrivate::StartVip()
 {
 
     Q_Q(FMPVip);
-    FMPLoggerInterface *logger = q->GetService<FMPLoggerInterface>(q->_ctx);
-    FMP_INFO(logger) << "Vip start";
+    FMP_INFO() << "Vip start";
 
     _settings = q->GetService<FMPSettingsInterface>(q->_ctx);
-    FMPVipSettings::instance()->init(_settings, logger);
+    FMPVipSettings::instance()->init(_settings);
 
     emit startVip();
     q->_inited = true;

fmp_vip_server.cpp

@@ -22,14 +22,14 @@ FMPVipServer::FMPVipServer() :
 void FMPVipServer::Listen(quint16 port)
 {
     if(!this->listen(QHostAddress::Any, port)) {
-        VIP_ERROR() << "Listen error: " << this->errorString();
+        FMP_ERROR() << "Listen error: " << this->errorString();
     }
 }
 
 void FMPVipServer::Write(const QByteArray &data)
 {
     if(socket->write(data) == -1) {
-        VIP_ERROR() << "Write error: " <<socket->error() << socket->errorString();
+        FMP_ERROR() << "Write error: " <<socket->error() << socket->errorString();
     }
 }
 
@@ -43,7 +43,7 @@ void FMPVipServer::onNewConnection()
 
 void FMPVipServer::onDisconnected()
 {
-    VIP_DEBUG() << "Socket disconnected.";
+    FMP_DEBUG() << "Socket disconnected.";
 }
 
 void FMPVipServer::onReadyRead()
@@ -53,7 +53,7 @@ void FMPVipServer::onReadyRead()
     FMSOCKEHEADER header = {0};
     memcpy(&header, recvData.data(), sizeof(FMSOCKEHEADER));
     if(header.flag != FMSOCKFLAG) {
-        VIP_WARN() << "Incompatible protocol.";
+        FMP_WARN() << "Incompatible protocol.";
         return;
     }
 

fmp_vip_settings.cpp

@@ -12,15 +12,9 @@ FMPVipSettings *FMPVipSettings::instance()
     return &vipSettings;
 }
 
-void FMPVipSettings::init(FMPSettingsInterface *settings, FMPLoggerInterface *logger)
+void FMPVipSettings::init(FMPSettingsInterface *settings)
 {
     this->_settings = settings;
-    this->_logger = logger;
-}
-
-FMPLoggerInterface *FMPVipSettings::getLogger()
-{
-    return _logger;
 }
 
 QString FMPVipSettings::getServerUrl()
@@ -34,7 +28,7 @@ QVariant FMPVipSettings::_GetValue(const QString &key, QVariant defaultValue)
         return _settings->GetValue(key);
     }
     else {
-        VIP_WARN() << "Settings service not available";
+        FMP_WARN() << "Settings service not available";
     }
 
     return defaultValue;
@@ -47,7 +41,7 @@ bool FMPVipSettings::_SetValue(const QString &key, QVariant value)
         return true;
     }
     else {
-        VIP_WARN() << "Settings service not available";
+        FMP_WARN() << "Settings service not available";
     }
 
     return false;

fmp_vip_settings.h

@@ -12,9 +12,8 @@ class FMPVipSettings : public QObject
     Q_OBJECT
 public:
     static FMPVipSettings *instance();
-    void init(FMPSettingsInterface *settings, FMPLoggerInterface *logger);
+    void init(FMPSettingsInterface *settings);
 
-    FMPLoggerInterface *getLogger();
     QString getServerUrl();
 
 private:
@@ -25,12 +24,6 @@ private:
 
 private:
     FMPSettingsInterface *_settings;
-    FMPLoggerInterface *_logger;
 };
 
-#define VIP_DEBUG() FMP_DEBUG(FMPVipSettings::instance()->getLogger())
-#define VIP_INFO()  FMP_INFO(FMPVipSettings::instance()->getLogger())
-#define VIP_WARN()  FMP_WARN(FMPVipSettings::instance()->getLogger())
-#define VIP_ERROR() FMP_ERROR(FMPVipSettings::instance()->getLogger())
-
 #endif // FMP_VIP_SETTINGS_H

fmvipdispatcher.cpp

@@ -51,7 +51,7 @@ FMVipDispatcher::~FMVipDispatcher()
 
 void FMVipDispatcher::doTask(const QByteArray &reqData, QByteArray &rspData)
 {
-    VIP_INFO() << "Recv POS reqData: " << reqData;
+    FMP_INFO() << "Recv POS reqData: " << reqData;
 
 
 
@@ -62,7 +62,7 @@ void FMVipDispatcher::doTask(const QByteArray &reqData, QByteArray &rspData)
     } else {
         rspData = fmTask->doTask();
     }
-    VIP_INFO() << "Send to pos: " << rspData;
+    FMP_INFO() << "Send to pos: " << rspData;
 
 //    condition.wakeAll();
 

task/fmtask.cpp

@@ -10,7 +10,7 @@
 #define RunFunction(function)   do {    \
         function##();                   \
         if(error() != FM_API_SUCCESS) { \
-            VIP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
+            FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
             return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
         }                               \
 } while(0);
@@ -44,7 +44,7 @@ FMTask::~FMTask()
 
 QByteArray FMTask::doTask()
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     RunFunction(copyPros);
     RunFunction(setWindow);
     RunFunction(showWindow);
@@ -56,7 +56,7 @@ QByteArray FMTask::doTask()
 
 void FMTask::stopTask()
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     if(preTask != nullptr) {
         preTask->stopTask();
     }
@@ -70,7 +70,7 @@ void FMTask::stopTask()
 
 void FMTask::copyPros()
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     for(int i=0; i<sizeof(DefaultProps)/sizeof(DefaultProps[0]); ++i) {
         QString posPro = DefaultProps[i];
         serverReqJsonObj[ServerProps(posPro)] = posReqJsonObj[posPro];
@@ -79,7 +79,7 @@ void FMTask::copyPros()
 
 void FMTask::showWindow()
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     QString sL[] = {
          PosProps.OperatorId,
          PosProps.BussinessDate,
@@ -101,7 +101,7 @@ void FMTask::showWindow()
 
 bool FMTask::sendToServer(bool isShowMsg)
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     // 固定部分
     serverReqJsonObj[PosProps.AppId] = APP_ID;
     serverReqJsonObj[PosProps.PartnerId] = PARTNER_ID;
@@ -139,7 +139,7 @@ bool FMTask::sendToServer(bool isShowMsg)
         }
     }
 
-    VIP_INFO() << "Server rsponse: " << serverRspJsonObj;
+    FMP_INFO() << "Server rsponse: " << serverRspJsonObj;
 
 
     if(_window != nullptr) {
@@ -185,7 +185,7 @@ QJsonValue FMTask::getPosJsonValue(const QString prop)
 
 QString FMTask::sign() const
 {
-    VIP_DEBUG() << __FUNCTION__;
+    FMP_DEBUG() << __FUNCTION__;
     // 解析JSON插入MAP中按字典排序
     QMap<QString, QString> mapData;
 
@@ -215,7 +215,7 @@ QString FMTask::sign() const
     QByteArray bt;
     bt.append(sb);
 
-    VIP_INFO() << "Sign String: " << bt;
+    FMP_INFO() << "Sign String: " << bt;
 
     QByteArray md5Bt = QCryptographicHash::hash(bt, QCryptographicHash::Md5);
     return md5Bt.toHex();

task/fmtasknownd.cpp

@@ -29,7 +29,7 @@ QByteArray FMTaskNoWnd::doTask()
     copyPros();
     bool isOk = sendToServer();
     if(!isOk) {
-        VIP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
+        FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());
         return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();
     }
     packagePOSRsp();

task/tasklogin.cpp

@@ -44,13 +44,13 @@ void TaskLogin::onLogin()
     // 认证失败
     if(getServerJsonValue(PosProps.StatusCode).toInt() != FM_API_SUCCESS) {
         QString info = serverRspJsonObj[ServerProps(PosProps.Msg)].toString();
-        VIP_WARN() << "Login failed: " << info;
+        FMP_WARN() << "Login failed: " << info;
         FMMsgWnd::FailureWnd(info, _window);
     }
     // 认证成功但限制用支付码
 //    else if((session()->data(PosProps.FM_Type).toInt() == FM_Pay) &&
 //              (getServerJsonValue(PosProps.CanPay).toInt() != 1)) {
-//        VIP_WARN() << ErrorNeedPayCode;
+//        FMP_WARN() << ErrorNeedPayCode;
 //        FMMsgWnd::FailureWnd(ErrorNeedPayCode);
 //    }
     // 认证成功