多个项目依赖升级至较新稳定版本,如netty、spring、springboot等;

master
xuxueli 4 years ago
parent f5155e9d41
commit 97bce9f0c6
  1. 3
      doc/XXL-JOB官方文档.md
  2. 8
      pom.xml
  3. 9
      xxl-job-admin/src/main/resources/static/js/joblog.index.1.js

@ -1988,7 +1988,8 @@ data: post-data
- 1、Cron编辑器增强:Cron编辑器修改cron时可实时查看最近运行时间;
- 2、Cron编辑器问题修复:修复小概率情况下cron单个字段修改时导致其他字段被重置问题;
- 3、邮箱告警配置优化:将"spring.mail.from"与"spring.mail.username"属性拆分开,更加灵活的支持一些无密码邮箱服务;
- 4、[迭代中] 新增任务属性 "XxlJobContent" ,统一维护任务上下文信息,方便运行时存取任务相关信息;
- 4、多个项目依赖升级至较新稳定版本,如netty、spring、springboot等;
- 5、[迭代中] 新增任务属性 "XxlJobContent" ,统一维护任务上下文信息,方便运行时存取任务相关信息;
### TODO LIST

@ -24,14 +24,14 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.test.skip>true</maven.test.skip>
<netty-all.version>4.1.48.Final</netty-all.version>
<netty-all.version>4.1.50.Final</netty-all.version>
<gson.version>2.8.6</gson.version>
<spring.version>5.2.5.RELEASE</spring.version>
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<spring.version>5.2.6.RELEASE</spring.version>
<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
<mybatis-spring-boot-starter.version>2.1.2</mybatis-spring-boot-starter.version>
<mysql-connector-java.version>8.0.19</mysql-connector-java.version>
<mysql-connector-java.version>8.0.20</mysql-connector-java.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<junit.version>4.13</junit.version>

@ -187,6 +187,12 @@ $(function() {
}*/
//return temp;
var logKillDiv = '';
if(row.handleCode == 0){
logKillDiv = ' <li class="divider"></li>\n' +
' <li><a href="javascript:void(0);" class="logKill" _id="'+ row.id +'" >'+ I18n.joblog_kill_log +'</a></li>\n';
}
var html = '<div class="btn-group">\n' +
' <button type="button" class="btn btn-primary btn-sm">'+ I18n.system_opt +'</button>\n' +
' <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">\n' +
@ -195,8 +201,7 @@ $(function() {
' </button>\n' +
' <ul class="dropdown-menu" role="menu" _id="'+ row.id +'" >\n' +
' <li><a href="javascript:void(0);" class="logDetail" _id="'+ row.id +'" >'+ I18n.joblog_rolling_log +'</a></li>\n' +
' <li class="divider"></li>\n' +
' <li><a href="javascript:void(0);" class="logKill" _id="'+ row.id +'" >'+ I18n.joblog_kill_log +'</a></li>\n' +
logKillDiv +
' </ul>\n' +
' </div>';

Loading…
Cancel
Save