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

fmp_database.cpp

@@ -7,7 +7,7 @@
 #include <QSqlQueryModel>
 #include <fmp_logger_i.h>
 
-FMPDataBase::FMPDataBase(QString dbname, FMPLoggerInterface *logger, QString connectname, QObject *parent) : QObject(parent), _logger(logger)
+FMPDataBase::FMPDataBase(QString dbname, QString connectname, QObject *parent) : QObject(parent)
 {
     _db = QSqlDatabase::addDatabase("QSQLITE", connectname);
     _db.setDatabaseName(dbname);   
@@ -30,7 +30,7 @@ bool FMPDataBase::creat(QString sql)
     bool flag = query.exec(sql);
 
     if(!flag)
-        FMP_WARN(_logger) << query.lastError();
+        FMP_WARN() << query.lastError();
 
     return flag;
 }
@@ -47,7 +47,7 @@ bool FMPDataBase::dlt(QString table, QString condition)
     bool flag =  query.exec(sql);
 
     if(!flag)
-        FMP_WARN(_logger) << query.lastError();
+        FMP_WARN() << query.lastError();
 
     return flag;
 }
@@ -71,14 +71,14 @@ bool FMPDataBase::insert(QString table, QVariantHash data)
 
     sql = QString("insert into %1 (").arg(table) + columnnamelist.join(", ") + ") values (" + columnvaluelist.join(", ") + ")";
 
-    FMP_INFO(_logger) << "inset sql : " << sql;
+    FMP_INFO() << "inset sql : " << sql;
     qDebug() << "inset sql : " << sql;
 
 
     bool flag =  query.exec(sql);
 
     if(!flag)
-        FMP_WARN(_logger) << query.lastError();
+        FMP_WARN() << query.lastError();
 
     return flag;
 }
@@ -100,12 +100,12 @@ bool FMPDataBase::update(QString table, QVariantHash data, QString condition)
 
     sql = QString("update %1 set ").arg(table) + sql + " where " + condition;
 
-    FMP_INFO(_logger) << "update sql : " << sql;
+    FMP_INFO() << "update sql : " << sql;
 
     bool flag =  query.exec(sql);
 
     if(!flag)
-        FMP_WARN(_logger) << query.lastError();
+        FMP_WARN() << query.lastError();
 
     return flag;
 }
@@ -128,12 +128,12 @@ bool FMPDataBase::find(QString table, QSqlQuery &query, QStringList keylist, QSt
 
     sql += QString(" from %1 where ").arg(table) + condition;
 
-    FMP_INFO(_logger) << "find sql : " << sql;
+    FMP_INFO() << "find sql : " << sql;
 
     bool flag =  tmpquery.exec(sql);
 
     if(!flag)
-        FMP_WARN(_logger) << tmpquery.lastError();
+        FMP_WARN() << tmpquery.lastError();
 
     query = tmpquery;
 

fmp_database.h

@@ -13,7 +13,7 @@ class FMPDataBase : public QObject
 {
     Q_OBJECT
 public:
-    FMPDataBase(QString dbname, FMPLoggerInterface *logger, QString connectname = QString(DEFAULT_EPAY_CONNECTNAME), QObject *parent = 0);
+    FMPDataBase(QString dbname, QString connectname = QString(DEFAULT_EPAY_CONNECTNAME), QObject *parent = 0);
 
     ~FMPDataBase();
 
@@ -41,8 +41,6 @@ private:
 
     QSqlDatabase _db;
 
-    FMPLoggerInterface *_logger;
-
     bool _isopen;
 };
 

fmp_epay_p.cpp

@@ -30,13 +30,13 @@ FMPePayPrivate::FMPePayPrivate(FMPePay *parent)
     : q_ptr(parent),
       _payDialog(nullptr),
       _setting(nullptr),
-      _logger(nullptr),
       _network(nullptr),
       _model(nullptr),
       _db(nullptr),
       _watcher(nullptr),
       _reverse_flag(false)
 {
+    FMPLoggerInterface::InitContext(q_ptr->_ctx);
     _watcher = new QFutureWatcher<QByteArray>();
     connect( _watcher, SIGNAL( finished() ), this, SLOT( witedata() ) );
 }
@@ -102,13 +102,13 @@ void FMPePayPrivate::clearorder()
 
     QtConcurrent::run( [q, this]()
     {
-        FMPDataBase db(q->_databasename, _logger, QString("fmp_pay_clean")) ;
+        FMPDataBase db(q->_databasename, QString("fmp_pay_clean")) ;
 
         QDateTime date = QDateTime::currentDateTime();
         QDateTime tmpdate = date.addDays(-(q->_ordershelflife));
         QString deletedate = tmpdate.toString("yyyy-MM-dd");
 
-        FMP_INFO(_logger) << "deletedate" <<deletedate;
+        FMP_INFO() << "deletedate" <<deletedate;
 
         db.dlt(q->_table, QString(QString(SQL_KEY_BUSSINEDATE) + "<datetime('%1')").arg(deletedate));
 
@@ -119,11 +119,6 @@ void FMPePayPrivate::onShowPayWnd()
 {
     Q_Q(FMPePay);
 
-    if(_logger == nullptr)
-    {
-        _logger = q->GetService<FMPLoggerInterface>(q->_ctx);
-    }
-
     clearorder();
 
     if(_network == nullptr)
@@ -133,7 +128,7 @@ void FMPePayPrivate::onShowPayWnd()
 
     if(_db == nullptr)
     {
-        _db = new FMPDataBase(q->_databasename, _logger);
+        _db = new FMPDataBase(q->_databasename);
 
         QString sql = "create table " + q->_table + " ("
                       "fmId varchar(40) primary key, "
@@ -152,11 +147,11 @@ void FMPePayPrivate::onShowPayWnd()
                       "refund_date date"
                       ")";
 
-        FMP_INFO(_logger) << " creat table sql:" << sql;
+        FMP_INFO() << " creat table sql:" << sql;
 
         if(_db->creat(sql))
         {
-            FMP_WARN(_logger) << "creat table fmp_pay failed";
+            FMP_WARN() << "creat table fmp_pay failed";
         }
     }
 
@@ -178,7 +173,7 @@ void FMPePayPrivate::onShowPayWnd()
         hash[FMP_EPAY_OPERATORID] = q->_operator_id;
 
         _setting = q->GetService<FMPSettingsInterface>(q->_ctx);
-        _payDialog = new FMPPayDialog(this, _logger, hash);
+        _payDialog = new FMPPayDialog(this, hash);
     }
 
     _payDialog->show();
@@ -208,7 +203,7 @@ void FMPePayPrivate::ControlPayJson(QString sum, QString code)
             return ;
         }
 
-        FMP_INFO(_logger) << "pay json : " << _current_json;
+        FMP_INFO() << "pay json : " << _current_json;
 
         QString errors;
         QJsonObject outjson;
@@ -314,7 +309,7 @@ bool FMPePayPrivate::HttpPost(QJsonObject& outjson, QJsonObject json, QString &e
         return false;
     }
 
-    FMP_INFO(_logger) << outjson;
+    FMP_INFO() << outjson;
 
     if(outjson[FMP_RPAY_PAY_RETURN_STATUSCODE].toInt() == 100)
        return true;
@@ -338,7 +333,7 @@ bool FMPePayPrivate::CheckReturnJson(QByteArray data, QJsonObject &returnjson)
     }
     returnjson = doc.object();
 
-    FMP_INFO(_logger) << "get return json : " << returnjson;
+    FMP_INFO() << "get return json : " << returnjson;
 
     return true;
 }
@@ -400,7 +395,7 @@ void FMPePayPrivate::ControlRefundJson(QString sum, QString code)
             return ;
         }
 
-        FMP_INFO(_logger) << "refund json : " << _current_json;
+        FMP_INFO() << "refund json : " << _current_json;
 
         QString errors;
         QJsonObject outjson;
@@ -421,12 +416,12 @@ void FMPePayPrivate::ControlRefundJson(QString sum, QString code)
 
            if(!_db->update(q->_table, hash, QString("pay_transId = '%1' or fmId = '%2'").arg(code).arg(code)))
            {
-                FMP_ERROR(_logger) << "refund data update failed";
+                FMP_ERROR() << "refund data update failed";
            }
 
            if(!_db->find(q->_table, tmpquery, tmpkeylist,  QString("pay_transId = '%1' or fmId = '%2'").arg(code).arg(code)) || !tmpquery.next())
            {
-               FMP_ERROR(_logger) << "refund data update failed";
+               FMP_ERROR() << "refund data update failed";
 
                outjson.insert(SQL_KEY_PAYTRANSID, code);
                outjson.insert(SQL_KEY_FMID, code);
@@ -441,7 +436,7 @@ void FMPePayPrivate::ControlRefundJson(QString sum, QString code)
                outjson.insert(SQL_KEY_TOTALAMOUNT, sum);
            }
 
-           FMP_INFO(_logger) << "refund success view json : " << outjson;
+           FMP_INFO() << "refund success view json : " << outjson;
 
            _model->setFilter(QString(""));
            _model->select();

fmp_epay_p.h

@@ -71,8 +71,6 @@ public:
 
     FMPSettingsInterface *_setting;
 
-    FMPLoggerInterface  *_logger;
-
     FMPNetworkInterface *_network;
 
 private:

fmp_epayview_dialog.cpp

@@ -15,8 +15,7 @@
 #include <QPropertyAnimation>
 
 
-FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, FMPLoggerInterface *logger, QVariantHash basicinfo, QWidget *parent) :
-    _logger(logger),
+FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWidget *parent) :
     _control(control),
     QDialog(parent),
     ui(new Ui::FMPPayDialog)

fmp_epayview_dialog.h

@@ -34,7 +34,7 @@ typedef enum
 } Movemode;
 
 public:
-    explicit FMPPayDialog(FMPePayPrivate *control, FMPLoggerInterface *logger, QVariantHash basicinfo, QWidget *parent = 0);
+    explicit FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWidget *parent = 0);
     ~FMPPayDialog();
 
 public slots:
@@ -107,8 +107,6 @@ private:
 
     FMPPayWait *_wait;
 
-    FMPLoggerInterface  *_logger;
-
     //----------
     QPushButton* _curt_btn;
 

fmp_pe_handlers.cpp

@@ -21,11 +21,11 @@ void FMPStartEventHandler::handleEvent(const ctkEvent &event)
             _epay->Pay();
         }
         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();
     }
 }
 
@@ -48,10 +48,10 @@ void FMPNetWorkEventHandler::handleEvent(const ctkEvent &event)
             _epay->Pay();
         }
         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();
     }
 }

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 11
+#define VER_BUILD 4
 
 //! Convert version numbers to string
 #define _STR(S)  #S