Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gjjh5
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
gjjh5
Commits
4f27ec64
Commit
4f27ec64
authored
Jun 10, 2019
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gjj
parent
188cd1d2
Pipeline
#8638
passed with stage
in 5 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
task.js
app/controller/task.js
+5
-0
config.local.js
config/config.local.js
+3
-3
config.prod.js
config/config.prod.js
+2
-2
No files found.
app/controller/task.js
View file @
4f27ec64
...
...
@@ -150,6 +150,11 @@ class TaskController extends Controller {
status
:
'failure'
,
note
:
{
message
:
err
.
message
},
};
if
(
!
/token|appKey/
.
test
(
err
.
message
))
{
if
(
/
[
a-zA-Z
]
+/
.
test
(
err
.
message
))
{
taskNote
.
note
=
'系统错误, 请稍后再试'
;
}
}
}
break
;
default
:
...
...
config/config.local.js
View file @
4f27ec64
...
...
@@ -20,7 +20,7 @@ module.exports = () => {
appSecret
:
'6bc693e3ce84478482880a3600c9a78c'
,
};
config
.
taskAPI
=
{
host
:
'http://tm.51gjj.com:48
2
1'
,
host
:
'http://tm.51gjj.com:48
3
1'
,
createTaskUrl
:
'/gjjServices/createGjjTask'
,
fetchCodeUrl
:
'/gjjServices/queryGjjCode'
,
submitTaskUrl
:
'/gjjServices/queryGjj'
,
...
...
@@ -65,7 +65,7 @@ module.exports = () => {
};
config
.
washAPI
=
{
host
:
'http://tt.51gjj.com:11
101
'
,
host
:
'http://tt.51gjj.com:11
007
'
,
washUrl
:
'/v2/gjj/analyzeGjj'
,
};
...
...
@@ -94,7 +94,7 @@ module.exports = () => {
baseDir
:
'model'
,
dialect
:
'mysql'
,
host
:
'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com'
,
database
:
'data_service_
dev
'
,
database
:
'data_service_
uat
'
,
username
:
'hexin'
,
password
:
'gYUHszn9#q'
,
port
:
3306
,
...
...
config/config.prod.js
View file @
4f27ec64
...
...
@@ -24,7 +24,7 @@ module.exports = () => {
appSecret
:
'6bc693e3ce84478482880a3600c9a78c'
,
};
config
.
taskAPI
=
{
host
:
process
.
env
.
TASKAPI_HOST
||
'http://tm.51gjj.com:48
2
1'
,
host
:
process
.
env
.
TASKAPI_HOST
||
'http://tm.51gjj.com:48
3
1'
,
createTaskUrl
:
'/gjjServices/createGjjTask'
,
fetchCodeUrl
:
'/gjjServices/queryGjjCode'
,
submitTaskUrl
:
'/gjjServices/queryGjj'
,
...
...
@@ -56,7 +56,7 @@ module.exports = () => {
};
config
.
washAPI
=
{
host
:
process
.
env
.
WASHAPI_HOST
||
'http://tt.51gjj.com:11
101
'
,
host
:
process
.
env
.
WASHAPI_HOST
||
'http://tt.51gjj.com:11
007
'
,
washUrl
:
'/v2/gjj/analyzeGjj'
,
};
...
...
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