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
c8ab3d1d
Commit
c8ab3d1d
authored
Dec 24, 2019
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正式服配置
parent
b1ec61bf
Pipeline
#18482
passed with stage
in 5 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
cache.js
app/service/cache.js
+15
-15
task.js
app/service/task.js
+12
-12
config.prod.js
config/config.prod.js
+1
-1
No files found.
app/service/cache.js
View file @
c8ab3d1d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* @Author: jd
* @Author: jd
* @Date: 2019-02-25 18:59:53
* @Date: 2019-02-25 18:59:53
* @LastEditors : jd
* @LastEditors : jd
* @LastEditTime : 2019-12-24 14:
17:22
* @LastEditTime : 2019-12-24 14:
27:40
*/
*/
'use strict'
;
'use strict'
;
...
@@ -39,24 +39,24 @@ class CacheService extends Service {
...
@@ -39,24 +39,24 @@ class CacheService extends Service {
where
:
{
taskId
:
key
},
where
:
{
taskId
:
key
},
});
});
if
(
order
&&
order
.
status
!==
'success'
)
{
if
(
order
&&
order
.
status
!==
'success'
)
{
if
(
order
.
appKey
===
'
9FBBA75BBFC24401AA6A76AEFC277346
'
&&
value
.
status
===
'login'
)
{
if
(
order
.
appKey
===
'
3BA01E15AC6742E2883ADA4817840D5F
'
&&
value
.
status
===
'login'
)
{
const
ip
=
ctx
.
request
.
ip
.
split
(
','
);
const
ip
=
ctx
.
request
.
ip
.
split
(
','
);
const
iplimit
=
await
app
.
redis
.
get
(
ip
[
0
]);
const
iplimit
=
await
app
.
redis
.
get
(
ip
[
0
]);
// if (ip[0] !== '101.71.242.179' && ip[0] !== '122.224.130.226') {
if
(
ip
[
0
]
!==
'101.71.242.179'
&&
ip
[
0
]
!==
'122.224.130.226'
)
{
if
(
!
iplimit
)
{
if
(
!
iplimit
)
{
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
:
1
}),
'EX'
,
15
*
3600
);
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
:
1
}),
'EX'
,
15
*
3600
);
ctx
.
logger
.
info
(
`ipLimit set
${
ip
[
0
]}
value:`
,
1
);
ctx
.
logger
.
info
(
`ipLimit set
${
ip
[
0
]}
value:`
,
1
);
}
else
{
}
else
{
const
{
count
}
=
JSON
.
parse
(
iplimit
);
const
{
count
}
=
JSON
.
parse
(
iplimit
);
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
:
count
+
1
}),
'EX'
,
15
*
3600
);
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
:
count
+
1
}),
'EX'
,
15
*
3600
);
ctx
.
logger
.
info
(
`ipLimit ADD
${
ip
[
0
]}
value:`
,
count
+
1
);
ctx
.
logger
.
info
(
`ipLimit ADD
${
ip
[
0
]}
value:`
,
count
+
1
);
if
(
count
+
1
>
ipLimitNum
)
{
if
(
count
+
1
>
ipLimitNum
)
{
ctx
.
logger
.
info
(
`ipLimit
${
ip
[
0
]}
MAXLIMIT 提交任务失败`
);
ctx
.
logger
.
info
(
`ipLimit
${
ip
[
0
]}
MAXLIMIT 提交任务失败`
);
ctx
.
throw
(
400
,
{
message
:
'提交任务失败'
});
ctx
.
throw
(
400
,
{
message
:
'提交任务失败'
});
return
;
return
;
}
}
}
}
}
// }
}
}
await
order
.
update
({
...
value
});
await
order
.
update
({
...
value
});
}
else
{
}
else
{
...
...
app/service/task.js
View file @
c8ab3d1d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* @Author: jd
* @Author: jd
* @Date: 2019-02-25 18:59:53
* @Date: 2019-02-25 18:59:53
* @LastEditors : jd
* @LastEditors : jd
* @LastEditTime : 2019-12-24 14:2
4:06
* @LastEditTime : 2019-12-24 14:2
7:20
*/
*/
'use strict'
;
'use strict'
;
...
@@ -100,19 +100,19 @@ class TaskService extends Service {
...
@@ -100,19 +100,19 @@ class TaskService extends Service {
async
iplimit
()
{
async
iplimit
()
{
const
{
ctx
,
app
,
ipLimitNum
}
=
this
;
const
{
ctx
,
app
,
ipLimitNum
}
=
this
;
const
ip
=
ctx
.
request
.
ip
.
split
(
','
);
const
ip
=
ctx
.
request
.
ip
.
split
(
','
);
// if (ip[0] !== '101.71.242.179' && ip[0] !== '122.224.130.226') {
if
(
ip
[
0
]
!==
'101.71.242.179'
&&
ip
[
0
]
!==
'122.224.130.226'
)
{
const
iplimit
=
await
app
.
redis
.
get
(
ip
[
0
]);
const
iplimit
=
await
app
.
redis
.
get
(
ip
[
0
]);
if
(
iplimit
)
{
if
(
iplimit
)
{
const
{
count
}
=
JSON
.
parse
(
iplimit
);
const
{
count
}
=
JSON
.
parse
(
iplimit
);
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
}),
'EX'
,
15
*
3600
);
await
app
.
redis
.
set
(
ip
[
0
],
JSON
.
stringify
({
count
}),
'EX'
,
15
*
3600
);
ctx
.
logger
.
info
(
`ipLimit ADD
${
ip
[
0
]}
value:`
,
count
);
ctx
.
logger
.
info
(
`ipLimit ADD
${
ip
[
0
]}
value:`
,
count
);
if
(
count
+
1
>
ipLimitNum
)
{
if
(
count
+
1
>
ipLimitNum
)
{
ctx
.
logger
.
info
(
`ipLimit
${
ip
[
0
]}
MAXLIMIT 创建任务失败`
);
ctx
.
logger
.
info
(
`ipLimit
${
ip
[
0
]}
MAXLIMIT 创建任务失败`
);
ctx
.
throw
(
400
,
{
message
:
'创建任务失败'
});
ctx
.
throw
(
400
,
{
message
:
'创建任务失败'
});
return
;
return
;
}
}
}
}
}
// }
}
}
}
}
...
...
config/config.prod.js
View file @
c8ab3d1d
...
@@ -90,7 +90,7 @@ module.exports = () => {
...
@@ -90,7 +90,7 @@ module.exports = () => {
taskPrefix
:
'URANUS.HF.TASK'
,
taskPrefix
:
'URANUS.HF.TASK'
,
};
};
config
.
ipLimitNum
=
3
;
config
.
ipLimitNum
=
21
;
config
.
sequelize
=
{
config
.
sequelize
=
{
datasources
:
[{
datasources
:
[{
...
...
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