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

This commit is contained in:
xuxueli 2020-05-21 21:08:06 +08:00
parent f5155e9d41
commit 97bce9f0c6
3 changed files with 13 additions and 7 deletions

View File

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

View File

@ -24,14 +24,14 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<maven.test.skip>true</maven.test.skip> <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> <gson.version>2.8.6</gson.version>
<spring.version>5.2.5.RELEASE</spring.version> <spring.version>5.2.6.RELEASE</spring.version>
<spring-boot.version>2.2.6.RELEASE</spring-boot.version> <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
<mybatis-spring-boot-starter.version>2.1.2</mybatis-spring-boot-starter.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> <slf4j-api.version>1.7.30</slf4j-api.version>
<junit.version>4.13</junit.version> <junit.version>4.13</junit.version>

View File

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