Merge branch 'mj_modal' into pre

netflix-service/src/main/java/com/cyksj/service/midjourney/MidjourneyService.java

@@ -25,7 +25,7 @@ public interface MidjourneyService {
 
     List<MidjourneyUserConversation> listConversationByIds(Integer mode, List<Long> ids) throws Exception;
 
-    SubmitResult submitAction(MidjourneyUser user, Long taskId, String customId, Long num, String botType) throws Exception;
+    Object submitAction(MidjourneyUser user, Long taskId, String customId, Long num, String botType) throws Exception;
 
     MidjourneyUserConversation cancelConversation(MidjourneyUser user, Long id);
 

netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -205,7 +205,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
 //    }
 
     @Override
-    public SubmitResult submitAction(MidjourneyUser user, Long taskId, String customId, Long num, String botType) throws Exception {
+    public Object submitAction(MidjourneyUser user, Long taskId, String customId, Long num, String botType) throws Exception {
         MidjourneyUserConversation conversation = conversationMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUserConversation.class).eq(MidjourneyUserConversation::getTaskId, taskId).last("limit 1"));
         if (conversation == null) {
             throw BusinessRuntimeException.getInstance("关联任务不存在或已失效");
@@ -239,15 +239,13 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 .build();
         SubmitResult result = submit(user.getMode(),"action", conversation.getInstanceId(),param);
         if (result.getCode() == 21) {
-            // 以上操作有弹窗确认，恢复次数
-            recoverUserLimit(user.getId(), user.getMode(),num);
             if (user.getMode() == 2 && modalFlag.get()){
-                SubmitModalDTO modalParam = new SubmitModalDTO();
-                modalParam.setPrompt(conversation.getPrompt() + " --v 6");
-                modalParam.setTaskId(Long.valueOf(result.getResult()));
-                String modal = HttpUtil.post(midjourneyHost + (EnvCommonService.active.equals(envCommonService.getEnv()) ? "/8081":"/8082") + "/applets/midjourney/submit/modal", Jsons.toJson(modalParam));
-                log.info("modal:{}", modal);
-                return result;
+                MidjourneyUserConversation modal = submitModal(user, Long.valueOf(result.getResult()), conversation.getPrompt() + " --v 6", null);
+                log.info("action-modal:{}", modal);
+                return modal;
+            }else {
+                // 以上操作有弹窗确认，恢复次数
+                recoverUserLimit(user.getId(), user.getMode(),num);
             }
         }else {
             //syncUser(user.getId(), user.getMode(),num);

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -298,7 +298,7 @@ public class MidjourneyController {
      */
     @PostMapping("/submit/action")
     @NoSubmit
-    public Result<SubmitResult> action(@RequestBody SubmitActionDTO actionDTO) {
+    public Result<Object> action(@RequestBody SubmitActionDTO actionDTO) {
         log.info("任务id:{},执行动作：{}",actionDTO.getTaskId(),actionDTO.getCustomId());
         MidjourneyUser user = getUser();
         Long num = 0L;
@@ -308,7 +308,7 @@ public class MidjourneyController {
                 throw BusinessRuntimeException.getInstance("次数已用完");
             }
         }
-        SubmitResult conversation;
+        Object conversation;
         try {
             conversation = midjourneyService.submitAction(user, actionDTO.getTaskId(), actionDTO.getCustomId(),num, actionDTO.getBotType());
         } catch (Exception e) {