优化任务管理

internal/apps/admin/task/routers.go

@@ -187,7 +187,7 @@ func RetryTask(c *gin.Context) {
 		switch {
 		case strings.Contains(errMsg, "不存在"):
 			c.JSON(http.StatusNotFound, util.Err(errMsg))
-		case strings.Contains(errMsg, "只有失败") || strings.Contains(errMsg, "不支持重试") || strings.Contains(errMsg, "已达到最大重试"):
+		case strings.Contains(errMsg, "只有非进行中") || strings.Contains(errMsg, "不支持重试") || strings.Contains(errMsg, "已达到最大重试"):
 			c.JSON(http.StatusBadRequest, util.Err(errMsg))
 		default:
 			c.JSON(http.StatusInternalServerError, util.Err(fmt.Sprintf("%s: %v", TaskRetryFailed, err)))

internal/task/errs.go

@@ -8,7 +8,7 @@ const (
 	errCreateTaskExecutionFailed  = "创建任务执行记录失败: %w"
 	errTaskEnqueueFailed          = "任务入队失败: %w"
 	errTaskExecutionNotFound      = "任务执行记录不存在: %w"
-	errRetryOnlyFailedTask        = "只有失败的任务才能重试，当前状态: %s"
+	errRetryOnlyFinishedTask      = "只有非进行中的任务才能重试，当前状态: %s"
 	errTaskNotRetryable           = "该任务不支持重试"
 	errTaskMaxRetryExceeded       = "已达到最大重试次数 %d"
 	errCreateRetryExecutionFailed = "创建重试任务执行记录失败: %w"

internal/task/executor.go

@@ -138,8 +138,8 @@ func RetryTask(ctx context.Context, id uint64) (string, error) {
 		return "", fmt.Errorf(errTaskExecutionNotFound, err)
 	}
 
-	if execution.Status != model.TaskExecutionStatusFailed {
-		return "", fmt.Errorf(errRetryOnlyFailedTask, execution.Status)
+	if execution.Status == model.TaskExecutionStatusPending || execution.Status == model.TaskExecutionStatusRunning {
+		return "", fmt.Errorf(errRetryOnlyFinishedTask, execution.Status)
 	}
 
 	if !execution.Retryable {
@@ -299,6 +299,7 @@ func completeTaskExecution(ctx context.Context, execution *model.TaskExecution,
 		span.RecordError(execErr)
 	} else {
 		execution.Status = model.TaskExecutionStatusSucceeded
+		execution.ErrorMessage = "" // 清除历史重试失败遗留的错误信息
 		if result != nil {
 			execution.Result = result.Message
 			if result.Detail != "" {