From a0bfa2ad81afa2e10eb3fd3d92a21dbc6803cec6 Mon Sep 17 00:00:00 2001 From: jack ning Date: Tue, 11 Mar 2025 18:29:28 +0800 Subject: [PATCH] update --- .../main/java/com/bytedesk/ai/robot/RobotService.java | 10 +++------- .../com/bytedesk/core/ip/access/IpAccessEntity.java | 6 +++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotService.java b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotService.java index c44422d30e..d740c59af5 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotService.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-03-11 17:29:51 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-11 18:20:09 + * @LastEditTime: 2025-03-11 18:21:45 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -136,14 +136,10 @@ public class RobotService { } else if (robot.getLlm().getProvider().equals(LlmProviderConsts.ZHIPU)) { springAIZhipuaiService.ifPresent(service -> service.sendWebsocketMessage(query, robot, message)); } else { - // 默认使用智谱AI springAIZhipuaiService.ifPresent(service -> service.sendWebsocketMessage(query, robot, message)); } } - } - - - + } private void processRobotThreadSseMessage(String query, String threadTopic, ThreadProtobuf threadProtobuf, MessageProtobuf messageProtobuf, SseEmitter emitter) { ThreadEntity thread = threadRestService.findFirstByTopic(threadTopic) @@ -175,10 +171,10 @@ public class RobotService { } else if (robot.getLlm().getProvider().equals(LlmProviderConsts.ZHIPU)) { springAIZhipuaiService.ifPresent(service -> service.sendSseMessage(query, robot, message, emitter)); } else { - // 默认使用智谱AI springAIZhipuaiService.ifPresent(service -> service.sendSseMessage(query, robot, message, emitter)); } } } + } diff --git a/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessEntity.java b/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessEntity.java index 657688ff77..007acc38d3 100644 --- a/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessEntity.java +++ b/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessEntity.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-12-24 17:43:48 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-01-17 12:16:28 + * @LastEditTime: 2025-03-11 18:26:34 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -13,6 +13,7 @@ */ package com.bytedesk.core.ip.access; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; import lombok.AllArgsConstructor; @@ -22,6 +23,7 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; import com.bytedesk.core.base.BaseEntity; +import com.bytedesk.core.constant.TypeConsts; import lombok.EqualsAndHashCode; @@ -37,6 +39,8 @@ public class IpAccessEntity extends BaseEntity { private String ip; private String ipLocation; private String endpoint; // 访问的接口 + + @Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT) private String params; // 访问的参数 private LocalDateTime accessTime;