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
21db9b17
Commit
21db9b17
authored
Apr 11, 2019
by
高诸锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
e63c7c72
Pipeline
#5856
passed with stage
in 2 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
25 deletions
+40
-25
order.js
app/controller/order.js
+4
-0
partner.js
app/service/partner.js
+5
-1
washData.js
app/service/washData.js
+7
-0
config.local.js
config/config.local.js
+12
-12
config.prod.js
config/config.prod.js
+12
-12
No files found.
app/controller/order.js
View file @
21db9b17
...
...
@@ -145,6 +145,10 @@ class OrderController extends Controller {
async
orderShow
()
{
const
{
ctx
,
service
}
=
this
;
const
{
appKey
,
orderId
}
=
ctx
.
params
;
const
appKeyInfo
=
await
service
.
partner
.
fetchInfo
(
appKey
);
if
(
!
(
appKeyInfo
&&
appKeyInfo
.
valid
===
true
&&
appKeyInfo
.
enableHfView
===
true
))
{
return
ctx
.
fail
(
'未开通此服务'
);
}
const
data
=
await
service
.
order
.
getOneByOrderId
(
orderId
);
if
(
data
)
{
if
(
data
.
status
===
'success'
&&
(
data
.
appKey
===
appKey
))
{
...
...
app/service/partner.js
View file @
21db9b17
...
...
@@ -22,11 +22,15 @@ class PartnerService extends Service {
}
}
}
const
ret
=
await
ctx
.
curl
(
`
${
host
+
fetchTheme
}
/
${
appKey
}
`
,
{
const
ret
=
await
ctx
.
curl
(
`
${
host
+
fetchTheme
}
`
,
{
charset
:
'utf-8'
,
timeout
:
[
'30s'
,
'30s'
],
dataType
:
'json'
,
method
:
'GET'
,
data
:
{
appKey
,
subject
:
'ss'
,
},
});
ctx
.
logger
.
info
(
`【Partner】 fetchTheme
${
host
+
fetchTheme
}
/
${
appKey
}
`
,
ret
.
data
);
if
(
ret
.
status
===
200
&&
ret
.
data
&&
ret
.
data
.
id
===
appKey
)
{
...
...
app/service/washData.js
View file @
21db9b17
...
...
@@ -43,6 +43,13 @@ class WashDataService extends Service {
bar
.
appKey
=
''
;
return
bar
;
}
dealData
(
data
,
passID
=
false
)
{
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'身份证'
];
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'银行卡号'
];
delete
data
.
data
.
shebaoData
.
data
[
'基本信息'
][
'电话号码'
];
return
data
;
}
}
module
.
exports
=
WashDataService
;
config/config.local.js
View file @
21db9b17
...
...
@@ -15,7 +15,7 @@ module.exports = () => {
config
.
partnerAPI
=
{
host
:
'https://dev-nginx.jianbing.com/zeus-api/v1'
,
fetchTheme
:
'/chaos/
partners/
theme'
,
fetchTheme
:
'/chaos/theme'
,
fetchScripts
:
'/chaos/partners/scripts'
,
redisThemePrefix
:
'DATA_SERVER_SHEBAO.THEME'
,
redisScriptsPrefix
:
'DATA_SERVER_SHEBAO.SCRIPTS'
,
...
...
@@ -27,14 +27,14 @@ module.exports = () => {
config
.
scriptsAPI
=
{
host
:
'https://dev-nginx.jianbing.com/zeus-api/v1'
,
fetchScriptsUrl
:
'/chaos/
hf
/two_dimension_array/queries'
,
fetchOneScriptUrl
:
'/chaos/
hf
/two_dimension_array/info'
,
fetchParamsInfoUrl
:
'/chaos/
hf
/login_param_map'
,
fetchQueryButtonUrl
:
'/chaos/
hf
/query_button'
,
fetchHelpUrl
:
'/chaos/
hf
/help'
,
fetchNoticeUrl
:
'/chaos/
hf
/notice'
,
fetchHubSeriptsUrl
:
'/chaos/
hf
/hubs'
,
fetchScriptByCityNameUrl
:
'/chaos/
hf
/city_scripts'
,
fetchScriptsUrl
:
'/chaos/
ss
/two_dimension_array/queries'
,
fetchOneScriptUrl
:
'/chaos/
ss
/two_dimension_array/info'
,
fetchParamsInfoUrl
:
'/chaos/
ss
/login_param_map'
,
fetchQueryButtonUrl
:
'/chaos/
ss
/query_button'
,
fetchHelpUrl
:
'/chaos/
ss
/help'
,
fetchNoticeUrl
:
'/chaos/
ss
/notice'
,
fetchHubSeriptsUrl
:
'/chaos/
ss
/hubs'
,
fetchScriptByCityNameUrl
:
'/chaos/
ss
/city_scripts'
,
redisScriptsKey
:
'DATA_SERVER_SHEBAO.SCRIPTS'
,
redisParamsKey
:
'DATA_SERVER_SHEBAO.PARAMS'
,
redisScriptListKey
:
'DATA_SERVER_SHEBAO.SCRIPTLIST'
,
...
...
@@ -64,9 +64,9 @@ module.exports = () => {
};
config
.
lockKeys
=
{
fecthHub
:
'NEWSB.
HF
.HUBS.LOCK'
,
fecteToken
:
'NEWSB.
HF
.TOKEN.LOCK'
,
token
:
'NEWSB.
HF
.TOKEN'
,
fecthHub
:
'NEWSB.
SS
.HUBS.LOCK'
,
fecteToken
:
'NEWSB.
SS
.TOKEN.LOCK'
,
token
:
'NEWSB.
SS
.TOKEN'
,
fecthParnters
:
'NEWSB.PARNTERS.LOCK'
,
taskPrefix
:
'NEWSB.TASK'
,
};
...
...
config/config.prod.js
View file @
21db9b17
...
...
@@ -16,7 +16,7 @@ module.exports = () => {
config
.
partnerAPI
=
{
host
:
process
.
env
.
PARTNERAPI_HOST
,
fetchTheme
:
'/chaos/
partners/
theme'
,
fetchTheme
:
'/chaos/theme'
,
fetchScripts
:
'/chaos/partners/scripts'
,
redisThemePrefix
:
'DATA_SERVER_SHEBAO.PARNTERS.THEME'
,
redisScriptsPrefix
:
'DATA_SERVER_SHEBAO.PARNTERS.SCRIPTS'
,
...
...
@@ -24,16 +24,16 @@ module.exports = () => {
config
.
scriptsAPI
=
{
host
:
process
.
env
.
SCRIPTSAPI_HOST
,
fetchScriptsUrl
:
'/chaos/
hf
/two_dimension_array/queries'
,
fetchOneScriptUrl
:
'/chaos/
hf
/two_dimension_array/info'
,
fetchParamsInfoUrl
:
'/chaos/
hf
/login_param_map'
,
fetchQueryButtonUrl
:
'/chaos/
hf
/query_button'
,
fetchHelpUrl
:
'/chaos/
hf
/help'
,
fetchNoticeUrl
:
'/chaos/
hf
/notice'
,
fetchHubSeriptsUrl
:
'/chaos/
hf
/hubs'
,
fetchScriptsUrl
:
'/chaos/
ss
/two_dimension_array/queries'
,
fetchOneScriptUrl
:
'/chaos/
ss
/two_dimension_array/info'
,
fetchParamsInfoUrl
:
'/chaos/
ss
/login_param_map'
,
fetchQueryButtonUrl
:
'/chaos/
ss
/query_button'
,
fetchHelpUrl
:
'/chaos/
ss
/help'
,
fetchNoticeUrl
:
'/chaos/
ss
/notice'
,
fetchHubSeriptsUrl
:
'/chaos/
ss
/hubs'
,
centersInfoUrl
:
'https://t.51gjj.com/shebao/centersInfo'
,
cityInfoUrl
:
'https://t.51gjj.com/shebao/cityConfig'
,
fetchScriptByCityNameUrl
:
'/chaos/
hf
/city_scripts'
,
fetchScriptByCityNameUrl
:
'/chaos/
ss
/city_scripts'
,
redisScriptsKey
:
'DATA_SERVER_SHEBAO.SCRIPTS'
,
redisParamsKey
:
'DATA_SERVER_SHEBAO.PARAMS'
,
};
...
...
@@ -62,9 +62,9 @@ module.exports = () => {
};
config
.
redisKeys
=
{
fecthHub
:
'NEWSB.
HF
.HUBS.LOCK'
,
fecteToken
:
'NEWSB.
HF
.TOKEN.LOCK'
,
token
:
'NEWSB.
HF
.TOKEN'
,
fecthHub
:
'NEWSB.
SS
.HUBS.LOCK'
,
fecteToken
:
'NEWSB.
SS
.TOKEN.LOCK'
,
token
:
'NEWSB.
SS
.TOKEN'
,
fecthParnters
:
'NEWSB.PARNTERS.LOCK'
,
};
...
...
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