From 0392c333ed3d987cb2ab3dac4e1a972cff405f21 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 25 四月 2024 17:42:08 +0800
Subject: [PATCH] 1. 新增后台任务关联模块 2. 新增自动评分后台任务; 3. 修复部分bug

---
 src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
index 953eac3..66a9315 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
@@ -1,6 +1,5 @@
 package cn.flightfeather.supervision.common.executor
 
-import org.springframework.scheduling.annotation.Async
 import java.time.LocalDateTime
 import java.util.concurrent.Future
 
@@ -22,8 +21,13 @@
     }
 
     fun execute() {
-        val res = task()
-        if (res) success() else fail()
+        try {
+            val res = task()
+            if (res) success() else fail()
+        } catch (e: Exception) {
+            fail()
+            taskStatus.extra = e.message
+        }
     }
 
     fun success() {
@@ -39,9 +43,9 @@
     fun shutdown() {
         if (future?.isCancelled == false && !future!!.isDone) {
             future!!.cancel(true)
-            taskStatus.status = TaskStatus.SHUTDOWN
-            complete()
         }
+        taskStatus.status = TaskStatus.SHUTDOWN
+        complete()
     }
 
     fun complete() {

--
Gitblit v1.9.3