fix

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

@@ -203,11 +203,16 @@ public class MidjourneyServiceImpl implements MidjourneyService {
             MidjourneyUserConversation dbConversation = conversationMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUserConversation.class).eq(MidjourneyUserConversation::getTaskId, conversation.getTaskId())
                     .eq(MidjourneyUserConversation::getUserId, conversation.getUserId()).last("limit 1"));
             if (dbConversation != null) {
-                if (StringUtils.isNotBlank(conversation.getImageUrl())) {
-                    //conversation.setImageUrl(uploadPic(conversation.getImageUrl(), "conversation"+dbConversation.getId()));
+                try {
+                    if (StringUtils.isNotBlank(conversation.getImageUrl())) {
+                        conversation.setImageUrl(uploadPic(conversation.getImageUrl(), "conversation"+dbConversation.getId()));
+                    }
+                } catch (IOException e) {
+                    log.error("上传图片失败",e);
+                }finally {
+                    conversation.setId(dbConversation.getId());
+                    conversationMapper.updateById(conversation);
                 }
-                conversation.setId(dbConversation.getId());
-                conversationMapper.updateById(conversation);
             }
         }
     }

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

@@ -125,8 +125,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> submitImagine(@RequestBody SubmitImagineDTO submitImagineDTO)throws Exception{
         log.info("提交Imagine任务，提示：{}，base64数组长度：{}",submitImagineDTO.getPrompt(),submitImagineDTO.getBase64Array());
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitImagine(user, submitImagineDTO.getPrompt(), submitImagineDTO.getBase64Array());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitImagine(user,submitImagineDTO.getPrompt(),submitImagineDTO.getBase64Array()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }
 
     /**
@@ -136,8 +137,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> submitDescribe(@RequestBody SubmitDescribeDTO submitDescribeDTO)throws Exception{
         log.info("提交Describe任务");
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitDescribe(user, submitDescribeDTO.getBase64());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitDescribe(user,submitDescribeDTO.getBase64()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }
 
     /**
@@ -147,8 +149,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> submitBlend(@RequestBody SubmitBlendDTO submitBlendDTO) throws Exception{
         log.info("提交Blend任务 dimensions:{}，base64数组长度：{}", submitBlendDTO.getDimensions(), submitBlendDTO.getBase64Array().size());
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitBlend(user, submitBlendDTO.getDimensions(), submitBlendDTO.getBase64Array());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitBlend(user, submitBlendDTO.getDimensions(), submitBlendDTO.getBase64Array()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }
 
     /**
@@ -158,8 +161,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> submitModal(@RequestBody SubmitModalDTO submitModalDTO) throws Exception{
         log.info("提交Modal任务，taskId:{},提示：{}，base64数组长度：{}",submitModalDTO.getTaskId(),submitModalDTO.getPrompt(),submitModalDTO.getMaskBase64());
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitModal(user, submitModalDTO.getTaskId(), submitModalDTO.getPrompt(), submitModalDTO.getMaskBase64());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitModal(user,submitModalDTO.getTaskId(),submitModalDTO.getPrompt(),submitModalDTO.getMaskBase64()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }
 
     /**
@@ -169,8 +173,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> submitShorten(@RequestBody SubmitShortenDTO submitShortenDTO) throws Exception {
         log.info("提交Shorten任务 提示词:{}",submitShortenDTO.getPrompt());
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitShorten(user, submitShortenDTO.getPrompt());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitShorten(user,submitShortenDTO.getPrompt()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }
 
     /**
@@ -180,8 +185,9 @@ public class MidjourneyController {
     public Result<MidjourneyUserConversation> action(@RequestBody SubmitActionDTO actionDTO) throws Exception {
         log.info("任务id:{},执行动作：{}",actionDTO.getTaskId(),actionDTO.getCustomId());
         MidjourneyUser user = getUser();
+        MidjourneyUserConversation conversation = midjourneyService.submitAction(user, actionDTO.getTaskId(), actionDTO.getCustomId());
         checkUserLimit(user);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.submitAction(user,actionDTO.getTaskId(), actionDTO.getCustomId()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(conversation);
     }