Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9e4f2c6b
authored
Mar 10, 2017
by
xueli.xue
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Clean Code
parent
9b2edc82
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
11 deletions
README.md
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
xxl-job-admin/src/main/java/com/xxl/job/admin/service/IXxlJobService.java
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
README.md
View file @
9e4f2c6b
...
@@ -716,6 +716,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
...
@@ -716,6 +716,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
2、线程模型统一;
-
2、线程模型统一;
-
3、执行器支持手动设置执行地址列表,提供开关切换使用注册地址还是手动设置的地址;
-
3、执行器支持手动设置执行地址列表,提供开关切换使用注册地址还是手动设置的地址;
-
4、执行器路由规则:第一个、循环、随机、顺序故障(默认)转移;
-
4、执行器路由规则:第一个、循环、随机、顺序故障(默认)转移;
-
5、CleanCode,清理无效的历史参数;
#### TODO LIST
#### TODO LIST
-
1、支持脚本JOB(源码或指定路径), 即shell/python/php等, 日志实时输出并支持在线监控;定制JobHandler实现;
-
1、支持脚本JOB(源码或指定路径), 即shell/python/php等, 日志实时输出并支持在线监控;定制JobHandler实现;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
View file @
9e4f2c6b
...
@@ -49,22 +49,20 @@ public class JobInfoController {
...
@@ -49,22 +49,20 @@ public class JobInfoController {
@RequestMapping
(
"/add"
)
@RequestMapping
(
"/add"
)
@ResponseBody
@ResponseBody
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executorAppname
,
String
executorAddress
,
String
executorHandler
,
String
executorParam
,
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
)
{
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
)
{
return
xxlJobService
.
add
(
jobGroup
,
jobCron
,
jobDesc
,
author
,
alarmEmail
,
return
xxlJobService
.
add
(
jobGroup
,
jobCron
,
jobDesc
,
author
,
alarmEmail
,
executor
Address
,
executor
Handler
,
executorParam
,
executorHandler
,
executorParam
,
glueSwitch
,
glueSource
,
glueRemark
,
childJobKey
);
glueSwitch
,
glueSource
,
glueRemark
,
childJobKey
);
}
}
@RequestMapping
(
"/reschedule"
)
@RequestMapping
(
"/reschedule"
)
@ResponseBody
@ResponseBody
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executorAppname
,
String
executorAddress
,
String
executorHandler
,
String
executorParam
,
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
childJobKey
)
{
int
glueSwitch
,
String
childJobKey
)
{
return
xxlJobService
.
reschedule
(
jobGroup
,
jobName
,
jobCron
,
jobDesc
,
author
,
alarmEmail
,
return
xxlJobService
.
reschedule
(
jobGroup
,
jobName
,
jobCron
,
jobDesc
,
author
,
alarmEmail
,
executor
Address
,
executor
Handler
,
executorParam
,
glueSwitch
,
childJobKey
);
executorHandler
,
executorParam
,
glueSwitch
,
childJobKey
);
}
}
@RequestMapping
(
"/remove"
)
@RequestMapping
(
"/remove"
)
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/IXxlJobService.java
View file @
9e4f2c6b
...
@@ -15,11 +15,10 @@ public interface IXxlJobService {
...
@@ -15,11 +15,10 @@ public interface IXxlJobService {
public
Map
<
String
,
Object
>
pageList
(
int
start
,
int
length
,
int
jobGroup
,
String
executorHandler
,
String
filterTime
);
public
Map
<
String
,
Object
>
pageList
(
int
start
,
int
length
,
int
jobGroup
,
String
executorHandler
,
String
filterTime
);
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executorAddress
,
String
executorHandler
,
String
executorParam
,
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
);
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
);
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executor
Address
,
String
executor
Handler
,
String
executorParam
,
int
glueSwitch
,
String
childJobKey
);
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
childJobKey
);
public
ReturnT
<
String
>
remove
(
int
jobGroup
,
String
jobName
);
public
ReturnT
<
String
>
remove
(
int
jobGroup
,
String
jobName
);
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
View file @
9e4f2c6b
...
@@ -65,7 +65,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
...
@@ -65,7 +65,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
@Override
@Override
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
add
(
int
jobGroup
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executor
Address
,
String
executor
Handler
,
String
executorParam
,
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
)
{
int
glueSwitch
,
String
glueSource
,
String
glueRemark
,
String
childJobKey
)
{
// valid
// valid
XxlJobGroup
group
=
xxlJobGroupDao
.
load
(
jobGroup
);
XxlJobGroup
group
=
xxlJobGroupDao
.
load
(
jobGroup
);
...
@@ -146,7 +146,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
...
@@ -146,7 +146,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
@Override
@Override
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
public
ReturnT
<
String
>
reschedule
(
int
jobGroup
,
String
jobName
,
String
jobCron
,
String
jobDesc
,
String
author
,
String
alarmEmail
,
String
executor
Address
,
String
executor
Handler
,
String
executorParam
,
int
glueSwitch
,
String
childJobKey
)
{
String
executorHandler
,
String
executorParam
,
int
glueSwitch
,
String
childJobKey
)
{
// valid
// valid
XxlJobGroup
group
=
xxlJobGroupDao
.
load
(
jobGroup
);
XxlJobGroup
group
=
xxlJobGroupDao
.
load
(
jobGroup
);
...
...
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