From bedffffd8673cf62a5e4530bda584fc714c61731 Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期六, 24 五月 2025 23:59:40 +0800
Subject: [PATCH] fix: 修复对话时无法上传文件
---
ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java | 6 ++----
ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java | 2 +-
ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java | 14 ++++++++------
ruoyi-admin/src/main/resources/application.yml | 22 ++--------------------
4 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
index 6a76d29..444169d 100644
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
@@ -67,7 +67,7 @@
String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
String code = RandomUtil.randomNumbers(4);
RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
- // 楠岃瘉鐮佹ā鏉縤d 鑷澶勭悊 (鏌ユ暟鎹簱鎴栧啓姝诲潎鍙�)
+ // 楠岃瘉鐮佹ā鏉縤d
String templateId = "";
Map<String, String> map = new HashMap<>(1);
map.put("code", code);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 1d840e3..8047970 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -131,6 +131,8 @@
- /auth/reset/password
# 鑱婂ぉ鎺ュ彛
- /chat/send
+ # 鏂囦欢涓婁紶
+ - /chat/upload
# 闈欐�佽祫婧�
- /*.html
- /**/*.html
@@ -292,26 +294,6 @@
path: '/resource/websocket'
# 璁剧疆璁块棶婧愬湴鍧�
allowedOrigins: '*'
-
-# 寰俊灏忕▼搴忛厤缃俊鎭�
-wx:
- miniapp:
- configs:
- - appid: # 浣犵殑appid
- secret: # 浣犵殑secret
- token: #寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
- aesKey: #寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
- msgDataFormat: JSON
-
- # 浼佷笟寰俊搴旂敤
-wechat:
- cp:
- corpId:
- appConfigs:
- - agentId:
- secret: ''
- token: ''
- aesKey: ''
spring:
ai:
diff --git a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java
index e02dde1..dfd455a 100644
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java
@@ -145,13 +145,15 @@
.build();
}
okHttpClient = builder.okHttpClient;
+ if (apiHost.endsWith("/")) {
+ this.openAiApi = new Retrofit.Builder()
+ .baseUrl(apiHost)
+ .client(okHttpClient)
+ .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+ .addConverterFactory(JacksonConverterFactory.create())
+ .build().create(OpenAiApi.class);
+ }
-// this.openAiApi = new Retrofit.Builder()
-// .baseUrl(apiHost)
-// .client(okHttpClient)
-// .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-// .addConverterFactory(JacksonConverterFactory.create())
-// .build().create(OpenAiApi.class);
}
/**
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java
index 28001d1..04979d0 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java
@@ -25,10 +25,8 @@
@Bean
public MailAccount mailAccount() {
- if (account == null) {
- account = new MailAccount();
- updateMailAccount();
- }
+ account = new MailAccount();
+ updateMailAccount();
return account;
}
--
Gitblit v1.9.3