zwhui 1 an în urmă
părinte
comite
ae4161ed4e

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

@@ -1460,7 +1460,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 .stream().map(item -> JSONUtil.toBean((String) item, MidjourneyUserQueue.class)).collect(Collectors.toList());
         list.forEach(item -> {
             try {
-                item.setBase64Array(encodeImageToBase64("/mnt/picture/"+item.getQueueId()+"."+item.getFileExt()));
+                item.setBase64Array(new JSONArray(encodeImageToBase64("/mnt/picture/"+item.getQueueId()+"."+item.getFileExt())).toString());
                 Long rank = redisService.zRank(RedisService.key.MIDJOURNEY_QUEUE_LIMIT.getName() + userId, item.getQueueId());
                 item.setPosition((rank != null) ? rank + 1 : 1);
             } catch (IOException e) {
@@ -1470,7 +1470,10 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         return list;
     }
 
-
+    public static void main(String[] args) {
+        System.out.println(new JSONArray().join("123").toString());
+        System.out.println(new JSONArray("123").toJSONString(1));
+    }
 
     // 计算当前队列中假任务的数量
     private long countExistingDummyTasks(Long userId) {
@@ -1499,7 +1502,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
             return 12;
         } else {
             // 18:00-23:59 多等8分钟
-            return 8;
+            return 1;
         }
     }
 

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

@@ -583,7 +583,7 @@ public class MidjourneyController {
      */
     @PostMapping("/put/settings")
     public Result<MidjourneyUserSettings> upSettings(@RequestBody MidjourneyUserSettings settings) throws Exception {
-        MidjourneyUser user = getUserSimple();
+        MidjourneyUser user = getUser();
         if (!user.getId().equals(settings.getUserId())) {
             throw BusinessRuntimeException.getInstance("参数错误");
         }