diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST 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 193dfa4..0af0f5d 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 @@ -109,7 +109,7 @@ model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); - return "joblog/logdetail"; + return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST 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 193dfa4..0af0f5d 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 @@ -109,7 +109,7 @@ model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); - return "joblog/logdetail"; + return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl new file mode 100644 index 0000000..f51845d --- /dev/null +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl @@ -0,0 +1,71 @@ + + + + 任务调度中心 +<#import "/common/common.macro.ftl" as netCommon> +<@netCommon.commonStyle /> + + + + +
+ +
+ +
+ +
+ 
+            

+            
  • 
+            
    
+
    +
    + +
    + +<@netCommon.commonScript /> + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST 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 193dfa4..0af0f5d 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 @@ -109,7 +109,7 @@ model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); - return "joblog/logdetail"; + return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl new file mode 100644 index 0000000..f51845d --- /dev/null +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl @@ -0,0 +1,71 @@ + + + + 任务调度中心 +<#import "/common/common.macro.ftl" as netCommon> +<@netCommon.commonStyle /> + + + + +
    + +
    + +
    + +
    + 
    +            
    
+            
  • 
+            
    
+
    +
    + +
    + +<@netCommon.commonScript /> + + + + + \ No newline at end of file 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 deleted file mode 100644 index d2599d5..0000000 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl +++ /dev/null @@ -1,71 +0,0 @@ - - - - 任务调度中心 -<#import "/common/common.macro.ftl" as netCommon> -<@netCommon.commonStyle /> - - - - -
    - -
    - -
    - -
    - 
    -            
    
-            
  • 
-            
    
-
    -
    - -
    - -<@netCommon.commonScript /> - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST 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 193dfa4..0af0f5d 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 @@ -109,7 +109,7 @@ model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); - return "joblog/logdetail"; + return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl new file mode 100644 index 0000000..f51845d --- /dev/null +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl @@ -0,0 +1,71 @@ + + + + 任务调度中心 +<#import "/common/common.macro.ftl" as netCommon> +<@netCommon.commonStyle /> + + + + +
    + +
    + +
    + +
    + 
    +            
    
+            
  • 
+            
    
+
    +
    + +
    + +<@netCommon.commonScript /> + + + + + \ No newline at end of file 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 deleted file mode 100644 index d2599d5..0000000 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl +++ /dev/null @@ -1,71 +0,0 @@ - - - - 任务调度中心 -<#import "/common/common.macro.ftl" as netCommon> -<@netCommon.commonStyle /> - - - - -
    - -
    - -
    - -
    - 
    -            
    
-            
  • 
-            
    
-
    -
    - -
    - -<@netCommon.commonScript /> - - - - - \ No newline at end of file diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js new file mode 100644 index 0000000..2864a1f --- /dev/null +++ b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js @@ -0,0 +1,89 @@ +$(function() { + + // trigger fail, end + if (triggerCode != 200) { + $('#logConsoleRunning').hide(); + $('#logConsole').append('任务发起调度失败，无法查看执行日志'); + return; + } + + // pull log + var fromLineNum = 0; // [from, to] + var pullFailCount = 0; + function pullLog() { + // pullFailCount, max=20 + if (pullFailCount++ > 20) { + logRunStop('终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志'); + return; + } + + // load + console.log("pullLog, fromLineNum:" + fromLineNum); + + $.ajax({ + type : 'POST', + async: false, // sync, make log ordered + url : base_url + '/joblog/logDetailCat', + data : { + "executorAddress":executorAddress, + "triggerTime":triggerTime, + "logId":logId, + "fromLineNum":fromLineNum + }, + dataType : "json", + success : function(data){ + + if (data.code == 200) { + if (!data.content) { + console.log('pullLog fail'); + return; + } + if (fromLineNum != data.content.fromLineNum) { + console.log('pullLog fromLineNum not match'); + return; + } + if (fromLineNum > data.content.toLineNum ) { + console.log('pullLog already line-end'); + // valid end + if (data.content.end) { + logRunStop('[Rolling Log Finish]'); + return; + } + return; + } + + // append + fromLineNum = data.content.toLineNum + 1; + $('#logConsole').append(data.content.logContent); + pullFailCount = 0; + + // scroll to bottom + scrollTo(0, document.body.scrollHeight); + + } else { + console.log('pullLog fail:'+data.msg); + } + } + }); + } + + // pull first page + pullLog(); + + // handler already callback, end + if (handleCode > 0) { + logRunStop('[Load Log Finish]'); + return; + } + + // round until end + var logRun = setInterval(function () { + pullLog() + }, 3000); + function logRunStop(content){ + $('#logConsoleRunning').hide(); + logRun = window.clearInterval(logRun); + $('#logConsole').append(content); + } + +}); diff --git a/README.md b/README.md index 6cead38..5fb086d 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ - 9、GLUE模式任务实例更新逻辑优化，原根据超时时间更新改为根据版本号更新，源码变动版本号加一； #### 6.12 版本 V1.6.1 特性 (Coding) -- 1、通讯协议二进制据增强校验，拦截非正常请求； -- 2、数据库地址配置优化； -- 3、WebIDE交互重构； -- 4、前端部分组件优化； -- 5、增强权限校验，采用动态登录TOKEN； -- 5、rolling日志，日志界面风格同glue任务编辑器； +- 1、Rolling日志； +- 2、WebIDE交互重构； +- 3、通讯增强校验，有效过滤非正常请求； +- 4、权限增强校验，采用动态登录TOKEN（推荐接入内部SSO）； +- 5、数据库配置优化，解决乱码问题； + + #### TODO LIST 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 193dfa4..0af0f5d 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 @@ -109,7 +109,7 @@ model.addAttribute("executorAddress", jobLog.getExecutorAddress()); model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime()); model.addAttribute("logId", jobLog.getId()); - return "joblog/logdetail"; + return "joblog/joblog.detail"; } @RequestMapping("/logDetailCat") diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl new file mode 100644 index 0000000..f51845d --- /dev/null +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl @@ -0,0 +1,71 @@ + + + + 任务调度中心 +<#import "/common/common.macro.ftl" as netCommon> +<@netCommon.commonStyle /> + + + + +
    + +
    + +
    + +
    + 
    +            
    
+            
  • 
+            
    
+
    +
    + +
    + +<@netCommon.commonScript /> + + + + + \ No newline at end of file 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 deleted file mode 100644 index d2599d5..0000000 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl +++ /dev/null @@ -1,71 +0,0 @@ - - - - 任务调度中心 -<#import "/common/common.macro.ftl" as netCommon> -<@netCommon.commonStyle /> - - - - -
    - -
    - -
    - -
    - 
    -            
    
-            
  • 
-            
    
-
    -
    - -
    - -<@netCommon.commonScript /> - - - - - \ No newline at end of file diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js new file mode 100644 index 0000000..2864a1f --- /dev/null +++ b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js @@ -0,0 +1,89 @@ +$(function() { + + // trigger fail, end + if (triggerCode != 200) { + $('#logConsoleRunning').hide(); + $('#logConsole').append('任务发起调度失败，无法查看执行日志'); + return; + } + + // pull log + var fromLineNum = 0; // [from, to] + var pullFailCount = 0; + function pullLog() { + // pullFailCount, max=20 + if (pullFailCount++ > 20) { + logRunStop('终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志'); + return; + } + + // load + console.log("pullLog, fromLineNum:" + fromLineNum); + + $.ajax({ + type : 'POST', + async: false, // sync, make log ordered + url : base_url + '/joblog/logDetailCat', + data : { + "executorAddress":executorAddress, + "triggerTime":triggerTime, + "logId":logId, + "fromLineNum":fromLineNum + }, + dataType : "json", + success : function(data){ + + if (data.code == 200) { + if (!data.content) { + console.log('pullLog fail'); + return; + } + if (fromLineNum != data.content.fromLineNum) { + console.log('pullLog fromLineNum not match'); + return; + } + if (fromLineNum > data.content.toLineNum ) { + console.log('pullLog already line-end'); + // valid end + if (data.content.end) { + logRunStop('[Rolling Log Finish]'); + return; + } + return; + } + + // append + fromLineNum = data.content.toLineNum + 1; + $('#logConsole').append(data.content.logContent); + pullFailCount = 0; + + // scroll to bottom + scrollTo(0, document.body.scrollHeight); + + } else { + console.log('pullLog fail:'+data.msg); + } + } + }); + } + + // pull first page + pullLog(); + + // handler already callback, end + if (handleCode > 0) { + logRunStop('[Load Log Finish]'); + return; + } + + // round until end + var logRun = setInterval(function () { + pullLog() + }, 3000); + function logRunStop(content){ + $('#logConsoleRunning').hide(); + logRun = window.clearInterval(logRun); + $('#logConsole').append(content); + } + +}); diff --git a/xxl-job-admin/src/main/webapp/static/js/logdetail.index.1.js b/xxl-job-admin/src/main/webapp/static/js/logdetail.index.1.js deleted file mode 100644 index 2864a1f..0000000 --- a/xxl-job-admin/src/main/webapp/static/js/logdetail.index.1.js +++ /dev/null @@ -1,89 +0,0 @@ -$(function() { - - // trigger fail, end - if (triggerCode != 200) { - $('#logConsoleRunning').hide(); - $('#logConsole').append('任务发起调度失败，无法查看执行日志'); - return; - } - - // pull log - var fromLineNum = 0; // [from, to] - var pullFailCount = 0; - function pullLog() { - // pullFailCount, max=20 - if (pullFailCount++ > 20) { - logRunStop('终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志'); - return; - } - - // load - console.log("pullLog, fromLineNum:" + fromLineNum); - - $.ajax({ - type : 'POST', - async: false, // sync, make log ordered - url : base_url + '/joblog/logDetailCat', - data : { - "executorAddress":executorAddress, - "triggerTime":triggerTime, - "logId":logId, - "fromLineNum":fromLineNum - }, - dataType : "json", - success : function(data){ - - if (data.code == 200) { - if (!data.content) { - console.log('pullLog fail'); - return; - } - if (fromLineNum != data.content.fromLineNum) { - console.log('pullLog fromLineNum not match'); - return; - } - if (fromLineNum > data.content.toLineNum ) { - console.log('pullLog already line-end'); - // valid end - if (data.content.end) { - logRunStop('[Rolling Log Finish]'); - return; - } - return; - } - - // append - fromLineNum = data.content.toLineNum + 1; - $('#logConsole').append(data.content.logContent); - pullFailCount = 0; - - // scroll to bottom - scrollTo(0, document.body.scrollHeight); - - } else { - console.log('pullLog fail:'+data.msg); - } - } - }); - } - - // pull first page - pullLog(); - - // handler already callback, end - if (handleCode > 0) { - logRunStop('[Load Log Finish]'); - return; - } - - // round until end - var logRun = setInterval(function () { - pullLog() - }, 3000); - function logRunStop(content){ - $('#logConsoleRunning').hide(); - logRun = window.clearInterval(logRun); - $('#logConsole').append(content); - } - -});