zwhui 1 rok pred
rodič
commit
7e8e75a1ce

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 7 - 1
midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java


+ 6 - 2
midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -699,7 +699,7 @@ public class MidjourneyController {
     @PostMapping("/queue")
     public Result<MidjourneyUserQueueView> saveQueue(@Validated @RequestBody SubmitImagineDTO submitImagineDTO) throws Exception {
         log.info("提交Imagine任务,提示:{}",submitImagineDTO.getPrompt());
-        MidjourneyUser user = getUserSimple();
+        MidjourneyUser user = getUser();
         Integer mode = submitImagineDTO.getMode();
         if (mode != 2){
             throw BusinessRuntimeException.getInstance("网络异常!");
@@ -708,7 +708,11 @@ public class MidjourneyController {
         if (relax != null && relax <= 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
         }
-
+        MidjourneyUserSettings settings = user.getSettings();
+        if(settings != null){
+            String prompt = settings.getPrompt();
+            submitImagineDTO.setPrompt(appendDefaults(submitImagineDTO.getPrompt(), prompt));
+        }
 
         return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.queueLimit(user.getId(),submitImagineDTO));
     }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov