main
还不如一只猪威武 2 days ago
parent 636a973682
commit 9b26d744bc

@ -30,7 +30,6 @@ conf.files = $$CONFIG_DIR
conf.path = $$DESTDIR conf.path = $$DESTDIR
COPIES += conf COPIES += conf
DISTFILES += $$CONFIG_DIR/application.ini DISTFILES += $$CONFIG_DIR/application.ini
# Default rules for deployment. # Default rules for deployment.

@ -33,6 +33,7 @@ void ConfigManager::load(const QString &filepath)
settings->beginGroup("log"); settings->beginGroup("log");
_logFilename = settings->value("filename").toString(); _logFilename = settings->value("filename").toString();
settings->endGroup();
} }
qint32 ConfigManager::serverPort() const qint32 ConfigManager::serverPort() const

@ -4,11 +4,9 @@
//#include <spdlog/sinks/stdout_color_sinks.h> //#include <spdlog/sinks/stdout_color_sinks.h>
#include <QtGlobal> #include <QtGlobal>
#define hlog_disable() logger_set_level(hlog, LOG_LEVEL_SILENT);
LogManager::LogManager() LogManager::LogManager()
{ {
hlog_disable(); logger_set_level(hlog, LOG_LEVEL_SILENT);
} }
void LogManager::init(const QString &filename) void LogManager::init(const QString &filename)
@ -19,7 +17,6 @@ void LogManager::init(const QString &filename)
// _logger = QSharedPointer<spdlog::logger>(new spdlog::logger("logger", {console_sink})); // _logger = QSharedPointer<spdlog::logger>(new spdlog::logger("logger", {console_sink}));
// FIXME
// qInstallMessageHandler(LogManager::messageHandler); // qInstallMessageHandler(LogManager::messageHandler);
} }

@ -58,7 +58,10 @@ public:
QSharedPointer<T> ptr; QSharedPointer<T> ptr;
ptr.reset(new T()); ptr.reset(new T());
ptr->id = id; 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; return ptr;
}; };
}; };

@ -1,5 +1,3 @@
HEADERS += \ HEADERS += \
$$PWD/Repository.h \ $$PWD/Repository.h \
$$PWD/UserRepository.h $$PWD/UserRepository.h
SOURCES +=

@ -13,3 +13,4 @@ CONFIG(debug, debug | release){
QxOrm.path = $$DESTDIR QxOrm.path = $$DESTDIR
COPIES += QxOrm COPIES += QxOrm

@ -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
Loading…
Cancel
Save