Merge branch 'mj' into dev

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

@@ -104,11 +104,13 @@ public class MidjourneyServiceImpl implements MidjourneyService {
             param.put("dimensions", dimensions);
         }
         SubmitResult result = submit(user.getMode(),"blend", param);
-        String finalPrompt = "%s --ar %s --style raw --s 250";
-        List<String> picList = uploadBase64Pic(base64Array);
-        String pics = picList.stream().map(pic -> "<" + pic + ">").collect(Collectors.joining(" "));
         Map<String, Object> properties = result.getProperties();
-        properties.put("finalPrompt", String.format(finalPrompt, pics,dimensions.getValue()));
+        if (user.getMode() == 1) {
+            String finalPrompt = "%s --ar %s --style raw --s 250";
+            List<String> picList = uploadBase64Pic(base64Array);
+            String pics = picList.stream().map(pic -> "<" + pic + ">").collect(Collectors.joining(" "));
+            properties.put("finalPrompt", String.format(finalPrompt, pics,dimensions.getValue()));
+        }
         return saveConversation(user.getId(), user.getMode(), Long.parseLong(result.getResult()),properties,"BLEND", StringUtils.EMPTY);
     }