diff --git a/BaseHttp.pro b/BaseHttp.pro index 2dd7952..4c7ed8f 100644 --- a/BaseHttp.pro +++ b/BaseHttp.pro @@ -30,7 +30,6 @@ conf.files = $$CONFIG_DIR conf.path = $$DESTDIR COPIES += conf - DISTFILES += $$CONFIG_DIR/application.ini # Default rules for deployment. diff --git a/Core/ConfigManager.cpp b/Core/ConfigManager.cpp index 6d2e1d0..4d75d4b 100644 --- a/Core/ConfigManager.cpp +++ b/Core/ConfigManager.cpp @@ -33,6 +33,7 @@ void ConfigManager::load(const QString &filepath) settings->beginGroup("log"); _logFilename = settings->value("filename").toString(); + settings->endGroup(); } qint32 ConfigManager::serverPort() const diff --git a/Core/LogManager.cpp b/Core/LogManager.cpp index a576288..55cc901 100644 --- a/Core/LogManager.cpp +++ b/Core/LogManager.cpp @@ -4,11 +4,9 @@ //#include #include -#define hlog_disable() logger_set_level(hlog, LOG_LEVEL_SILENT); - LogManager::LogManager() { - hlog_disable(); + logger_set_level(hlog, LOG_LEVEL_SILENT); } void LogManager::init(const QString &filename) @@ -19,7 +17,6 @@ void LogManager::init(const QString &filename) // _logger = QSharedPointer(new spdlog::logger("logger", {console_sink})); - // FIXME // qInstallMessageHandler(LogManager::messageHandler); } diff --git a/Repository/Repository.h b/Repository/Repository.h index e3b69bd..6a49f84 100644 --- a/Repository/Repository.h +++ b/Repository/Repository.h @@ -58,7 +58,10 @@ public: QSharedPointer ptr; ptr.reset(new T()); ptr->id = id; - qx::dao::fetch_by_id(ptr); + QSqlError err = qx::dao::fetch_by_id(ptr); + if (err.isValid()) { + ptr.reset(new T()); + } return ptr; }; }; diff --git a/Repository/Repository.pri b/Repository/Repository.pri index 5ae1976..c94f17e 100644 --- a/Repository/Repository.pri +++ b/Repository/Repository.pri @@ -1,5 +1,3 @@ HEADERS += \ $$PWD/Repository.h \ $$PWD/UserRepository.h - -SOURCES += diff --git a/ThirdParty/QxOrm/QxOrm.pri b/ThirdParty/QxOrm/QxOrm.pri index e8dcbc8..c821dd3 100644 --- a/ThirdParty/QxOrm/QxOrm.pri +++ b/ThirdParty/QxOrm/QxOrm.pri @@ -13,3 +13,4 @@ CONFIG(debug, debug | release){ QxOrm.path = $$DESTDIR COPIES += QxOrm + diff --git a/ThirdParty/QxOrm/include/export.h b/ThirdParty/QxOrm/include/export.h deleted file mode 100644 index d83cce3..0000000 --- a/ThirdParty/QxOrm/include/export.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef QX_EXPORT_H -#define QX_EXPORT_H - -#ifdef _BUILDING_APP -#define QX_DLL_EXPORT_ QX_DLL_EXPORT_HELPER -#else -#define QX_DLL_EXPORT_ QX_DLL_IMPORT_HELPER -#endif - -#ifdef _BUILDING_APP -#define QX_REGISTER_HPP_ QX_REGISTER_HPP_EXPORT_DLL -#define QX_REGISTER_CPP_ QX_REGISTER_CPP_EXPORT_DLL -#else -#define QX_REGISTER_HPP_USER QX_REGISTER_HPP_IMPORT_DLL -#define QX_REGISTER_CPP_USER QX_REGISTER_CPP_IMPORT_DLL -#endif - -#endif //QX_EXPORT_H