1. 配置模块去掉未完善部分; 2. 配置 Key 分离; 3. 界面添加版权显示

debug/bin/FreemudPOS.ini

-[Service]
+[Service]
 Name=FMPService
 Desc=非码 POS 插件服务
 ;0 自动启动， 1 手动启动
@@ -18,9 +18,15 @@ Level=0
 
 [Home]
 Server=http://115.159.226.87:20001/api/user/login
-StoreId=fm99999
 PartnerId=1371
-Position=200, 200
+StoreId=pos_coco_CN9999
+PosId=fm1802
+Position=339, 251
+CashierId=001
+
+[Pay]
+Server=https://115.159.18.100/api
+Timeout=60
 
 [Vip]
 Server=http://member.freemudorder.com/member_today/service/restful/pos
@@ -31,19 +37,17 @@ TaskUrl=http://192.168.110.150:8080/api/fork/checkupdate
 DeployPath=..
 DownloadPath=download
 
-[FMTAKEOOUT]
-url=http://wmpos.sandload.cn/api
-port=34953
-storeId=pos_coco_CN9999
-passwd=posoperator@freemud.cn
-posid=fm1802
-cashierId=001
-printsize=80
-cashname=001
-shiftid=001
-shiftname=001
-autoconfirm=0
+[Takeout]
+Server=http://wmpos.sandload.cn/api
+Port=34953
+Password=posoperator@freemud.cn
+ShiftId=001
+ShiftName=001
+AutoConfirm=0
+Entryurl=
+Entryport=
 
 [Printer]
-printname=Microsoft XPS Document Writer
-printType=2
+Name=Microsoft XPS Document Writer
+Mode=2
+PaperWidth=80

fmPos.pro

@@ -11,6 +11,7 @@ SUBDIRS +=  fmp_manager \
             fmp_home \
             fmp_vip \
             fmp_takeout \
+            fmp_printer \
             FreemudPOS \
             FreemudSyncer
 

fmp_epay @ 4bba0f62

-Subproject commit cdcd1627794832dc0cb7ea0610430b38af72c3d5
+Subproject commit 4bba0f627973cbb812a135276ef756a3d7a7213b

fmp_home @ 06108fca

-Subproject commit acf4517e2b033d0f1a00ef6e46dab415a28f1feb
+Subproject commit 06108fca4c9277b4ce5b1263bdc45db8e21db044

fmp_logger/fmp_logger.pro

@@ -19,7 +19,8 @@ HEADERS += \
     fmp_logger_i.h \
     fmp_logger.h \
     fmp_logstream.h \
-    fmp_logger_p.h
+    fmp_logger_p.h \
+    fmp_logger_def.h
 
 unix {
     target.path = /usr/lib

fmp_logger/fmp_logger_def.h

+#ifndef FMP_LOGGER_DEF_H
+#define FMP_LOGGER_DEF_H
+
+#define FMP_INIKEY_LOGPATH          "Log/Path"
+#define FMP_INIKEY_LOGSIZE          "Log/Size"
+#define FMP_INIKEY_LOGLEVEL         "Log/Level"
+
+
+#endif // FMP_LOGGER_DEF_H

fmp_logger/fmp_logger_i.h

@@ -2,10 +2,13 @@
 #define FMP_LOGGER_I_H
 
 #include <fmp_base_i.h>
-#include "fmp_logstream.h"
 #include <ctkServiceReference.h>
 #include <ctkPluginContext.h>
 
+#include "fmp_logger_def.h"
+#include "fmp_logstream.h"
+
+
 /**
  * 非业务插件接口，必须继承自 BaseInterface
  * @brief The FMPLoggerInterface class

fmp_logger/version.h

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

fmp_manager/fmp_manager_i.h

@@ -3,6 +3,8 @@
 
 #include <fmp_base_i.h>
 
+#include "fmp_manager_def.h"
+
 /**
  * 非业务插件接口，必须继承自 BaseInterface
  * @brief The FMPManagerInterface class

fmp_manager/version.h

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

fmp_network/version.h

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

fmp_printer @ 05c27906

-Subproject commit 83cc2f6847e9222d41a9715896ab1222b344602a
+Subproject commit 05c2790677841068fe2f7fd67b2c426763a7a7b4

fmp_settings @ fe08ef27

-Subproject commit 1926f36397458dd693582b1a13b75656655f827f
+Subproject commit fe08ef27b617b3a7d0d97c883bd9d71b2bc8428d

fmp_syncer/fmp_syncer_i.h

@@ -3,6 +3,8 @@
 
 #include <fmp_base_i.h>
 
+#include "fmp_syncer_def.h"
+
 /**
  * @brief 同步服务接口类 FMPSyncerInterface
  * 非业务插件接口，必须继承自 BaseInterface

fmp_syncer/version.h

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

fmp_takeout @ b1018e6d

-Subproject commit 6f71ce4db37ac79379b9dd532bfe2e1a15c04474
+Subproject commit b1018e6d79cf49e88fe7287a2d7d02154115adbc

include/window/fmp_window.hpp

@@ -10,6 +10,7 @@
 
 
 #ifdef Q_OS_WIN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <windowsx.h>
 #endif