Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
taxh5
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
taxh5
Commits
32bd47a1
Commit
32bd47a1
authored
Apr 11, 2019
by
何娜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log
parent
75e2b4b3
Pipeline
#5867
passed with stage
in 2 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
4 deletions
+8
-4
order.js
app/controller/order.js
+1
-0
task.js
app/controller/task.js
+1
-0
order.js
app/service/order.js
+2
-0
scripts.js
app/service/scripts.js
+2
-2
config.local.js
config/config.local.js
+2
-2
No files found.
app/controller/order.js
View file @
32bd47a1
...
@@ -117,6 +117,7 @@ class OrderController extends Controller {
...
@@ -117,6 +117,7 @@ class OrderController extends Controller {
return
ctx
.
fail
(
'未开通此服务'
);
return
ctx
.
fail
(
'未开通此服务'
);
}
}
const
data
=
await
service
.
order
.
getOneByOrderId
(
orderId
);
const
data
=
await
service
.
order
.
getOneByOrderId
(
orderId
);
ctx
.
logger
.
info
(
'uat,order'
,
data
,
orderId
)
if
(
data
)
{
if
(
data
)
{
if
(
data
.
status
===
'success'
&&
(
data
.
appKey
===
appKey
))
{
if
(
data
.
status
===
'success'
&&
(
data
.
appKey
===
appKey
))
{
const
result
=
await
service
.
storage
.
read
(
orderId
,
appKey
);
const
result
=
await
service
.
storage
.
read
(
orderId
,
appKey
);
...
...
app/controller/task.js
View file @
32bd47a1
...
@@ -88,6 +88,7 @@ class TaskController extends Controller {
...
@@ -88,6 +88,7 @@ class TaskController extends Controller {
async
handleCallback
()
{
async
handleCallback
()
{
const
{
ctx
,
service
}
=
this
;
const
{
ctx
,
service
}
=
this
;
ctx
.
logger
.
info
(
'【handleCallback】'
,
ctx
.
request
.
body
);
const
{
taskId
}
=
ctx
.
request
.
body
;
const
{
taskId
}
=
ctx
.
request
.
body
;
const
result
=
await
service
.
task
.
fetchTask
({
taskId
});
const
result
=
await
service
.
task
.
fetchTask
({
taskId
});
ctx
.
success
();
ctx
.
success
();
...
...
app/service/order.js
View file @
32bd47a1
...
@@ -5,9 +5,11 @@ const Service = require('egg').Service;
...
@@ -5,9 +5,11 @@ const Service = require('egg').Service;
class
OrderService
extends
Service
{
class
OrderService
extends
Service
{
async
getOneByOrderId
(
orderId
)
{
async
getOneByOrderId
(
orderId
)
{
const
{
ctx
}
=
this
;
const
{
ctx
}
=
this
;
ctx
.
logger
.
info
(
'orderId'
,
orderId
)
const
order
=
await
ctx
.
model
.
TaskStatus
.
findOne
({
const
order
=
await
ctx
.
model
.
TaskStatus
.
findOne
({
where
:
{
orderId
},
where
:
{
orderId
},
});
});
ctx
.
logger
.
info
(
'order'
,
order
)
return
order
;
return
order
;
}
}
...
...
app/service/scripts.js
View file @
32bd47a1
...
@@ -34,7 +34,7 @@ class ScriptsService extends Service {
...
@@ -34,7 +34,7 @@ class ScriptsService extends Service {
dataType
:
'json'
,
dataType
:
'json'
,
contentType
:
'json'
,
contentType
:
'json'
,
});
});
ctx
.
logger
.
info
(
`【Scripts】fetchScripts,
${
baseURL
+
fetchScriptsUrl
}
`
,
'result:'
,
result
.
data
);
ctx
.
logger
.
info
(
`【Scripts】fetchScripts,
${
baseURL
+
fetchScriptsUrl
}
`
);
if
(
result
.
data
&&
result
.
data
.
length
>
0
)
{
if
(
result
.
data
&&
result
.
data
.
length
>
0
)
{
await
this
.
app
.
redis
.
set
(
redisScriptsKey
,
JSON
.
stringify
(
result
.
data
),
'EX'
,
300
);
await
this
.
app
.
redis
.
set
(
redisScriptsKey
,
JSON
.
stringify
(
result
.
data
),
'EX'
,
300
);
}
}
...
@@ -72,7 +72,7 @@ class ScriptsService extends Service {
...
@@ -72,7 +72,7 @@ class ScriptsService extends Service {
dataType
:
'json'
,
dataType
:
'json'
,
contentType
:
'json'
,
contentType
:
'json'
,
});
});
ctx
.
logger
.
info
(
`【Scripts】fetchParams,
${
baseURL
+
fetchParamsInfoUrl
}
`
,
'result:'
,
result
.
data
);
//
ctx.logger.info(`【Scripts】fetchParams,${baseURL + fetchParamsInfoUrl}`, 'result:', result.data);
if
(
result
.
data
&&
result
.
data
.
length
>
0
)
{
if
(
result
.
data
&&
result
.
data
.
length
>
0
)
{
await
this
.
app
.
redis
.
set
(
redisParamsKey
,
JSON
.
stringify
(
result
.
data
),
'EX'
,
3000
);
await
this
.
app
.
redis
.
set
(
redisParamsKey
,
JSON
.
stringify
(
result
.
data
),
'EX'
,
3000
);
}
}
...
...
config/config.local.js
View file @
32bd47a1
...
@@ -51,7 +51,7 @@ module.exports = () => {
...
@@ -51,7 +51,7 @@ module.exports = () => {
};
};
config
.
storageAPI
=
{
config
.
storageAPI
=
{
host
:
'http://tv.51gjj.com:1125
2
'
,
host
:
'http://tv.51gjj.com:1125
0
'
,
writeUrl
:
'/data'
,
writeUrl
:
'/data'
,
readUrl
:
'/IncomeTax'
,
readUrl
:
'/IncomeTax'
,
writeType
:
'incomeTax'
,
writeType
:
'incomeTax'
,
...
@@ -89,7 +89,7 @@ module.exports = () => {
...
@@ -89,7 +89,7 @@ module.exports = () => {
baseDir
:
'model'
,
baseDir
:
'model'
,
dialect
:
'mysql'
,
dialect
:
'mysql'
,
host
:
'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com'
,
host
:
'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com'
,
database
:
'data_service_
dev
'
,
database
:
'data_service_
uat
'
,
username
:
'hexin'
,
username
:
'hexin'
,
password
:
'gYUHszn9#q'
,
password
:
'gYUHszn9#q'
,
port
:
3306
,
port
:
3306
,
...
...
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