فهرست منبع

fix 同步生成时间

zwhui 2 سال پیش
والد
کامیت
a318e8d211

+ 2 - 0
midjourney/src/main/java/com/yhlxj/service/midjourney/MidjourneyService.java

@@ -41,4 +41,6 @@ public interface MidjourneyService {
     void syscConversation();
 
     SubmitResult uploadFile(SubmitUploadDTO uploadDTO) throws Exception;
+
+    void syncMidjourneyStatus();
 }

+ 19 - 3
midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -145,7 +145,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         }
         saveConversation(user.getId(), mode,result,"IMAGINE", StringUtils.EMPTY, botType);
         Map<String, Object> properties = result.getProperties();
-        properties.put("finalPrompt",prompt);
+        properties.put("messageContent","**"+prompt+"** - <@mj>" + (mode == 1 ? "(fast)" : "(relaxed)"));
         return result;
     }
 
@@ -238,8 +238,8 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         }
         saveConversation(user.getId(),  mode,result,"MODAL", StringUtils.EMPTY, StringUtils.EMPTY);
         Map<String, Object> properties = result.getProperties();
-        properties.put("finalPrompt",prompt);
-        properties.put("messageContent","**"+midjourneyUserConversation.getPrompt()+"** - <@mj>" + (mode == 1 ? "(fast)" : "(relaxed)"));
+        properties.put("finalPrompt",midjourneyUserConversation.getPrompt());
+        properties.put("messageContent","**"+prompt+"** - <@mj>" + (mode == 1 ? "(fast)" : "(relaxed)"));
         return result;
     }
 
@@ -896,4 +896,20 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         log.info("action body:{}", body);
         return Jsons.parseObject(body, SubmitResult.class);
     }
+
+
+    @Override
+    public void syncMidjourneyStatus() {
+
+    }
+
+    public static void main(String[] args) throws Exception {
+        String body = HttpUtil.get("https://storage.googleapis.com/midjourney-status/status.json");
+        System.out.println(body);
+        JSONObject jsonObject = JSONUtil.parseObj(body);
+        System.out.println(jsonObject);
+        JSONArray metrics1 = jsonObject.getJSONArray("metrics");
+        Map<String, Object> metrics = Jsons.toMap(metrics1);
+        System.out.println(metrics);
+    }
 }

+ 5 - 0
midjourney/src/main/java/com/yhlxj/service/task/Scheduler.java

@@ -27,5 +27,10 @@ public class Scheduler {
     }
 
 
+    @Scheduled(cron = "0 0/5 * * * ?")
+    public void syncMidjourneyStatus() throws Exception {
+        midjourneyService.syncMidjourneyStatus();
+    }
+
 }
 

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

@@ -476,7 +476,7 @@ public class MidjourneyController {
     }
 
     /**
-     * 修改settings
+     * 获取settings
      */
     @GetMapping("/get/settings")
     public Result<MidjourneyUserSettings> getSettings(){