Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmPOS
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmPOS
Commits
3d0abcfb
Commit
3d0abcfb
authored
Apr 27, 2017
by
Carwyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 取消同步模块调试下载部分; 2.添加外卖配置; 3.业务插件析构时释放锁
parent
1d30b086
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
8 deletions
+27
-8
debug/bin/FreemudPOS.ini
+19
-3
fmp_syncer/fmp_syncer_p.cpp
+4
-4
fmp_syncer/version.h
+1
-1
include/interface/fmp_plugin_i.h
+1
-0
include/interface/fmp_printer_i.h
+1
-0
include/interface/fmp_takeout_i.h
+1
-0
No files found.
debug/bin/FreemudPOS.ini
View file @
3d0abcfb
[Service]
[Service]
Name
=
FMPService
Desc
=
非码 POS 插件服务
;0 自动启动, 1 手动启动
...
...
@@ -16,12 +16,11 @@ Size=1
;0:关闭 1:错误 2:警告 3:信息 4:调试
Level
=
0
[Home]
Server
=
http://115.159.226.87:20001/api/user/login
StoreId
=
fm99999
PartnerId
=
1371
Position
=
2
93, 17
0
Position
=
2
00, 20
0
[Vip]
Server
=
http://member.freemudorder.com/member_today/service/restful/pos
...
...
@@ -31,3 +30,20 @@ Interval=3
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
[Printer]
printname
=
Microsoft XPS Document Writer
printType
=
2
fmp_syncer/fmp_syncer_p.cpp
View file @
3d0abcfb
...
...
@@ -207,10 +207,10 @@ void FMPSyncerPrivate::run()
#ifdef QT_DEBUG
//!TEST
task_json
[
"NeedUpdate"
]
=
"yes"
;
task_json
[
"UpdatePath"
]
=
"http://192.168.110.150:8080/UpgradeFiles/1101"
;
task_json
.
insert
(
"NeedUpload"
,
"yes"
);
task_json
.
insert
(
"UploadFiles"
,
"img/yb.jpg|img/dlb.jpg"
);
//
task_json["NeedUpdate"] = "yes";
//
task_json["UpdatePath"] = "http://192.168.110.150:8080/UpgradeFiles/1101";
//
task_json.insert("NeedUpload", "yes");
//
task_json.insert("UploadFiles", "img/yb.jpg|img/dlb.jpg");
//!TEST
#endif
...
...
fmp_syncer/version.h
View file @
3d0abcfb
...
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_BUILD 5
1
#define VER_BUILD 5
2
//! Convert version numbers to string
#define _STR(S) #S
...
...
include/interface/fmp_plugin_i.h
View file @
3d0abcfb
...
...
@@ -18,6 +18,7 @@ class FMPluginInterface : public FMPBaseInterface
{
public
:
explicit
FMPluginInterface
(
ctkPluginContext
*
ctx
)
:
_ctx
(
ctx
)
{}
virtual
~
FMPluginInterface
()
{
_semaphore
.
release
();
}
/**
* 业务插件启动只能请求启动,由事件订阅者决定是否允许启动
...
...
include/interface/fmp_printer_i.h
0 → 100644
View file @
3d0abcfb
#include "../../fmp_printer/fmp_printer_i.h"
include/interface/fmp_takeout_i.h
0 → 100644
View file @
3d0abcfb
#include "../../fmp_takeout/fmp_takeout_i.h"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment