浏览代码

fix setting

zwhui 2 年之前
父节点
当前提交
2e4ab7cabd

+ 1 - 2
midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -138,7 +138,6 @@ public class MidjourneyServiceImpl implements MidjourneyService {
             midjourneyUserSettings.setSettings(SETTINGS);
             midjourneyUserSettings.setPrompt(PROMPT);
             midjourneyUserSettings.setUserId(midjourneyUser.getId());
-            midjourneyUserSettingsService.save(midjourneyUserSettings);
         }
         midjourneyUser.setSettings(midjourneyUserSettings);
         return midjourneyUser;
@@ -853,7 +852,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         conversation.setTaskId(jsons.getLong("id"));
         JSONObject jsonObject = new JSONObject(conversation.getProperties());
         if ("SUBMITTED".equals(conversation.getStatus())){
-            jsonObject.set("messageContent","**"+conversation.getPrompt()+"** - <@mj>" + (conversation.getMode() == 1 ? "(fast)" : "(relax)"));
+            jsonObject.set("messageContent","**"+conversation.getPrompt()+"** - <@mj>");
             conversation.setProperties(jsonObject.toString());
         }
         if (StringUtil.isNotBlank(conversation.getImageUrl())) {

+ 13 - 1
midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -74,6 +74,10 @@ public class MidjourneyController {
 
     private final MidjourneyUserSettingsService midjourneyUserSettingsService;
 
+    private static final String PROMPT = "--v 6 ";
+    private static final String SETTINGS = "{\"version\":\"--v 6\",\"remix\":false,\"raw\":false,\"variation\":\"HIGH\",\"mode\":\"relax\",\"stylize\":\"MED\"}";
+
+
     public MidjourneyUser getUser(){
         String userToken = request.getHeader("user-token");
        return midjourneyService.getUser(userToken);
@@ -483,7 +487,15 @@ public class MidjourneyController {
     public Result<MidjourneyUserSettings> getSettings(){
         MidjourneyUser user = getUser();
 
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyUserSettingsService.getById(user.getSettings().getId()));
+        MidjourneyUserSettings midjourneyUserSettings = midjourneyUserSettingsService.getById(user.getSettings().getId());
+        if (midjourneyUserSettings == null){
+            midjourneyUserSettings = new MidjourneyUserSettings();
+            midjourneyUserSettings.setSettings(SETTINGS);
+            midjourneyUserSettings.setPrompt(PROMPT);
+            midjourneyUserSettings.setUserId(user.getId());
+            midjourneyUserSettingsService.save(midjourneyUserSettings);
+        }
+        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyUserSettings);
     }
 
     /**