|
@@ -25,6 +25,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
+import java.util.concurrent.TimeoutException;
|
|
|
|
|
|
@ConfigurationProperties("task")
|
|
|
@Data
|
|
@@ -61,6 +62,10 @@ public class UpdateTask {
|
|
|
XxlJobHelper.log("线程中断: {}", e.getMessage(), e);
|
|
|
Thread.currentThread().interrupt();
|
|
|
throw new RuntimeException(e);
|
|
|
+ } catch (TimeoutException e) {
|
|
|
+ log.error("执行超时: {}", e.getMessage(), e);
|
|
|
+ XxlJobHelper.log("执行超时: {}", e.getMessage(), e);
|
|
|
+ XxlJobHelper.handleFail(e.getMessage());
|
|
|
} catch (Exception e) {
|
|
|
log.error("发生异常了: {}", e.getMessage(), e);
|
|
|
XxlJobHelper.log("发生异常了: {}", e.getMessage(), e);
|