Commit 82bc1489 by xiaojing.zhang Committed by Carwyn

去掉未使用组件

parent c112ed27
...@@ -19,7 +19,7 @@ Level=1 ...@@ -19,7 +19,7 @@ Level=1
[Home] [Home]
Server=http://115.159.226.87:20001/api/user/login Server=http://115.159.226.87:20001/api/user/login
PartnerId=1371 PartnerId=1371
StoreId=pos_coco_CN9999 StoreId=M023
PosId=fm1802 PosId=fm1802
Position=339, 251 Position=339, 251
CashierId=001 CashierId=001
...@@ -29,8 +29,9 @@ Server=https://115.159.18.100/api ...@@ -29,8 +29,9 @@ Server=https://115.159.18.100/api
Timeout=60 Timeout=60
[Vip] [Vip]
Server=http://micro-service.sandload.cn/member-pos/pos/member Server=http://membertest1.sandload.cn:8732/pos/member
NeedSocketHeader=1 NeedSocketHeader=0
[Syncer] [Syncer]
Interval=3 Interval=3
TaskUrl=http://115.159.33.143/api/fork/checkupdate TaskUrl=http://115.159.33.143/api/fork/checkupdate
......
...@@ -4,16 +4,16 @@ TEMPLATE = subdirs ...@@ -4,16 +4,16 @@ TEMPLATE = subdirs
SUBDIRS += fmp_manager \ SUBDIRS += fmp_manager \
fmp_logger \ fmp_logger \
fmp_settings \ fmp_settings \
# fmp_uiloader \ #fmp_uiloader \
fmp_network \ fmp_network \
fmp_syncer \ #fmp_syncer \
fmp_epay \ # fmp_epay \
fmp_home \ fmp_home \
fmp_vip \ fmp_vip \
fmp_takeout \ #fmp_takeout \
fmp_printer \ #fmp_printer \
FreemudPOS \ FreemudPOS \
FreemudSyncer \ #FreemudSyncer \
fmp_redeem #fmp_redeem
CONFIG += ordered CONFIG += ordered
fmp_epay @ 288a7869
Subproject commit f58de8d8c52e0657a7d9a636b31dbe12e204c28e Subproject commit 288a78693a258d632277c7443c0dd41bfb6fe869
Plugin-SymbolicName: fmp.logger Plugin-SymbolicName: fmp.logger
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.logger Plugin-Name: fmp.logger
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -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 64 #define VER_BUILD 74
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.logger\0" #define RES_FILE_DESC "fmp.logger\0"
#define RES_INTER_NAME "fmp.logger\0" #define RES_INTER_NAME "fmp.logger\0"
#define RES_FILE_NAME "fmp.logger\0" #define RES_FILE_NAME "fmp.logger\0"
......
...@@ -171,7 +171,7 @@ int FMPluginManager::LoadPlugin(const QString &plugin) ...@@ -171,7 +171,7 @@ int FMPluginManager::LoadPlugin(const QString &plugin)
ctkPluginContext* pc = _fw->getPluginContext(); ctkPluginContext* pc = _fw->getPluginContext();
//! 设置程序当前目录为插件目录,防止插件依赖 Dll 搜索不到导致无法加载 //! 设置程序当前目录为插件目录,防止插件依赖 Dll 搜索不到导致无法加载
QDir::setCurrent(plugin_info.path()); QDir::setCurrent(plugin_info.path());
QSharedPointer<ctkPlugin> p = pc->installPlugin(QUrl::fromLocalFile(plugin_info.canonicalFilePath())); QSharedPointer<ctkPlugin> p = pc->installPlugin(QUrl::fromLocalFile(plugin_info.canonicalFilePath()));
if (!p.isNull()) { if (!p.isNull()) {
p->start(ctkPlugin::START_TRANSIENT); p->start(ctkPlugin::START_TRANSIENT);
_plugins << p; _plugins << p;
......
Plugin-SymbolicName: fmp.manager Plugin-SymbolicName: fmp.manager
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.manager Plugin-Name: fmp.manager
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -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 64 #define VER_BUILD 74
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.manager\0" #define RES_FILE_DESC "fmp.manager\0"
#define RES_INTER_NAME "fmp.manager\0" #define RES_INTER_NAME "fmp.manager\0"
#define RES_FILE_NAME "fmp.manager\0" #define RES_FILE_NAME "fmp.manager\0"
......
...@@ -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 56 #define VER_BUILD 74
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.network\0" #define RES_FILE_DESC "fmp.network\0"
#define RES_INTER_NAME "fmp.network\0" #define RES_INTER_NAME "fmp.network\0"
#define RES_FILE_NAME "fmp.network\0" #define RES_FILE_NAME "fmp.network\0"
......
...@@ -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 67 #define VER_BUILD 74
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.redeem\0" #define RES_FILE_DESC "fmp.redeem\0"
#define RES_INTER_NAME "fmp.redeem\0" #define RES_INTER_NAME "fmp.redeem\0"
#define RES_FILE_NAME "fmp.redeem\0" #define RES_FILE_NAME "fmp.redeem\0"
......
Plugin-SymbolicName: fmp.syncer Plugin-SymbolicName: fmp.syncer
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.syncer Plugin-Name: fmp.syncer
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -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 55 #define VER_BUILD 74
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.syncer\0" #define RES_FILE_DESC "fmp.syncer\0"
#define RES_INTER_NAME "fmp.syncer\0" #define RES_INTER_NAME "fmp.syncer\0"
#define RES_FILE_NAME "fmp.syncer\0" #define RES_FILE_NAME "fmp.syncer\0"
......
fmp_vip @ d964b52f
Subproject commit 064b676cdca3f9b99d99c827be4c0200bab74370 Subproject commit d964b52f59480aedcc3ec47585e0f9d5e725ad52
File deleted
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