Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
蒋勇
zhichan
Commits
d99956b2
Commit
d99956b2
authored
Jun 21, 2020
by
王勇飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gyq
parent
f5cd8ee2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
center-manage/app/base/service/impl/common/channelhandlers/tx.js
+6
-4
center-manage/app/base/utils/execClient.js
+15
-0
No files found.
center-manage/app/base/service/impl/common/channelhandlers/tx.js
View file @
d99956b2
...
@@ -38,8 +38,10 @@ class TxHandler {
...
@@ -38,8 +38,10 @@ class TxHandler {
params
.
clerkName
=
salesmanInfo
.
userName
;
params
.
clerkName
=
salesmanInfo
.
userName
;
params
.
clerkPhone
=
salesmanInfo
.
mobile
params
.
clerkPhone
=
salesmanInfo
.
mobile
}
}
var
rtn
=
await
rc
.
execPost
(
params
,
requrl
);
var
rtn
=
await
rc
.
execPost
3
(
params
,
requrl
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
console
.
log
(
"RRRRRRRRRRRRRRR"
);
console
.
log
(
JSON
.
stringify
(
j
));
return
j
;
return
j
;
}
}
catch
(
error
){
catch
(
error
){
...
@@ -61,7 +63,7 @@ class TxHandler {
...
@@ -61,7 +63,7 @@ class TxHandler {
"currentStatus"
:
"已退回"
,
"currentStatus"
:
"已退回"
,
"statusReason"
:
datajson
.
actionBody
.
refusalContent
"statusReason"
:
datajson
.
actionBody
.
refusalContent
}
}
var
rtn
=
await
rc
.
execPost
(
params
,
requrl
);
var
rtn
=
await
rc
.
execPost
3
(
params
,
requrl
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
if
(
j
.
status
==
0
)
{
if
(
j
.
status
==
0
)
{
return
{
return
{
...
@@ -194,7 +196,7 @@ class TxHandler {
...
@@ -194,7 +196,7 @@ class TxHandler {
params
.
companyInfo
.
shareholderName
=
datajson
.
actionBody
.
order_snapshot
.
shareholderName
;
//法人代表
params
.
companyInfo
.
shareholderName
=
datajson
.
actionBody
.
order_snapshot
.
shareholderName
;
//法人代表
}
}
var
rtn
=
await
rc
.
execPost
(
params
,
requrl
);
var
rtn
=
await
rc
.
execPost
3
(
params
,
requrl
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
if
(
j
.
status
==
0
)
{
if
(
j
.
status
==
0
)
{
return
{
return
{
...
@@ -224,7 +226,7 @@ class TxHandler {
...
@@ -224,7 +226,7 @@ class TxHandler {
"deliverStatus"
:
"closed"
,
"deliverStatus"
:
"closed"
,
"statusReason"
:
datajson
.
actionBody
.
refusalContent
"statusReason"
:
datajson
.
actionBody
.
refusalContent
}
}
var
rtn
=
await
rc
.
execPost
(
params
,
requrl
);
var
rtn
=
await
rc
.
execPost
3
(
params
,
requrl
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
var
j
=
JSON
.
parse
(
rtn
.
stdout
);
if
(
j
.
status
==
0
)
{
if
(
j
.
status
==
0
)
{
return
{
return
{
...
...
center-manage/app/base/utils/execClient.js
View file @
d99956b2
...
@@ -6,6 +6,7 @@ class ExecClient {
...
@@ -6,6 +6,7 @@ class ExecClient {
constructor
()
{
constructor
()
{
this
.
cmdPostPattern
=
"curl -k -H 'Content-type: application/json' -d '{data}' {url}"
;
this
.
cmdPostPattern
=
"curl -k -H 'Content-type: application/json' -d '{data}' {url}"
;
this
.
cmdGetPattern
=
"curl -G -X GET '{url}'"
;
this
.
cmdGetPattern
=
"curl -G -X GET '{url}'"
;
this
.
cmdPostPattern3
=
"curl -k -H 'Content-type: application/json' -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE' -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}"
;
}
}
async
exec
(
cmd
)
{
async
exec
(
cmd
)
{
...
@@ -34,6 +35,20 @@ class ExecClient {
...
@@ -34,6 +35,20 @@ class ExecClient {
return
result
;
return
result
;
}
}
FetchPostCmd3
(
subData
,
url
)
{
var
data
=
JSON
.
stringify
(
subData
);
var
cmd
=
this
.
cmdPostPattern3
.
replace
(
/
\{
data
\}
/g
,
data
).
replace
(
/
\{
url
\}
/g
,
url
);
console
.
log
(
cmd
);
return
cmd
;
}
async
execPost3
(
subData
,
url
)
{
let
cmd
=
this
.
FetchPostCmd3
(
subData
,
url
);
var
result
=
await
this
.
exec
(
cmd
);
return
result
;
}
async
execPost2
(
subData
,
url
)
{
async
execPost2
(
subData
,
url
)
{
let
cmd
=
this
.
FetchPostCmd
(
subData
,
url
);
let
cmd
=
this
.
FetchPostCmd
(
subData
,
url
);
var
result
=
await
this
.
exec2
(
cmd
);
var
result
=
await
this
.
exec2
(
cmd
);
...
...
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