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
6efc49dc
Commit
6efc49dc
authored
Apr 11, 2019
by
何娜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
主题配置
parent
1bdc63c5
Pipeline
#5843
passed with stage
in 2 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
19 deletions
+6
-19
task.js
app/controller/task.js
+2
-15
router.js
app/router.js
+2
-2
config.local.js
config/config.local.js
+1
-1
config.prod.js
config/config.prod.js
+1
-1
No files found.
app/controller/task.js
View file @
6efc49dc
...
...
@@ -24,19 +24,6 @@ class TaskController extends Controller {
taskId
:
{
type
:
'string'
,
format
:
/
\d
+/
},
};
this
.
getDataRule
=
{
sign
:
'string'
,
params
:
{
type
:
'object'
,
rule
:
{
appKey
:
'string'
,
timestamp
:
'string'
,
token
:
'string'
,
orderId
:
'string'
,
},
},
};
this
.
cityConfigRule
=
{
sign
:
'string'
,
params
:
{
...
...
@@ -53,9 +40,9 @@ class TaskController extends Controller {
async
create
()
{
const
{
ctx
,
service
}
=
this
;
ctx
.
validate
(
this
.
createRule
);
const
{
scriptId
,
orderId
,
userId
}
=
ctx
.
request
.
body
;
const
{
scriptId
,
orderId
}
=
ctx
.
request
.
body
;
const
taskId
=
await
service
.
task
.
create
({
scriptId
});
await
service
.
order
.
update
({
orderId
,
cityId
:
scriptId
,
taskId
,
userId
});
await
service
.
order
.
update
({
orderId
,
cityId
:
scriptId
,
taskId
});
await
service
.
cache
.
set
({
key
:
taskId
,
value
:
{
status
:
'init'
,
note
:
{
message
:
'init'
}},
...
...
app/router.js
View file @
6efc49dc
...
...
@@ -34,9 +34,9 @@ module.exports = app => {
itRouter
.
post
(
'/getToken'
,
controller
.
token
.
partnerToken
);
// 合作方获取token
itRouter
.
post
(
'/get
O
rderSn'
,
controller
.
order
.
partnerOrder
);
// 合作方获取orderSn
itRouter
.
post
(
'/get
o
rderSn'
,
controller
.
order
.
partnerOrder
);
// 合作方获取orderSn
itRouter
.
post
(
'/getCity'
,
controller
.
task
.
cityConfigs
);
// 获取城市配置
itRouter
.
post
(
'/getCity
Config
'
,
controller
.
task
.
cityConfigs
);
// 获取城市配置
itRouter
.
post
(
'/getData'
,
controller
.
order
.
partnerData
);
// 合作方拉数据
itRouter
.
get
(
'/orderData/:appKey/:orderId'
,
controller
.
order
.
orderShow
);
//获取展示页面数据
...
...
config/config.local.js
View file @
6efc49dc
...
...
@@ -26,7 +26,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
:
'URANUS.It.PARNTERS.THEME'
,
redisScriptsPrefix
:
'URANUS.It.PARNTERS.SCRIPTS'
,
...
...
config/config.prod.js
View file @
6efc49dc
...
...
@@ -29,7 +29,7 @@ module.exports = () => {
config
.
partnerAPI
=
{
host
:
process
.
env
.
PARTNERAPI_HOST
,
fetchTheme
:
'/chaos/
partners/
theme'
,
fetchTheme
:
'/chaos/theme'
,
fetchScripts
:
'/chaos/partners/scripts'
,
fetchAgreements
:
'/chaos/agreements'
,
redisThemePrefix
:
'URANUS.IT.PARNTERS.THEME'
,
...
...
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