Commit 10b20588 by Amnes1a

修复调试过程,控制台不打印日志问题;忽略无用的警告

parent bf513b89
[Service] [Service]
Name=FMPService Name=FMPService
Desc=非码 POS 插件服务 Desc=非码 POS 插件服务
;0 自动启动, 1 手动启动 ;0 自动启动, 1 手动启动
...@@ -29,7 +29,8 @@ Server=https://115.159.18.100/api ...@@ -29,7 +29,8 @@ Server=https://115.159.18.100/api
Timeout=60 Timeout=60
[Vip] [Vip]
Server=http://jtest.sandload.cn/member_tianfu/service/restful/pos ;Server=http://jtest.sandload.cn/member_tianfu/service/restful/pos
Server=http://membersit.sandload.cn:8080/member_tianfu/service/restful/pos
[Syncer] [Syncer]
Interval=3 Interval=3
......
...@@ -4,8 +4,9 @@ log4j.appender.fa.File = ${FMP_APP}/log/fmp.log ...@@ -4,8 +4,9 @@ log4j.appender.fa.File = ${FMP_APP}/log/fmp.log
log4j.appender.fa.MaxFileSize=512KB log4j.appender.fa.MaxFileSize=512KB
log4j.appender.fa.MaxBackupIndex=10 log4j.appender.fa.MaxBackupIndex=10
log4j.appender.fa.layout = org.apache.log4j.PatternLayout log4j.appender.fa.layout = org.apache.log4j.PatternLayout
log4j.appender.fa.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}[%-5p]%F:%L %m %n log4j.appender.fa.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}[%-5p]%F:%L %m %n%n
log4j.appender.ca = org.apache.log4j.ConsoleAppender log4j.appender.ca = org.apache.log4j.ConsoleAppender
log4j.appender.ca.layout = org.apache.log4j.PatternLayout log4j.appender.ca.layout = org.apache.log4j.PatternLayout
log4j.appender.ca.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}[%-5p]%F:%L %m %n log4j.appender.ca.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}[%-5p]%F:%L %m %n%n
\ No newline at end of file
...@@ -44,7 +44,7 @@ LIBS += -L$$PWD/../lib ...@@ -44,7 +44,7 @@ LIBS += -L$$PWD/../lib
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
#Linking library #Linking library
LIBS += -lCTKCored -lCTKPluginFrameworkd -llog4cxx LIBS += -lCTKCored -lCTKPluginFrameworkd -llog4cxxd
#Destination path #Destination path
DESTDIR = $$PWD/../debug/plugins DESTDIR = $$PWD/../debug/plugins
} else { } else {
......
#include "fmp_logger_p.h" #include "fmp_logger_p.h"
#include <fmp_settings_i.h> #include <fmp_settings_i.h>
#include <QDateTime> #include <QDateTime>
#include <QDir> #include <QDir>
...@@ -69,25 +69,25 @@ void FMPLoggerPrivate::Log(short level, const QString &msg, const char* file, co ...@@ -69,25 +69,25 @@ void FMPLoggerPrivate::Log(short level, const QString &msg, const char* file, co
case FMPLogStream::ERROR: case FMPLogStream::ERROR:
if (logger->isErrorEnabled()) { if (logger->isErrorEnabled()) {
::log4cxx::helpers::MessageBuffer oss_; ::log4cxx::helpers::MessageBuffer oss_;
logger->forcedLog(::log4cxx::Level::getError(), oss_.str(oss_ << msg.toLocal8Bit().data()), LocationInfo(file, func, line)); logger->forcedLog(::log4cxx::Level::getError(), oss_.str(oss_ << msg.toUtf8().data()), LocationInfo(file, func, line));
} }
break; break;
case FMPLogStream::WARNING: case FMPLogStream::WARNING:
if (logger->isWarnEnabled()) { if (logger->isWarnEnabled()) {
::log4cxx::helpers::MessageBuffer oss_; ::log4cxx::helpers::MessageBuffer oss_;
logger->forcedLog(::log4cxx::Level::getWarn(), oss_.str(oss_ << msg.toLocal8Bit().data()), LocationInfo(file, func, line)); logger->forcedLog(::log4cxx::Level::getWarn(), oss_.str(oss_ << msg.toUtf8().data()), LocationInfo(file, func, line));
} }
break; break;
case FMPLogStream::DEBUG: case FMPLogStream::DEBUG:
if (LOG4CXX_UNLIKELY(logger->isDebugEnabled())) { if (LOG4CXX_UNLIKELY(logger->isDebugEnabled())) {
::log4cxx::helpers::MessageBuffer oss_; ::log4cxx::helpers::MessageBuffer oss_;
logger->forcedLog(::log4cxx::Level::getDebug(), oss_.str(oss_ << msg.toLocal8Bit().data()), LocationInfo(file, func, line)); logger->forcedLog(::log4cxx::Level::getDebug(), oss_.str(oss_ << msg.toUtf8().data()), LocationInfo(file, func, line));
} }
break; break;
default: default:
if (logger->isInfoEnabled()) { if (logger->isInfoEnabled()) {
::log4cxx::helpers::MessageBuffer oss_; ::log4cxx::helpers::MessageBuffer oss_;
logger->forcedLog(::log4cxx::Level::getInfo(), oss_.str(oss_ << msg.toLocal8Bit().data()), LocationInfo(file, func, line)); logger->forcedLog(::log4cxx::Level::getInfo(), oss_.str(oss_ << msg.toUtf8().data()), LocationInfo(file, func, line));
} }
break; break;
} }
......
...@@ -2,7 +2,6 @@ QT += core ...@@ -2,7 +2,6 @@ QT += core
QT -= gui QT -= gui
TEMPLATE = lib TEMPLATE = lib
#
SOURCES += \ SOURCES += \
fmp_manager.cpp \ fmp_manager.cpp \
fmp_me_handlers.cpp fmp_me_handlers.cpp
...@@ -40,9 +39,11 @@ RESOURCES += \ ...@@ -40,9 +39,11 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc res/$${ORIGIN_TARGET}.qrc
win32 { win32 {
QMAKE_CXXFLAGS += /wd4100
RC_FILE += res/$${ORIGIN_TARGET}.rc RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
} }
else { else {
QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-unused-variable
system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET)
} }
...@@ -49,10 +49,12 @@ RESOURCES += \ ...@@ -49,10 +49,12 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc res/$${ORIGIN_TARGET}.qrc
win32 { win32 {
QMAKE_CXXFLAGS += /wd4100 /wd4189
RC_FILE += res/$${ORIGIN_TARGET}.rc RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
} }
else { else {
QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-unused-variable
system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET)
} }
...@@ -44,10 +44,12 @@ RESOURCES += \ ...@@ -44,10 +44,12 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc res/$${ORIGIN_TARGET}.qrc
win32 { win32 {
QMAKE_CXXFLAGS += /wd4100 /wd4819
RC_FILE += res/$${ORIGIN_TARGET}.rc RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
} }
else { else {
QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-unused-variable
system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET) system($$PWD/../fmprc.sh $$PWD/version.h $$ORIGIN_TARGET)
} }
......
#include "fmp_syncer.h" #include "fmp_syncer.h"
#include "fmp_syncer_p.h" #include "fmp_syncer_p.h"
#include <ctkPluginContext.h> #include <ctkPluginContext.h>
#include <QDebug> #include <QDebug>
......
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
QT += widgets QT += widgets
TEMPLATE = lib TEMPLATE = lib
DEFINES += QUAZIP_STATIC DEFINES += QUAZIP_STATIC
SOURCES += \ SOURCES += \
...@@ -52,7 +50,6 @@ CONFIG(debug, debug|release) { ...@@ -52,7 +50,6 @@ CONFIG(debug, debug|release) {
DESTDIR = $$PWD/../release/plugins DESTDIR = $$PWD/../release/plugins
} }
#
RESOURCES += \ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc res/$${ORIGIN_TARGET}.qrc
......
/*============================================================================= /*=============================================================================
Library: CTK Library: CTK
......
No preview for this file type
No preview for this file type
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment