|
|
@@ -34,6 +34,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import net.coobird.thumbnailator.Thumbnails;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -294,7 +295,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
|
|
|
JSONArray jsonArray = listByIds(List.of(taskId));
|
|
|
if (!jsonArray.isEmpty()){
|
|
|
JSONObject jsonObject = JSONUtil.parseObj(Jsons.toJson(jsonArray.get(0)));
|
|
|
- if (!"MODAL".equals(jsonObject.getStr("status"))){
|
|
|
+ if (!"MODAL".equals(jsonObject.getStr("status")) && !jsonObject.getStr("action").contains("ACTION")){
|
|
|
log.error("task {} status is not modal", taskId);
|
|
|
if (System.currentTimeMillis() - jsonObject.getLong("submitTime") > 60 * 1000L) {
|
|
|
throw BusinessRuntimeException.getInstance("任务超时,请稍后再试");
|