From d794fd010273e98148a8a02f51598f690acf1e49 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Fri, 24 Mar 2017 21:10:12 +0800 Subject: [PATCH] =?UTF-8?q?rolling=E6=97=A5=E5=BF=97=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobLogController.java | 9 ++++++ .../WEB-INF/template/joblog/logdetail.ftl | 30 ++++++------------- .../webapp/static/js/logdetail.index.1.js | 19 +++++++----- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 0d6d2dd8..193dfa41 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -118,6 +118,15 @@ public class JobLogController { try { ExecutorBiz executorBiz = (ExecutorBiz) new NetComClientProxy(ExecutorBiz.class, executorAddress).getObject(); ReturnT logResult = executorBiz.log(triggerTime, logId, fromLineNum); + + // is end + if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) { + XxlJobLog jobLog = xxlJobLogDao.load(logId); + if (jobLog.getHandleCode() > 0) { + logResult.getContent().setEnd(true); + } + } + return logResult; } catch (Exception e) { e.printStackTrace(); diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl index 7bac68f4..7002d7b0 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl @@ -4,26 +4,10 @@ 任务调度中心 <#import "/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> - - + -
+
-
- 

-            
  • 
+    
    
+        
    +            
    
+            
  •
    + + + <@netCommon.commonScript />