Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sb_h5
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
data_server
sb_h5
Commits
6ca2968e
Commit
6ca2968e
authored
Apr 24, 2019
by
高诸锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix]:
parent
91e07e02
Pipeline
#6403
passed with stage
in 2 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
order.js
app/controller/order.js
+1
-1
notify_url.js
app/schedule/notify_url.js
+1
-1
scripts.js
app/service/scripts.js
+2
-2
washData.js
app/service/washData.js
+3
-3
config.local.js
config/config.local.js
+2
-2
No files found.
app/controller/order.js
View file @
6ca2968e
...
...
@@ -151,7 +151,7 @@ class OrderController extends Controller {
}
const
data
=
await
service
.
order
.
getOneByOrderId
(
orderId
);
if
(
data
)
{
if
(
data
.
status
===
'success'
&&
(
data
.
app
K
ey
===
appKey
))
{
if
(
data
.
status
===
'success'
&&
(
data
.
app
k
ey
===
appKey
))
{
const
result
=
await
service
.
storage
.
read
(
orderId
,
appKey
);
const
ret
=
service
.
washData
.
dealData
(
result
);
ctx
.
success
(
ret
);
...
...
app/schedule/notify_url.js
View file @
6ca2968e
...
...
@@ -18,7 +18,7 @@ module.exports = {
contentType
:
'json'
,
});
// ctx.logger.info(JSON.stringify(ret.data));
if
(
ret
.
data
.
code
===
'0'
)
{
if
(
ret
.
data
.
code
===
0
)
{
ret
.
data
.
data
.
customerList
.
map
(
customer
=>
{
if
(
'callBackUrl'
in
customer
)
{
notifyMap
.
set
(
customer
.
appKey
,
{
notifyUrl
:
customer
.
callBackUrl
});
...
...
app/service/scripts.js
View file @
6ca2968e
...
...
@@ -36,7 +36,7 @@ class ScriptsService extends Service {
dataType
:
'json'
,
contentType
:
'json'
,
});
ctx
.
logger
.
info
(
`【Scripts】fetchScripts,
${
baseURL
+
fetchScriptsUrl
}
`
,
'result:
'
,
JSON
.
stringify
(
result
.
data
)
);
ctx
.
logger
.
info
(
`【Scripts】fetchScripts,
${
baseURL
+
fetchScriptsUrl
}
`
,
'result:
....'
);
if
(
result
.
data
&&
result
.
data
.
length
>
0
)
{
await
this
.
app
.
redis
.
set
(
redisScriptsKey
,
JSON
.
stringify
(
result
.
data
),
'EX'
,
300
);
}
...
...
@@ -152,7 +152,7 @@ class ScriptsService extends Service {
return
result
.
data
.
content
.
address_detail
.
city
;
}
ctx
.
logger
.
error
(
'fetchCityFormIp'
,
url
,
JSON
.
stringify
(
result
.
data
));
return
'北京
市
'
;
return
'北京'
;
}
async
fetchScriptByCityName
(
name
)
{
...
...
app/service/washData.js
View file @
6ca2968e
...
...
@@ -45,9 +45,9 @@ class WashDataService extends Service {
}
dealData
(
data
,
passID
=
false
)
{
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'身份证'
];
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'银行卡号'
];
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'电话号码'
];
delete
data
.
data
[
'基本信息'
][
'身份证'
];
delete
data
.
data
[
'基本信息'
][
'银行卡号'
];
delete
data
.
data
[
'基本信息'
][
'电话号码'
];
return
data
;
}
}
...
...
config/config.local.js
View file @
6ca2968e
...
...
@@ -19,9 +19,9 @@ module.exports = () => {
fetchScripts
:
'/chaos/partners/scripts'
,
redisThemePrefix
:
'DATA_SERVER_SHEBAO.THEME'
,
redisScriptsPrefix
:
'DATA_SERVER_SHEBAO.SCRIPTS'
,
fetchAgreements
:
''
,
fetchAgreements
:
'
/chaos/agreements
'
,
redisAgreementsPrefix
:
'DATA_SERVER_SHEBAO.AGREEMENTS'
,
fetchInfo
:
''
,
fetchInfo
:
'
/chaos/partner
'
,
redisInfoPrefix
:
'DATA_SERVER_SHEBAO.PARTNERINFO'
,
};
...
...
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