mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-04-13 03:45:14 +00:00
fix(chat): 修复依赖版本升级导致缺少类错误
This commit is contained in:
@@ -26,11 +26,18 @@ public class ChatRequest {
|
|||||||
*/
|
*/
|
||||||
private String prompt;
|
private String prompt;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统提示词
|
* 系统提示词
|
||||||
*/
|
*/
|
||||||
private String sysPrompt;
|
private String sysPrompt;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 消息id
|
||||||
|
*/
|
||||||
|
private Long messageId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否开启流式对话
|
* 是否开启流式对话
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<spring-ai.version>1.0.0</spring-ai.version>
|
<spring-ai.version>1.0.0-M7</spring-ai.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ public class ChatCostServiceImpl implements IChatCostService {
|
|||||||
BigDecimal numberCost = unitPrice
|
BigDecimal numberCost = unitPrice
|
||||||
.multiply(BigDecimal.valueOf(batches))
|
.multiply(BigDecimal.valueOf(batches))
|
||||||
.setScale(2, RoundingMode.HALF_UP);
|
.setScale(2, RoundingMode.HALF_UP);
|
||||||
log.debug("deductToken->按token扣费,结算token数量: {},批次数: {},单价: {},费用: {}",
|
log.debug("deductToken->按token扣费,结算token数量: {},批次数: {},单价: {},费用: {}",
|
||||||
billable, batches, unitPrice, numberCost);
|
billable, batches, unitPrice, numberCost);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -137,7 +137,7 @@ public class ChatCostServiceImpl implements IChatCostService {
|
|||||||
chatToken.setUserId(chatRequest.getUserId());
|
chatToken.setUserId(chatRequest.getUserId());
|
||||||
chatToken.setToken(totalTokens);
|
chatToken.setToken(totalTokens);
|
||||||
chatTokenService.editToken(chatToken);
|
chatTokenService.editToken(chatToken);
|
||||||
|
|
||||||
// 虽未扣费,但要更新消息的基本信息(实际token数、计费类型等)
|
// 虽未扣费,但要更新消息的基本信息(实际token数、计费类型等)
|
||||||
updateMessageWithoutBilling(chatRequest, tokens, chatModelVo.getModelType());
|
updateMessageWithoutBilling(chatRequest, tokens, chatModelVo.getModelType());
|
||||||
}
|
}
|
||||||
@@ -167,12 +167,6 @@ public class ChatCostServiceImpl implements IChatCostService {
|
|||||||
chatMessageBo.setContent(chatRequest.getPrompt().trim());
|
chatMessageBo.setContent(chatRequest.getPrompt().trim());
|
||||||
chatMessageBo.setModelName(chatRequest.getModel());
|
chatMessageBo.setModelName(chatRequest.getModel());
|
||||||
|
|
||||||
// // 基础消息信息,计费相关数据(tokens、费用、计费类型等)在扣费时统一设置
|
|
||||||
// chatMessageBo.setTotalTokens(0); // 初始设为0,扣费时更新
|
|
||||||
// chatMessageBo.setDeductCost(null);
|
|
||||||
// chatMessageBo.setBillingType(null);
|
|
||||||
// chatMessageBo.setRemark("用户消息");
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
chatMessageService.insertByBo(chatMessageBo);
|
chatMessageService.insertByBo(chatMessageBo);
|
||||||
// 保存成功后,将生成的消息ID设置到ChatRequest中
|
// 保存成功后,将生成的消息ID设置到ChatRequest中
|
||||||
@@ -444,11 +438,11 @@ public class ChatCostServiceImpl implements IChatCostService {
|
|||||||
preCheckBalance(chatRequest);
|
preCheckBalance(chatRequest);
|
||||||
return true; // 预检查通过,余额充足
|
return true; // 预检查通过,余额充足
|
||||||
} catch (ServiceException e) {
|
} catch (ServiceException e) {
|
||||||
log.debug("checkBalanceSufficient->余额不足,用户ID: {}, 模型: {}, 错误: {}",
|
log.debug("checkBalanceSufficient->余额不足,用户ID: {}, 模型: {}, 错误: {}",
|
||||||
chatRequest.getUserId(), chatRequest.getModel(), e.getMessage());
|
chatRequest.getUserId(), chatRequest.getModel(), e.getMessage());
|
||||||
return false; // 预检查失败,余额不足
|
return false; // 预检查失败,余额不足
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("checkBalanceSufficient->检查余额时发生异常,用户ID: {}, 模型: {}",
|
log.error("checkBalanceSufficient->检查余额时发生异常,用户ID: {}, 模型: {}",
|
||||||
chatRequest.getUserId(), chatRequest.getModel(), e);
|
chatRequest.getUserId(), chatRequest.getModel(), e);
|
||||||
return false; // 异常情况视为余额不足,保守处理
|
return false; // 异常情况视为余额不足,保守处理
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class OpenAIServiceImpl implements IChatService {
|
|||||||
this.chatClient = chatClientBuilder
|
this.chatClient = chatClientBuilder
|
||||||
.defaultOptions(
|
.defaultOptions(
|
||||||
OpenAiChatOptions.builder().model("gpt-4o-mini").build())
|
OpenAiChatOptions.builder().model("gpt-4o-mini").build())
|
||||||
.defaultToolCallbacks(new SyncMcpToolCallbackProvider(mcpSyncClients))
|
.defaultTools(new SyncMcpToolCallbackProvider(mcpSyncClients))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user