From dea23f13ef2d4918080ce8aeee1ee908188cdb19 Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期一, 01 四月 2024 22:21:29 +0800
Subject: [PATCH] v1.0.3
---
ruoyi-modules/ruoyi-midjourney/src/main/java/com/xmzs/midjourney/controller/TaskController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-midjourney/src/main/java/com/xmzs/midjourney/controller/TaskController.java b/ruoyi-modules/ruoyi-midjourney/src/main/java/com/xmzs/midjourney/controller/TaskController.java
index 7d43eec..1704fa5 100644
--- a/ruoyi-modules/ruoyi-midjourney/src/main/java/com/xmzs/midjourney/controller/TaskController.java
+++ b/ruoyi-modules/ruoyi-midjourney/src/main/java/com/xmzs/midjourney/controller/TaskController.java
@@ -1,14 +1,20 @@
package com.xmzs.midjourney.controller;
import cn.hutool.core.comparator.CompareUtil;
+import cn.hutool.json.JSONUtil;
+import com.xmzs.midjourney.dto.SubmitImagineDTO;
import com.xmzs.midjourney.dto.TaskConditionDTO;
import com.xmzs.midjourney.loadbalancer.DiscordLoadBalancer;
+import com.xmzs.midjourney.result.SubmitResultVO;
import com.xmzs.midjourney.service.TaskStoreService;
import com.xmzs.midjourney.support.Task;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -16,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -25,15 +32,35 @@
@RestController
@RequestMapping("/mj/task")
@RequiredArgsConstructor
+@Slf4j
public class TaskController {
private final TaskStoreService taskStoreService;
private final DiscordLoadBalancer discordLoadBalancer;
+ @Value("${chat.apiKey}")
+ private String apiKey;
+ @Value("${chat.apiHost}")
+ private String apiHost;
+
@ApiOperation(value = "鎸囧畾ID鑾峰彇浠诲姟")
@GetMapping("/{id}/fetch")
- public Task fetch(@ApiParam(value = "浠诲姟ID") @PathVariable String id) {
- return this.taskStoreService.get(id);
- }
+ public String fetch(@ApiParam(value = "浠诲姟ID") @PathVariable String id) {
+ OkHttpClient client = new OkHttpClient();
+ // 鍒涘缓涓�涓猂equest瀵硅薄鏉ラ厤缃綘鐨勮姹�
+ Request request = new Request.Builder()
+ .header("mj-api-secret", apiKey) // 璁剧疆Authorization header
+ .url(apiHost+"mj/task/" + id + "/fetch")
+ .build();
+ try (Response response = client.newCall(request).execute()) {
+ if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+ if (response.body() != null) {
+ return response.body().string();
+ }
+ } catch (IOException e) {
+ log.error("浠诲姟:{}鏌ヨ澶辫触:{}",id,e.getMessage());
+ }
+ return null;
+ }
@ApiOperation(value = "鏌ヨ浠诲姟闃熷垪")
@GetMapping("/queue")
--
Gitblit v1.9.3