ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

执行器优雅停机优化，修复任务线程中断未join导致回调丢失的问题；

This commit is contained in:
xuxueli 2020-03-29 00:23:51 +08:00
parent 9f5267c246
commit 881fff7a87
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/XXL-JOB官方文档.md
View File

@ -1723,7 +1723,6 @@ public ReturnT<String> execute(String param) {
- 17、[迭代中]任务执行一次的时候指定IP； - 17、[迭代中]任务执行一次的时候指定IP；
- 18、[迭代中]任务日志支持单个清理和状态转移，方便触发子任务； - 18、[迭代中]任务日志支持单个清理和状态转移，方便触发子任务；
- 19、[迭代中]任务结果丢失处理：针对长期处于运行中的任务（设置过期时间时，运行超过"过期时间+1min"；未设置超时时间时，运行超过"30min"），主动检测该执行器是否在线，如果不在线主动标记失败； - 19、[迭代中]任务结果丢失处理：针对长期处于运行中的任务（设置过期时间时，运行超过"过期时间+1min"；未设置超时时间时，运行超过"30min"），主动检测该执行器是否在线，如果不在线主动标记失败；
- 20、[迭代中]优雅停机回调丢失问题修复；
### TODO LIST ### TODO LIST

5
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java
View File

@ -2,7 +2,7 @@ package com.xxl.job.admin.controller.interceptor;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -12,7 +12,7 @@ import javax.annotation.Resource;
* @author xuxueli 2018-04-02 20:48:20 * @author xuxueli 2018-04-02 20:48:20
*/ */
@Configuration @Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter { public class WebMvcConfig implements WebMvcConfigurer {
@Resource @Resource
private PermissionInterceptor permissionInterceptor; private PermissionInterceptor permissionInterceptor;
@ -23,7 +23,6 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(permissionInterceptor).addPathPatterns("/**"); registry.addInterceptor(permissionInterceptor).addPathPatterns("/**");
registry.addInterceptor(cookieInterceptor).addPathPatterns("/**"); registry.addInterceptor(cookieInterceptor).addPathPatterns("/**");
super.addInterceptors(registry);
} }
} }