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
a33b1fb1
Commit
a33b1fb1
authored
Dec 20, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
1baacc52
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
+5
-5
igirl-channel-web/app/config/settings.js
+2
-2
No files found.
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
View file @
a33b1fb1
...
...
@@ -374,8 +374,8 @@ class tmqueryCtl extends CtlBase {
ctx
.
headers
.
set
(
'content-type'
,
'application/json'
);
let
credentials
=
{
accessKeyId
:
'
C6D680733C19362B5DF478207D6A90A
4'
,
//替换自己的AK
secretAccessKey
:
'
EB9AFEE49CE41700CADD5F2EE3B2122C
'
//替换自己的SK--jd>>>>>>>
accessKeyId
:
'
7CCB9D55C8DB52DD943CC5B00DDA6F4
4'
,
//替换自己的AK
secretAccessKey
:
'
1C83C868AD9FA00F6D56DBF2CAE5A8DF
'
//替换自己的SK--jd>>>>>>>
}
//测试报文:
//ctx.body = "pin=jcloud_pRiHQTd&serviceId=580010&itemCode=FW_GOODS-580010-1&platform=6"
...
...
@@ -455,7 +455,7 @@ class tmqueryCtl extends CtlBase {
}
async
pushJdPayOrder
(
pushData
,
req
)
{
//处理京东推送的订单信息
try
{
var
signResult
=
await
this
.
createSign
(
pushData
,
"6
B876EB84731E166D76E1F73AD5764BA
"
,
true
);
var
signResult
=
await
this
.
createSign
(
pushData
,
"6
98FC4A1CBA6F999F023DF5ECA982181
"
,
true
);
if
(
signResult
.
status
!=
0
)
{
return
signResult
;
}
...
...
@@ -467,7 +467,7 @@ class tmqueryCtl extends CtlBase {
return
tokenInfo
;
}
var
param
=
{};
if
(
pushData
.
skuId
==
"FW_GOODS-58
1976
-1"
)
{
if
(
pushData
.
skuId
==
"FW_GOODS-58
2064
-1"
)
{
param
=
{
actionProcess
:
pushData
.
actionProcess
,
actionType
:
"updateOrderPayStatus"
,
...
...
@@ -627,7 +627,7 @@ class tmqueryCtl extends CtlBase {
return
tokenInfo
;
}
var
param
=
{};
if
(
pushData
.
skuId
==
"FW_GOODS-58
1976
-1"
)
{
if
(
pushData
.
skuId
==
"FW_GOODS-58
2064
-1"
)
{
param
=
{
actionProcess
:
pushData
.
actionProcess
,
actionType
:
"updateOrderPayStatus"
,
...
...
igirl-channel-web/app/config/settings.js
View file @
a33b1fb1
...
...
@@ -21,14 +21,14 @@ var settings = {
port
:
process
.
env
.
NODE_PORT
||
4004
,
channelApiUrl
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
return
"http://zcchannel.
apps.com:4003
"
;
return
"http://zcchannel.
gongsibao.com
"
;
}
else
{
return
"http://zc-channel-service"
;
}
},
paasUrl
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
return
"http
://p.apps.com:4001
/"
;
return
"http
s://open.gongsibao.com
/"
;
}
else
{
return
"https://open.gongsibao.com/"
;
}
...
...
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