Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmupdate
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
李定达
fmupdate
Commits
c66c559f
Commit
c66c559f
authored
May 23, 2019
by
xiaoqing.gu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将心跳和更新请求中的数据 取自store.ini 防止更新失败
parent
4b09c629
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
fmscupd/fmscupd.pro
+2
-2
fmscupd/fmtools.cpp
+2
-2
No files found.
fmscupd/fmscupd.pro
View file @
c66c559f
...
@@ -12,8 +12,8 @@ DEFINES += QUAZIP_STATIC
...
@@ -12,8 +12,8 @@ DEFINES += QUAZIP_STATIC
#DEFINES += SHAN_LIN
#DEFINES += SHAN_LIN
#DEFINES += BALIBEITIAN
#DEFINES += BALIBEITIAN
#DEFINES += AXMX
#DEFINES += AXMX
#
DEFINES += SAAS
DEFINES
+=
SAAS
DEFINES
+=
TEST_UPDATE
#
DEFINES += TEST_UPDATE
#DEFINES += AI_SEN
#DEFINES += AI_SEN
#DEFINES += TODAY
#DEFINES += TODAY
...
...
fmscupd/fmtools.cpp
View file @
c66c559f
...
@@ -311,7 +311,7 @@ QByteArray FmTools::GetUpdateData()
...
@@ -311,7 +311,7 @@ QByteArray FmTools::GetUpdateData()
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
#elif SAAS
#elif SAAS
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/
config
.ini"
;
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/
store
.ini"
;
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
...
@@ -363,7 +363,7 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
...
@@ -363,7 +363,7 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
#elif SAAS
#elif SAAS
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/
config
.ini"
;
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/
store
.ini"
;
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
...
...
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