即梦绘画添加图片特效预览

api/handler/jimeng_handler.go

@@ -333,10 +333,6 @@ func (h *JimengHandler) Remove(c *gin.Context) {
 		resp.ERROR(c, "无权限操作")
 		return
 	}
-	if job.Status != model.JMTaskStatusFailed {
-		resp.ERROR(c, "只有失败的任务才能删除")
-		return
-	}
 
 	tx := h.DB.Begin()
 	if err := tx.Where("id = ? AND user_id = ?", jobId, user.Id).Delete(&model.JimengJob{}).Error; err != nil {
@@ -345,17 +341,20 @@ func (h *JimengHandler) Remove(c *gin.Context) {
 		return
 	}
 
-	// 退回算力
-	err = h.userService.IncreasePower(user.Id, job.Power, model.PowerLog{
-		Type:   types.PowerRefund,
-		Model:  "jimeng",
-		Remark: fmt.Sprintf("删除任务，退回%d算力", job.Power),
-	})
-	if err != nil {
-		resp.ERROR(c, "退回算力失败")
-		tx.Rollback()
-		return
+	// 失败任务删除后退回算力
+	if job.Status != model.JMTaskStatusFailed {
+		err = h.userService.IncreasePower(user.Id, job.Power, model.PowerLog{
+			Type:   types.PowerRefund,
+			Model:  "jimeng",
+			Remark: fmt.Sprintf("删除任务，退回%d算力", job.Power),
+		})
+		if err != nil {
+			resp.ERROR(c, "退回算力失败")
+			tx.Rollback()
+			return
+		}
 	}
+
 	tx.Commit()
 
 	resp.SUCCESS(c, gin.H{})

api/service/jimeng/service.go

@@ -378,7 +378,7 @@ func (s *Service) pollTaskStatus() {
 
 		for _, job := range jobs {
 			// 任务超时处理
-			if job.UpdatedAt.Before(time.Now().Add(-5 * time.Minute)) {
+			if job.UpdatedAt.Before(time.Now().Add(-10 * time.Minute)) {
 				s.handleTaskError(job.Id, "task timeout")
 				continue
 			}
@@ -391,7 +391,7 @@ func (s *Service) pollTaskStatus() {
 			})
 
 			if err != nil {
-				logger.Errorf("query jimeng task status failed: %v", err)
+				s.handleTaskError(job.Id, fmt.Sprintf("query task failed: %s", err.Error()))
 				continue
 			}
 
@@ -446,9 +446,7 @@ func (s *Service) pollTaskStatus() {
 				s.handleTaskError(job.Id, "task not found")
 
 			case model.JMTaskStatusExpired:
-				// 任务过期
-				s.handleTaskError(job.Id, "task expired")
-
+				continue
 			default:
 				logger.Warnf("unknown task status: %s", resp.Data.Status)
 			}