Merge remote-tracking branch 'origin/master' into master-wangwei

This commit is contained in:
Edward_89 2024-12-29 18:01:27 +08:00
commit aef1801d3f
6 changed files with 71 additions and 2 deletions

View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.llm.controller.admin;
import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/mp/open/")
@Validated
public class GetBackendConfig {
@Resource
private LLMBackendProperties llmBackendProperties;
@RequestMapping("getBackendConfig")
public String getBackendConfig() {
return llmBackendProperties.getRagHealth();
}
}

View File

@ -0,0 +1,16 @@
package cn.iocoder.yudao.module.llm.framework.backend.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
/**
* 短信配置类包括短信客户端短信验证码两部分
*
* @author 芋道源码
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(LLMBackendProperties.class)
public class LLMBackendConfiguration {
}

View File

@ -0,0 +1,19 @@
package cn.iocoder.yudao.module.llm.framework.backend.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
@ConfigurationProperties(prefix = "llm.backend")
@Validated
@Data
public class LLMBackendProperties {
/**
* 过期时间
*/
@NotNull(message = "RAG健康检查API")
private String ragHealth;
}

View File

@ -200,6 +200,12 @@ justauth:
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
--- #################### 大模型训练相关配置 ###################
llm:
backend:
# RAG服务健康检查
rag_health: http://localhost:8123/health
--- #################### iot相关配置 TODO 芋艿:再瞅瞅 ####################
iot:

View File

@ -243,6 +243,12 @@ justauth:
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
--- #################### 大模型训练相关配置 ###################
llm:
backend:
# RAG服务健康检查
rag_health: http://localhost:8123/health
--- #################### iot相关配置 TODO 芋艿:再瞅瞅 ####################
iot:
emq:

View File

@ -235,8 +235,8 @@ yudao:
topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic
consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group
swagger:
title: 芋道快速开发平台
description: 提供管理后台、用户 App 的所有功能
title: 教学辅助系统
description: 大模型教学辅助系统
version: ${yudao.info.version}
url: ${yudao.web.admin-ui.url}
email: xingyu4j@vip.qq.com