ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、支持在线查看，执行器详细日志； 

2、支持远程任务执行终止；
This commit is contained in:
xueli.xue 2016-03-12 22:50:00 +08:00
parent 39470eabbd 3a4df20e73
commit 99cc66cb02
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -18,6 +18,7 @@ git.osc地址：http://git.oschina.net/xuxueli0323/xxl-job
8、支持自定义参数； 8、支持自定义参数；
9、支持任务失败次数超阈值邮件报警； 9、支持任务失败次数超阈值邮件报警；
10、支持在线查看，执行器详细日志； 10、支持在线查看，执行器详细日志；
11、支持远程任务执行终止；
# 新版本 V1.2.x，新特性 # 新版本 V1.2.x，新特性
1、支持任务分组； 1、支持任务分组；

4
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View File

@ -196,7 +196,11 @@ $(function() {
ComConfirm.show("确认主动终止任务?", function(){ ComConfirm.show("确认主动终止任务?", function(){
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
<<<<<<< HEAD
url : base_url + 'joblog/logKill', url : base_url + 'joblog/logKill',
=======
url : base_url + 'joblog/ferrariJobKill',
>>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
data : {"id":_id}, data : {"id":_id},
dataType : "json", dataType : "json",
success : function(data){ success : function(data){

4
xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java
View File

@ -24,7 +24,11 @@ public class DemoJobHandler extends IJobHandler {
@Override @Override
public JobHandleStatus handle(String... params) throws Exception { public JobHandleStatus handle(String... params) throws Exception {
logger.info(" ... params:" + params); logger.info(" ... params:" + params);
<<<<<<< HEAD
for (int i = 0; i < 60; i++) { for (int i = 0; i < 60; i++) {
=======
for (int i = 0; i < 10; i++) {
>>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
logger.info("handler run:{}", i); logger.info("handler run:{}", i);
} }