Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gjj_api
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
gjj_api
Commits
3ddbfb05
Commit
3ddbfb05
authored
Mar 15, 2019
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gjjapi
parent
f69eb006
Pipeline
#4523
passed with stage
in 9 minutes 9 seconds
Changes
12
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
86 additions
and
74 deletions
+86
-74
order.js
app/controller/order.js
+26
-19
script.js
app/controller/script.js
+2
-2
task.js
app/controller/task.js
+33
-27
token.js
app/controller/token.js
+8
-7
application.js
app/extend/application.js
+3
-3
errorHandler.js
app/middleware/errorHandler.js
+1
-1
cusdata.js
app/model/cusdata.js
+1
-2
taskStatus.js
app/model/taskStatus.js
+0
-0
notifyUrl.js
app/schedule/notifyUrl.js
+2
-3
partner.js
app/service/partner.js
+3
-3
storage.js
app/service/storage.js
+2
-2
washData.js
app/service/washData.js
+5
-5
No files found.
app/controller/order.js
View file @
3ddbfb05
...
...
@@ -36,27 +36,27 @@ class OrderController extends Controller {
token
:
'string'
,
},
},
}
},
cityId
:
'string'
},
cityId
:
'string'
,
};
}
//拉取数据接口
//
拉取数据接口
async
partnerShow
()
{
const
{
ctx
,
service
}
=
this
;
try
{
ctx
.
validate
(
this
.
showRule
);
const
{
appKey
,
orderSn
}
=
ctx
.
request
.
body
.
params
;
//
await service.signature.signatureCheck(ctx.request.body);
le
t
data
=
await
service
.
cache
.
get
({
key
:
orderSn
});
await
service
.
signature
.
signatureCheck
(
ctx
.
request
.
body
);
cons
t
data
=
await
service
.
cache
.
get
({
key
:
orderSn
});
let
result
=
{
code
:
2
,
msg
:
'任务还在执行或未输入'
,
data
:
{}
};
if
(
data
)
{
if
(
data
.
status
===
'success'
)
{
const
result
=
await
service
.
storage
.
read
(
orderSn
,
appKey
);
ctx
.
body
=
{
code
:
0
,
data
:
result
data
:
result
,
};
return
;
}
else
if
(
data
.
note
)
{
...
...
@@ -68,14 +68,19 @@ class OrderController extends Controller {
}
catch
(
err
)
{
ctx
.
logger
.
error
(
'partnerShow'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
==
'invalid_param'
)
{
return
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
''
};
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误'
};
return
;
}
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
return
;
}
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
}
}
//创建订单号接口
//
创建订单号接口
async
fetchOrderId
()
{
const
{
ctx
,
service
}
=
this
;
try
{
...
...
@@ -88,28 +93,30 @@ class OrderController extends Controller {
await
service
.
order
.
create
({
orderId
,
taskId
,
cityId
:
cityId
,
cityId
,
notifyUrl
:
ctx
.
app
.
notifyMap
.
get
(
appKey
)
&&
ctx
.
app
.
notifyMap
.
get
(
appKey
).
notifyUrl
||
''
,
appKey
:
appKey
,
appKey
,
status
:
'init'
,
});
ctx
.
body
=
{
code
:
0
,
data
:
{
orderSn
:
orderId
orderSn
:
orderId
,
},
msg
:
''
}
msg
:
''
,
}
;
}
catch
(
err
)
{
ctx
.
logger
.
error
(
'fetchOrderId'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
==
'invalid_param'
)
{
return
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
''
};
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误'
};
return
;
}
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
return
;
}
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
}
}
}
...
...
app/controller/script.js
View file @
3ddbfb05
...
...
@@ -4,7 +4,7 @@ const Controller = require('egg').Controller;
class
ScriptController
extends
Controller
{
//获取城市配置
//
获取城市配置
async
fetchCityConfig
()
{
const
{
ctx
,
service
}
=
this
;
try
{
...
...
@@ -15,7 +15,7 @@ class ScriptController extends Controller {
ctx
.
logger
.
error
(
'fetchOrderId'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
'
'
};
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误
'
};
return
;
}
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
...
...
app/controller/task.js
View file @
3ddbfb05
...
...
@@ -22,7 +22,7 @@ class TaskController extends Controller {
phone
:
{
type
:
'string'
,
format
:
/^1
\d{10}
$/
,
required
:
false
,
message
:
'手机号格式错误'
},
ID
:
{
type
:
'string'
,
format
:
/^
\d{14}(\d{3})?[\d
Xx
]
$/
,
required
:
false
,
message
:
'身份证格式错误'
},
},
}
}
,
};
this
.
fetchCaptureRule
=
{
...
...
@@ -51,7 +51,7 @@ class TaskController extends Controller {
};
}
//创建任务接口
//
创建任务接口
async
create
()
{
const
{
ctx
,
service
}
=
this
;
ctx
.
validate
(
this
.
createRule
);
...
...
@@ -60,24 +60,25 @@ class TaskController extends Controller {
ctx
.
success
({
taskId
});
}
//提交任务接口
//
提交任务接口
async
submit
()
{
const
{
ctx
,
service
,
config
}
=
this
;
try
{
ctx
.
validate
(
this
.
submitRule
);
const
{
orderSn
}
=
ctx
.
request
.
body
;
le
t
order
=
await
service
.
cache
.
get
({
key
:
orderSn
});
if
(
order
.
status
==
'success'
||
order
.
status
==
'failure'
)
{
return
ctx
.
body
=
{
cons
t
order
=
await
service
.
cache
.
get
({
key
:
orderSn
});
if
(
order
.
status
==
=
'success'
||
order
.
status
=
==
'failure'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'此任务已结束'
}
msg
:
'此任务已结束'
,
};
return
;
}
await
service
.
cache
.
set
({
key
:
orderSn
,
value
:
{
status
:
'submit'
,
note
:
{
code
:
3
,
msg
:
'任务已提交'
,
data
:
{
data
:
null
,
loginParam
:
null
,
cityId
:
order
.
cityId
,
orderSn
}
},
}
}
,
});
await
service
.
task
.
submit
({
taskId
:
order
.
taskId
,
...
...
@@ -89,34 +90,37 @@ class TaskController extends Controller {
code
:
0
,
data
:
{
cityId
:
order
.
cityId
,
orderSn
}
orderSn
,
}
,
};
}
catch
(
err
)
{
ctx
.
logger
.
error
(
'submit'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
==
'invalid_param'
)
{
return
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
''
};
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误'
};
return
;
}
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
return
;
}
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
}
}
//获取验证码接口
//
获取验证码接口
async
fetchCapture
()
{
const
{
ctx
,
service
}
=
this
;
try
{
ctx
.
validate
(
this
.
fetchCaptureRule
);
const
{
type
,
orderSn
}
=
ctx
.
request
.
body
;
const
order
=
await
service
.
cache
.
get
({
key
:
orderSn
});
if
(
order
.
status
==
'success'
||
order
.
status
==
'failure'
)
{
return
ctx
.
body
=
{
if
(
order
.
status
==
=
'success'
||
order
.
status
=
==
'failure'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'此任务已结束'
}
msg
:
'此任务已结束'
,
};
return
;
}
const
result
=
await
service
.
task
.
fetchCapture
({
taskId
:
order
.
taskId
,
...
...
@@ -125,22 +129,24 @@ class TaskController extends Controller {
delete
result
.
taskId
;
ctx
.
body
=
{
code
:
0
,
data
:
{
...
result
,
orderSn
}
data
:
{
...
result
,
orderSn
}
,
};
}
catch
(
err
)
{
ctx
.
logger
.
error
(
'submit'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
==
'invalid_param'
)
{
return
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
''
};
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误'
};
return
;
}
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
'系统错误, 请稍后再试'
};
return
;
}
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
}
}
//任务回调接口
//
任务回调接口
async
handleCallback
()
{
const
{
ctx
,
service
}
=
this
;
const
{
taskId
}
=
ctx
.
request
.
body
;
...
...
@@ -149,7 +155,7 @@ class TaskController extends Controller {
const
order
=
await
service
.
order
.
getOneByTaskId
(
taskId
);
if
(
!
order
)
{
ctx
.
logger
.
error
(
'handleCallback'
,
taskId
,
'未查询到此任务'
);
return
return
;
}
const
{
orderId
,
appKey
,
cityId
}
=
order
;
let
taskNote
=
{
...
...
app/controller/token.js
View file @
3ddbfb05
...
...
@@ -17,24 +17,25 @@ class TokenController extends Controller {
};
}
//获取token
//
获取token
async
partnerCreate
()
{
const
{
ctx
,
service
}
=
this
;
try
{
ctx
.
validate
(
this
.
createRule
);
const
token
=
await
service
.
signature
.
createToken
(
ctx
.
request
.
body
);
return
ctx
.
body
=
{
ctx
.
body
=
{
code
:
0
,
data
:
{
token
},
msg
:
''
}
msg
:
''
,
}
;
}
catch
(
err
)
{
ctx
.
logger
.
error
(
'partnerCreate'
,
err
);
ctx
.
status
=
200
;
if
(
err
.
code
==
'invalid_param'
)
{
return
ctx
.
body
=
{
code
:
-
1
,
msg
:
err
.
message
||
''
};
if
(
err
.
code
===
'invalid_param'
)
{
ctx
.
body
=
{
code
:
-
1
,
msg
:
'请求参数有误'
};
return
;
}
return
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
ctx
.
body
=
{
code
:
err
.
code
||
-
1
,
msg
:
err
.
message
||
''
};
}
}
}
...
...
app/extend/application.js
View file @
3ddbfb05
...
...
@@ -42,8 +42,8 @@ class Cache {
this
.
app
.
logger
.
info
(
`[cache] set (ms)
${
this
.
name
}
.
${
key
}
:
${
value
}
`
);
return
await
this
.
_set
(
key
,
value
,
ttl
);
}
async
del
(
key
){
return
await
this
.
_del
(
key
)
async
del
(
key
)
{
return
await
this
.
_del
(
key
)
;
}
}
...
...
@@ -66,7 +66,7 @@ class NodeCacheWrap extends Cache {
cache
.
set
(
key
,
value
);
}
}
async
_del
(
key
){
async
_del
(
key
)
{
const
{
cache
}
=
this
;
cache
.
del
(
key
);
}
...
...
app/middleware/errorHandler.js
View file @
3ddbfb05
...
...
@@ -3,7 +3,7 @@
module
.
exports
=
(
options
,
app
)
=>
{
return
async
function
errorHandler
(
ctx
,
next
)
{
try
{
if
(
ctx
.
request
.
method
==
'POST'
)
{
if
(
ctx
.
request
.
method
===
'POST'
)
{
app
.
logger
.
info
(
JSON
.
stringify
(
ctx
.
request
.
body
));
}
await
next
();
...
...
app/model/cusdata.js
View file @
3ddbfb05
...
...
@@ -76,4 +76,4 @@ module.exports = app => {
});
return
cusDatas
;
}
\ No newline at end of file
};
app/model/taskStatus.js
View file @
3ddbfb05
app/schedule/notifyUrl.js
View file @
3ddbfb05
...
...
@@ -29,5 +29,5 @@ module.exports = {
}
catch
(
e
)
{
ctx
.
logger
.
error
(
'【schedule/notifyUrlTask】catch error:'
,
JSON
.
stringify
(
e
));
}
}
}
\ No newline at end of file
},
};
app/service/partner.js
View file @
3ddbfb05
...
...
@@ -19,12 +19,12 @@ class PartnerService extends Service {
contentType
:
'json'
,
method
:
'POST'
,
data
:
{
orderSn
:
orderId
orderSn
:
orderId
,
},
}
)
)
;
ctx
.
logger
.
info
(
`【Partner】 notice
${
notifyUrl
}
`
,
'orderId:'
,
orderId
,
'result:'
,
ret
.
status
,
JSON
.
stringify
(
ret
.
data
));
if
(
ret
.
status
==
200
)
{
if
(
ret
.
status
==
=
200
)
{
await
order
.
update
({
notice
:
'1'
});
}
}
...
...
app/service/storage.js
View file @
3ddbfb05
...
...
@@ -57,8 +57,8 @@ class StorageService extends Service {
await
ctx
.
model
.
Cusdata
.
create
({
appKey
,
orderId
,
type
:
'gjj'
})
type
:
'gjj'
,
})
;
return
result
.
data
.
data
[
readDataKey
];
}
}
...
...
app/service/washData.js
View file @
3ddbfb05
...
...
@@ -51,16 +51,16 @@ class WashDataService extends Service {
dealData
(
data
,
passID
=
false
)
{
const
{
clearGjj
,
clearLoan
}
=
this
;
delete
data
.
data
.
general_analyzed_data
;
for
(
le
t
gjjItem
of
data
.
data
.
gjj_data
)
{
for
(
le
t
text
of
clearGjj
)
{
if
(
!
(
passID
&&
text
==
'ID'
))
{
for
(
cons
t
gjjItem
of
data
.
data
.
gjj_data
)
{
for
(
cons
t
text
of
clearGjj
)
{
if
(
!
(
passID
&&
text
==
=
'ID'
))
{
delete
gjjItem
.
gjj_brief
[
text
];
}
}
delete
gjjItem
.
gjj_account_analyzed_data
;
}
for
(
le
t
loanItem
of
data
.
data
.
loan_data
)
{
for
(
le
t
text
of
clearLoan
)
{
for
(
cons
t
loanItem
of
data
.
data
.
loan_data
)
{
for
(
cons
t
text
of
clearLoan
)
{
delete
loanItem
.
loan_brief
[
text
];
}
}
...
...
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