Merge upstream/main into feature/common-trace-rag-chat

This commit is contained in:
Obltv
2026-07-23 14:30:38 +08:00
249 changed files with 17551 additions and 1591 deletions

View File

@@ -24,6 +24,14 @@
<artifactId>ruoyi-common-sse</artifactId>
</dependency>
<!-- WebSocket 基础模块:提供 spring-websocket 依赖,用于小程序对话 WS 端点 /chat/ws。
注意common-websocket 自带的 PlusWebSocketHandler/WebSocketConfig 受 websocket.enabled 控制,
当前 enabled=false 不激活,与本模块独立注册的 /chat/ws 互不干扰。 -->
<dependency>
<groupId>org.ruoyi</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.ruoyi</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
@@ -40,6 +48,12 @@
<version>${langchain4j.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-anthropic</artifactId>
<version>${langchain4j.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-ollama</artifactId>
@@ -49,7 +63,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-agentic</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<dependency>
@@ -74,7 +88,7 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-document-parser-apache-tika</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -87,39 +101,39 @@
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-milvus</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-weaviate</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-qdrant</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-mcp</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<!-- LangChain4j Skills - 技能模块 -->
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-skills</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-experimental-skills-shell</artifactId>
<version>${langchain4j.community.version}</version>
<version>${langchain4j.beta.version}</version>
</dependency>
@@ -160,10 +174,24 @@
<version>${dify.version}</version>
</dependency>
<!-- HikariCP 数据库连接池 -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<groupId>com.coze</groupId>
<artifactId>coze-api</artifactId>
<version>${coze.version}</version>
<exclusions>
<exclusion>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
</exclusion>
<exclusion>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- MySQL JDBC 驱动 -->