Ver código fonte

fix 暂时解决内存问题

chenbiao 2 anos atrás
pai
commit
c9c31eab5e

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

@@ -81,7 +81,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
 
     private static final String RELAX_TOKEN = "5a9a3e9b-5a5e-4b6b-9a5a-9a5a5a5a5a5a";
 
-    private static final Map<Long, ImgSize> TASK_IMG_SIZE_MAP = new ConcurrentHashMap<>();
+    private static final Map<Long, ImgSize> TASK_IMG_SIZE_MAP = new ConcurrentHashMap<>(64);
 
     private final MidjourneyUserConversationMapper conversationMapper;
 
@@ -834,6 +834,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                     .eq(MidjourneyUserConversation::getUserId, userId).orderByDesc(MidjourneyUserConversation::getId).last(" limit 1"));
             if (dbConversation != null) {
                 if ("SUCCESS".equals(dbConversation.getStatus()) || "FAILURE".equals(dbConversation.getStatus())) {
+                    TASK_IMG_SIZE_MAP.remove(dbConversation.getTaskId());
                     return;
                 }
                 if (conversation.getProgressNum() <= dbConversation.getProgressNum() && !conversation.getStatus().equals("FAILURE")){
@@ -1133,6 +1134,8 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 scaling = "quality=lossless&width=" + width + "&height=" + height;
                 if (url.getFile().contains("webp")) {
                     scaling += "&format=webp";
+                }else {
+                    TASK_IMG_SIZE_MAP.remove(conversation.getTaskId());
                 }
             }
 

+ 1 - 10
midjourney/src/main/java/com/yhlxj/service/task/Scheduler.java

@@ -1,21 +1,12 @@
-package com.yhlxj.service.task;//package com.cyksj.task;
+package com.yhlxj.service.task;
 
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
 import com.yhlxj.service.midjourney.MidjourneyAccountService;
 import com.yhlxj.service.midjourney.MidjourneyService;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Component
 @Slf4j