diff --git a/README.md b/README.md index 6cead382..5fb086de 100644 --- a/README.md +++ b/README.md @@ -767,12 +767,13 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 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 193dfa41..0af0f5dc 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 @@ public class JobLogController { 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/logdetail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl similarity index 93% rename from xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl rename to xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl index d2599d57..f51845db 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/joblog.detail.ftl @@ -1,71 +1,71 @@ - - - - 任务调度中心 -<#import "/common/common.macro.ftl" as netCommon> -<@netCommon.commonStyle /> - - - - -
- -
- -
- -
- 
-            

-            
  • 
-            
    
-
    -
    - -
    - -<@netCommon.commonScript /> - - - - + + + + 任务调度中心 +<#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/logdetail.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/js/logdetail.index.1.js rename to xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js