Merge branch 'release/3.0' into dev/dev_xp
# Conflicts: # src/main/java/com/ai/da/mapper/primary/DesignMapper.java # src/main/resources/mapper/primary/DesignMapper.xml
This commit is contained in:
@@ -58,7 +58,7 @@ public class AsyncCallerUtil {
|
||||
return null;
|
||||
} catch (InterruptedException | ExecutionException | BusinessException e) {
|
||||
// 处理异常
|
||||
log.error("发生错误 : " + e);
|
||||
log.error("发生错误 : " + e, e);
|
||||
// 取消定时任务
|
||||
assert timeoutTask != null;
|
||||
timeoutTask.cancel(true);
|
||||
|
||||
Reference in New Issue
Block a user