From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/MjOkHttpUtil.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/MjOkHttpUtil.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/MjOkHttpUtil.java
index f7d056a..f7b43f7 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/MjOkHttpUtil.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/MjOkHttpUtil.java
@@ -5,12 +5,13 @@
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.ruoyi.common.core.service.ConfigService;
-import org.ruoyi.system.domain.bo.SysModelBo;
-import org.ruoyi.system.domain.vo.SysModelVo;
-import org.ruoyi.system.service.ISysModelService;
+import org.ruoyi.domain.bo.ChatModelBo;
+import org.ruoyi.domain.vo.ChatModelVo;
+import org.ruoyi.service.IChatModelService;
import org.springframework.stereotype.Component;
import java.io.IOException;
+
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -22,7 +23,7 @@
@Slf4j
public class MjOkHttpUtil {
- private final ISysModelService sysModelService;
+ private final IChatModelService chatModelService;
private final ConfigService configService;
@@ -70,13 +71,12 @@
@PostConstruct
public void init() {
- SysModelBo sysModelBo = new SysModelBo();
- sysModelBo.setModelName("midjourney");
- List<SysModelVo> sysModelList = sysModelService.queryList(sysModelBo);
- if (!sysModelList.isEmpty()) {
- SysModelVo model = sysModelList.get(0);
- this.apiKey = model.getApiKey();
- this.apiHost = model.getApiHost();
+ ChatModelBo sysModelBo = new ChatModelBo();
+ sysModelBo.setModelName("");
+ ChatModelVo midjourney = chatModelService.selectModelByName("midjourney");
+ if (midjourney != null) {
+ this.apiKey = midjourney.getApiKey();
+ this.apiHost = midjourney.getApiHost();
}
}
--
Gitblit v1.9.3