fix

midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -418,6 +418,17 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 .put("customId", customId)
                 .build();
         SubmitResult result = submit(user,mode,"action", conversation.getInstanceId(),param, apiChannelId);
+        Map<String, Object> properties = result.getProperties();
+        String modeStr;
+        String mjVersionStatusKey;
+        if (mode == 1){
+            modeStr = "(fast)";
+            mjVersionStatusKey = "v6-fast-upscaler";
+        }else {
+            modeStr = "(relaxed)";
+            mjVersionStatusKey = "v6-relax-upscaler";
+        }
+        properties.put("messageContent","**"+conversation.getPrompt()+"** - <@mj>" + modeStr);
         if (result.getCode() == 21) {
             if (mode == 2 && modalFlag.get()){
                 SubmitResult modal = submitModal(user, mode,Long.valueOf(result.getResult()), conversation.getPrompt(), null);
@@ -427,23 +438,14 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 // 以上操作有弹窗确认，恢复次数
                 recoverUserLimit(user.getId(), mode,num);
             }
-        }else {
+        } else if (result.getCode() == 23) {
+            return result;
+        } else {
             //syncUser(user.getId(), user.getMode(),num);
             if (!customId.contains("upsample") && mode == 2) {
                 redisService.hincr(RedisService.key.MIDJOURNEY_ACCOUNT.getName(), result.getInstanceId().toString(), 1.0);
             }
         }
-        Map<String, Object> properties = result.getProperties();
-        String modeStr;
-        String mjVersionStatusKey;
-        if (mode == 1){
-            modeStr = "(fast)";
-            mjVersionStatusKey = "v6-fast-upscaler";
-        }else {
-            modeStr = "(relaxed)";
-            mjVersionStatusKey = "v6-relax-upscaler";
-        }
-        properties.put("messageContent","**"+conversation.getPrompt()+"** - <@mj>" + modeStr);
         MjVersionStatus mjVersionStatus = MJ_VERSION_STATUS_MAP.get(mjVersionStatusKey);
         properties.put("estimateTime", mjVersionStatus == null ? null : System.currentTimeMillis() + mjVersionStatus.getMillisecond());
         properties.put("finalPrompt",conversation.getPrompt());
@@ -488,6 +490,9 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         }
         SubmitResult submitResult = submit2MjProxy(url, token, mode, action, param);
         int code = submitResult.getCode();
+        if (code == 23){
+            return submitResult;
+        }
         if (code != 1 && code != 21 && code != 22) {
             submitResult = checkResult(user, mode, action, instanceId, param, code, accountWithMinUsage, submitResult);
         }

midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -320,7 +320,7 @@ public class MidjourneyController {
         MidjourneyUser user = getUser();
         MidjourneyUserConversation midjourneyUserConversation = conversationMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUserConversation.class).eq(MidjourneyUserConversation::getTaskId, actionDTO.getTaskId()).last("limit 1"));
         if (midjourneyUserConversation == null) {
-            throw BusinessRuntimeException.getInstance("关联任务不存在或已失效");
+            throw BusinessRuntimeException.getInstance("关联任务不存在或已失效 taskId:{}", actionDTO.getTaskId().toString());
         }
         Integer mode = midjourneyUserConversation.getMode();
         Long apiChannelId = midjourneyUserConversation.getApiChannelId();