Commit 3d0abcfb by Carwyn

1. 取消同步模块调试下载部分; 2.添加外卖配置; 3.业务插件析构时释放锁

parent 1d30b086
[Service] [Service]
Name=FMPService Name=FMPService
Desc=非码 POS 插件服务 Desc=非码 POS 插件服务
;0 自动启动, 1 手动启动 ;0 自动启动, 1 手动启动
...@@ -16,12 +16,11 @@ Size=1 ...@@ -16,12 +16,11 @@ Size=1
;0:关闭 1:错误 2:警告 3:信息 4:调试 ;0:关闭 1:错误 2:警告 3:信息 4:调试
Level=0 Level=0
[Home] [Home]
Server=http://115.159.226.87:20001/api/user/login Server=http://115.159.226.87:20001/api/user/login
StoreId=fm99999 StoreId=fm99999
PartnerId=1371 PartnerId=1371
Position=293, 170 Position=200, 200
[Vip] [Vip]
Server=http://member.freemudorder.com/member_today/service/restful/pos Server=http://member.freemudorder.com/member_today/service/restful/pos
...@@ -31,3 +30,20 @@ Interval=3 ...@@ -31,3 +30,20 @@ Interval=3
TaskUrl=http://192.168.110.150:8080/api/fork/checkupdate TaskUrl=http://192.168.110.150:8080/api/fork/checkupdate
DeployPath=.. DeployPath=..
DownloadPath=download 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
[Printer]
printname=Microsoft XPS Document Writer
printType=2
...@@ -207,10 +207,10 @@ void FMPSyncerPrivate::run() ...@@ -207,10 +207,10 @@ void FMPSyncerPrivate::run()
#ifdef QT_DEBUG #ifdef QT_DEBUG
//!TEST //!TEST
task_json["NeedUpdate"] = "yes"; // task_json["NeedUpdate"] = "yes";
task_json["UpdatePath"] = "http://192.168.110.150:8080/UpgradeFiles/1101"; // task_json["UpdatePath"] = "http://192.168.110.150:8080/UpgradeFiles/1101";
task_json.insert("NeedUpload", "yes"); // task_json.insert("NeedUpload", "yes");
task_json.insert("UploadFiles", "img/yb.jpg|img/dlb.jpg"); // task_json.insert("UploadFiles", "img/yb.jpg|img/dlb.jpg");
//!TEST //!TEST
#endif #endif
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 51 #define VER_BUILD 52
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
...@@ -18,6 +18,7 @@ class FMPluginInterface : public FMPBaseInterface ...@@ -18,6 +18,7 @@ class FMPluginInterface : public FMPBaseInterface
{ {
public: public:
explicit FMPluginInterface(ctkPluginContext *ctx) : _ctx(ctx) {} explicit FMPluginInterface(ctkPluginContext *ctx) : _ctx(ctx) {}
virtual ~FMPluginInterface() { _semaphore.release(); }
/** /**
* 业务插件启动只能请求启动,由事件订阅者决定是否允许启动 * 业务插件启动只能请求启动,由事件订阅者决定是否允许启动
......
#include "../../fmp_printer/fmp_printer_i.h"
#include "../../fmp_takeout/fmp_takeout_i.h"
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