升级积木报表和积木BI到2.1.3\升级minidao解决SqlServer兼容问题

解决TableAction中自定义图标颜色不起作用的问题

README-AI.md

@@ -0,0 +1,177 @@
+AIGC应用平台介绍
+===============
+
+一个全栈式 AI 开发平台，旨在帮助开发者快速构建和部署个性化的 AI 应用。
+
+> JDK说明：AI流程编排引擎暂时不支持jdk21，所以目前只能使用jdk8或者jdk17启动项目。
+
+
+JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
+其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。
+
+
+
+### AI视频介绍
+
+[![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecg_aivideo.png)](https://www.bilibili.com/video/BV1zmd7YFE4w)
+
+
+##### 功能大模块
+
+- AI应用开发平台
+- AI知识库系统
+- AI大模型管理
+- AI流程编排
+- AI对话支持图片
+- AI对话助手(智能问答)
+- AI建表（Online表单）
+- AI写文章（CMS）
+- AI表单字段建议（表单设计器）
+
+
+
+#### Dify `VS` JEECG AI
+
+> JEECG AI与Dify相比，在多个方面展现出显著的优势，特别是在文档处理、格式和图片保持方面。以下是一些具体的优点：
+> - Markdown文档库导入：
+> JEECG AI允许用户直接导入整个Markdown文档库，这不仅保留markdown格式，还支持图片的导入，确保文档内容的完整性和可视化效果。
+> - 对话回复格式美观：
+> 在对话过程中，JEECG AI能够保持回复内容的原格式，也不丢失图片，使得输出的文章更加美观，不会出现格式错乱的情况，还支持图片的渲染。
+> - PDF文档导入与格式转换：
+> JEECG AI在处理PDF文档时，能够更好地保持原始格式和图片，确保转换后的内容与原始文档一致。这个功能在许多AI产品中表现不佳，而JEECG AI在这方面做出了显著的优化
+
+
+| 功能         | Dify             | Jeecg AI                                |
+|------------|------------------|-----------------------------------------|
+| AI工作流      | 有                | 有                                       |
+| RAG 管道向量搜索 | 有                | 有                                       |
+| AI模型管理     | 有                | 有                                       |
+| AI应用管理     | 有                | 有                                       |
+| AI知识库      | 有                | 有                                       |
+| 产品方向       | 一款独立的 LLM 应用开发平台 | 低代码与AIGC应用二者结合的平台                       |
+| 业务集成       | 业务集成能力弱          | 更方便与业务系统集成，调用系统接口和逻辑更加方便                |
+| AI业务流      | 侧重AI逻辑流程         | AI流程编排作为低代码的业务引擎，用户可以通过AI流程配置各种业务流和AI流程 |
+| 实现语言       | python + react | JAVA + vue3                             |
+| 上传markdown文档库(支持图片) | 不支持 | 支持 |
+| AI对话支持发图和展示图片 | 支持 | 支持 |
+
+
+
+### 技术文档
+
+- [AIGC开发文档](https://help.jeecg.com/aigc)
+- [安装向量库 pgvector](https://help.jeecg.com/aigc/config)
+
+
+
+## 功能特点
+
+- AI流程: 提供强大的AI流程设计器引擎，支持编排 AI 工作过程，满足复杂业务场景，支持画布上构建和实时运行查看 AI流程运行情况。
+- AI流程即服务: 通过AI流程编排你需要的智能体，结合AI+自定义开发节点 实现功能性 API，让你瞬间拥有各种智能体API。
+- AI助手对话功能: 集成 ChatGPT、Deepseek、智普、私有大模型 等 AI 模型，提供智能对话和生成式 AI 功能，深度与知识库结合提供更精准的知识。
+- RAG 功能: 涵盖从文档摄入到检索的所有内容，支持从 PDF、PPT 和其他常见文档格式中提取文本，支持检索增强生成（RAG），将未训练数据与 AI 模型集成，提升智能交互能力。
+- AI 知识库: 通过导入文档或已有问答对进行训练，让 AI 模型能根据文档以交互式对话方式回答问题。
+- 模型管理：支持对接各种大模型，包括本地私有大模型（Deepseek/ Llama 3 / Qwen 2 等）、国内公共大模型（通义千问 / 腾讯混元 / 字节豆包 / 百度千帆 / 智谱 AI / Kimi 等）和国外公共大模型（OpenAI / Claude / Gemini 等）；
+- 无缝嵌入：Iframe一键嵌入,支持将AI聊天助手快速嵌入到第三方系统，让系统快速拥有智能问答能力，提高用户满意度。
+
+
+
+
+#### 在线体验
+
+- JeecgBoot演示：  https://boot3.jeecg.com
+- 敲敲云在线搭建AI知识库：https://app.qiaoqiaoyun.com
+
+
+## 技术交流
+
+- 开发文档：https://help.jeecg.com/aigc 
+- QQ群：964611995、716488839(满)
+
+
+## 功能列表
+
+- AI应用管理(普通应用、高级流程应用)
+- AI模型管理
+- AI知识库
+- AI应用平台(普通、对接AI流程)
+- AI流程编排
+- AI聊天支持嵌入第三方
+- AI向量库对接
+
+
+
+## 支持AI模型
+
+| AI大模型         |  支持   |
+|---------------| --- |
+| DeepSeek      |  √   |
+| ChatGTP       |  √   |
+| Qwq           |  √   |
+| 智库            |  √   |
+| Ollama本地搭建大模型 |  √   |
+| 等等。。          |  √   |
+
+
+
+
+##  AIGC能做什么
+
+AIGC模块是一个基于AI的自动化流程编排工具和聊天应用搭建平台，它可以帮助用户快速生成AI流程接口和聊天应用，提高效率。
+以下是一些具体的应用场景和示例：
+
+- 你可能需要一个翻译接口，可以通过AI流程编排搭建出来。
+- 你可能需要一个接口转换工具，可以通过AI流程编排搭建出来。（比如：jimureport所需要接口返回格式与你的系统不同，你通过AI接口实现自动转换）
+- 你可能需要一个聊天机器人，可以通过AI流程编排搭建出来。
+- 你可能需要一个自动化流程，可以通过AI流程编排搭建出来。
+- 你可能需要一个自动化处理文件的流程，可以通过AI流程结合python脚本实现操作电脑，文件等。
+
+
+## AI应用平台功能展示
+
+AI模型列表
+
+![](https://oscimg.oschina.net/oscnet//a5fb3e0d69ca1706b0de221535c7acaa.png)
+
+选择AI模型，配置你的参数
+
+![](https://oscimg.oschina.net/oscnet//1f941472758a5fc227f54f2683953b8e.png)
+
+
+AI知识库支持手工录入文本，导入pdf\\word\\excel等文档，支持问答对训练
+
+![](https://oscimg.oschina.net/oscnet//150bb33f48d6c8e2ae059e2a58f4200b.png)
+
+![](https://oscimg.oschina.net/oscnet//032d16c915b0f79318935484c81df260.png)
+
+
+
+AI流程，提供强大的AI流程设计器引擎，支持编排 AI 工作过程，满足复杂业务场景，支持画布上构建和实时运行查看 AI流程运行情况。
+
+![](https://oscimg.oschina.net/oscnet//f40f9aa275cd4aea94e1c209513151e2.png)
+
+
+目前支持的节点有：开始、结束、AI知识库节点、AI节点、分类节点、分支节点、JAVA节点、脚本节点、子流程节点、http请求节点、直接回复节点等节点
+
+![](https://oscimg.oschina.net/oscnet//6d86480ab1bbfab5b2e6992b416b2152.png)
+
+节点项配置
+
+![](https://oscimg.oschina.net/oscnet//90a5f76b6b4fc406e2e2b87245b35459.png)
+
+在线运行看结果
+
+![](https://oscimg.oschina.net/oscnet//bc9817a7bbd94936a5a3e885abe3cb38.png)
+
+
+AI应用配置，支持AI流程配置和简单的AI配置
+
+![](https://oscimg.oschina.net/oscnet//a853d9be4d3756806799ad025e722df8.png)![](https://oscimg.oschina.net/oscnet//d3bcbf5977c6fb75a8f996e1e40590be.png)
+
+可以关联多个知识库，右侧是AI智能回复，你可以搭建自己的智能体，比如搭建一个 “诗词达人” “翻译助手”
+
+![](https://oscimg.oschina.net/oscnet//c26a848136be3e22ec1e0651e78976c2.png)
+
+可以将创建的聊天应用，集成到第三方系统中
+
+![](https://oscimg.oschina.net/oscnet//39c6f589ef46f0454b229915ffa263f4.png)

README-EN.md

@@ -7,12 +7,12 @@
 JEECG BOOT AI Low Code Platform
 ===============
 
-Current version: 3.7.3 (Release date: 2025-02-10)
+Current version: 3.8.2 (Release date: 2025-08-04)
 
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-guojusoft-orange.svg)](http://www.jeecg.com)
-[![](https://img.shields.io/badge/version-3.7.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.8.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -21,7 +21,7 @@ Current version: 3.7.3 (Release date: 2025-02-10)
 Project introduction
 -----------------------------------
 
-<h3 align="center">Java AI Low Code Platform for Enterprise web applications</h3>
+<h3 align="center">Java AI Low Code Platform</h3>
 
 JeecgBoot is a `AI low code platform` based on code `generators`! Front and back end separation architecture SpringBoot2.x, SpringCloud, Ant Design&Vue, Mybatis plus, Shiro, JWT, support for microservices. The powerful code generator makes the front and back end of the code generation, low code development! JeecgBoot leads a new low-code development paradigm (OnlineCoding-> Code Generator -> Manual MERGE) that helps resolve 70% of the duplication in Java projects and makes development more business-focused. Not only can quickly improve efficiency, save research and development costs, but also do not lose flexibility!
 
@@ -37,7 +37,7 @@ AI Empowering Low-Code: Currently, JeecgBoot supports AI large models such as Ch
 Technical support
 -----------------------------------
 
-Problems or bugs in use can be found in [Making on the Issues](https://github.com/jeecgboot/JeecgBoot/issues/new)
+Problems or bugs in use can be found in [Making on the Issues](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md)
 
 
 ##### Project description
@@ -49,6 +49,11 @@ Problems or bugs in use can be found in [Making on the Issues](https://github.co
 | `jeecg-uniapp` | [APP development framework, a code multi terminal adaptation, and support APP, small program, H5](https://github.com/jeecgboot/jeecg-uniapp) |
 
 
+### Video Introduction
+
+[![](https://upload.jeecg.com/jeecg/qiaoqiaoyunsite/jeecgvideo02.png)](https://www.bilibili.com/video/BV1Nk4y1o7Qc)
+
+
 
 Download other source code
 -----------------------------------
@@ -64,9 +69,13 @@ Jeecg-Boot AI low code platform can be applied in the development of any J2EE pr
 Starts the project
 -----------------------------------
 
-- [IDEA Quick start](https://help.jeecg.com/java/setup/idea/startup.html)
-- [Docker Quick start](https://help.jeecg.com/java/docker/quick.html)
+> Default account password： admin/123456
 
+- [Development Environment setup](https://help.jeecg.com/java/setup/tools)
+- [IDEA Quick start(single model)](https://help.jeecg.com/java/setup/idea/startup)
+- [Docker Quick start(single model)](https://help.jeecg.com/java/docker/quick)
+- [IDEA Quick start(microservices model)](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
+- [Docker Quick start(microservices model)](https://help.jeecg.com/java/docker/quickcloud)
 
 
 Technical documentation
@@ -74,9 +83,9 @@ Technical documentation
 
 - Website：  [http://www.jeecg.com](http://www.jeecg.com)
 - Demo ： [OnlineDemo](http://boot3.jeecg.com) | [APP](http://jeecg.com/appIndex)
-- Doc：  [DocumentCenter](http://help.jeecg.com) | [AI Config](https://help.jeecg.com/java/ai/aichat.html)
+- Doc：  [DocumentCenter](http://help.jeecg.com) | [AI Config](https://help.jeecg.com/java/ai/aichat)
 - Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart) |   [Q&A ](http://www.jeecg.com/doc/qa)  |  [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
-- QQ group ： ⑩716488839、⑨808791225、⑧825232878、⑦791696430、⑥730954414(full)、683903138(full)、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
+- QQ group ： 964611995、⑩716488839(满)、⑨808791225(满)
 
 
 
@@ -176,7 +185,7 @@ Technical Architecture:
 
 #### Development Environment
 
-- Language: Java 8+ (17)
+- Language: Java Default Jdk17(support jdk8、jdk21)
 
 - IDE(JAVA) : IDEA (lombok plug-in must be installed)
 
@@ -193,17 +202,17 @@ Technical Architecture:
 
 - Basic framework: Spring Boot 2.7.18
 
-- Microservice framework: Spring Cloud Alibaba 2021.0.1.0
+- Microservice framework: Spring Cloud Alibaba 2021.0.6.2
 
 - Persistence layer framework: MybatisPlus 3.5.3.2
 
-- Report tool: JimuReport 1.9.3
+- Report tool: JimuReport 1.9.5
 
-- Security framework: Apache Shiro 1.12.0, Jwt 3.11.0
+- Security framework: Apache Shiro 1.13.0, Jwt 4.5.0
 
 - Microservice technology stack: Spring Cloud Alibaba, Nacos, Gateway, Sentinel, Skywalking
 
-- Database connection pool: Alibaba Druid 1.1.22
+- Database connection pool: Alibaba Druid 1.1.24
 
 - Log printing: logback
 
@@ -242,8 +251,16 @@ Technical Architecture:
 | --- | --- |
 | DeepSeek | √ |
 | ChatGPT | √ |
+| Qwq | √ |
+| 智库 | √ |
+| Ollama本地搭建大模型 | √ |
+| 等等。。 | √ |
+
+
+AI Config： https://help.jeecg.com/java/ai/aichat
+
+AI APP: https://help.jeecg.com/aigc
 
-AI Config： https://help.jeecg.com/java/ai/aichat.html
 
 ## Microservice solutions
 
@@ -255,7 +272,7 @@ AI Config： https://help.jeecg.com/java/ai/aichat.html
 - 6. Distributed files Minio and Alioss √
 - 7. Unified permission control
 - 8. Service monitoring SpringBootAdmin√
-- 9. link tracking Skywalking  [reference document](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 9. link tracking Skywalking  [reference document](https://help.jeecg.com/java/springcloud/super/skywarking)
 - 10. Messaging middleware RabbitMQ √
 - 11. Distributed task xxl-job √
 - 12. Distributed Transaction Seata
@@ -272,8 +289,8 @@ AI Config： https://help.jeecg.com/java/ai/aichat.html
 ![功能蓝图](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
 
 ### quick start
-- Microservice Development：  [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
-- [Docker starts the micro-service background](https://help.jeecg.com/java/docker/springcloud.html)
+- Microservice Development：  [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
+- [Docker starts the micro-service background](https://help.jeecg.com/java/docker/springcloud)
 
 
 ### Effect of system

README-Enterprise.md

@@ -0,0 +1,124 @@
+
+JeecgBoot低代码平台(商业版介绍)
+===============
+
+
+
+项目介绍
+-----------------------------------
+
+<h3 align="center">企业级AI低代码平台</h3>
+
+
+JeecgBoot是一款集成AI应用的，基于BPM流程的低代码平台，旨在帮助企业快速实现低代码开发和构建个性化AI应用！前后端分离架构Ant Design&Vue3，SpringBoot，SpringCloud Alibaba，Mybatis-plus，Shiro。强大的代码生成器让前后端代码一键生成，无需写任何代码！ 引领AI低代码开发模式: AI生成->OnlineCoding-> 代码生成-> 手工MERGE， 帮助Java项目解决80%的重复工作，让开发更多关注业务，提高效率、节省成本，同时又不失灵活性！低代码能力：Online表单、表单设计、流程设计、Online报表、大屏/仪表盘设计、报表设计; AI应用平台功能：AI知识库问答、AI模型管理、AI流程编排、AI聊天等，支持含ChatGPT、DeepSeek、Ollama等多种AI大模型
+
+JeecgBoot 提供了一系列 `低代码能力`，实现`真正的零代码`在线开发：Online表单开发、Online报表、复杂报表设计、打印设计、在线图表设计、仪表盘设计、大屏设计、移动图表能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）
+
+`AI赋能低代码:` 目前提供了AI应用、AI模型管理、AI流程编排、AI对话助手，AI建表、AI写文章、AI知识库问答、AI字段建议等功能;支持各种AI大模型ChatGPT、DeepSeek、Ollama、智普、千问等.
+
+`JEECG宗旨是:` 简单功能由OnlineCoding配置实现，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`；实现了低代码开发的同时又支持灵活编码，解决了当前低代码产品普遍不灵活的弊端！
+
+`JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
+
+
+
+#### JeecgBoot商业版与同类产品区别
+-----------------------------------
+
+- 灵活性：jeecgboot基于开源技术栈，设计初考虑到可插拔性和集成灵活性，确保平台的智能性与灵活性，避免因平台过于庞大而导致的扩展困难。
+- 流程管理：支持一个表单挂接多个流程，同时一个流程可以连接多个表单，增强了流程的灵活性和复杂性管理。
+- 符合中国国情的流程：针对中国市场的特定需求，jeecgboot能够实现各种符合中国国情的业务流程。
+- 强大的表单设计器：jeecgboot的表单设计器与敲敲云共享，具备高质量和智能化的特点，能够满足零代码应用的需求，业内同类产品中不多见。
+- 报表功能：自主研发的报表工具，拥有独立知识产权，功能上比业内老牌产品如帆软更智能，操作简便。
+- BI产品整合：提供大屏、仪表盘、门户等功能，完美解决这些需求，并支持移动面板的设计与渲染。
+- 自主研发的模块：jeecgboot的所有模块均为自主研发，具有独立的知识产权。
+- 颗粒度和功能细致：在功能细致度和颗粒度上，jeecgboot远超同类产品，尤其在零代码能力方面表现突出。
+- 零代码应用管理：最新版支持与敲敲云的零代码应用管理能力的集成，使得jeecgboot既具备低代码，又具备零代码的应用能力，业内独一无二。
+- 强大的代码生成器：作为开源代码生成器的先锋，jeecgboot在代码生成的智能化和在线低代码与代码生成的结合方面，优势明显。
+- 精细化权限管理：提供行级和列级的数据权限控制，满足企业在ERP和OA领域对权限管理的严格需求。
+- 多平台支持的APP：目前采用uniapp3实现，支持小程序、H5、App及鸿蒙、鸿蒙Next、Electron桌面应用等多种终端。
+
+> 综上所述，jeecgboot不仅在功能上具备丰富性和灵活性，还在技术架构、权限管理和用户体验等方面展现出明显的优势，是一个综合性能强大的低代码平台。
+
+
+
+商业版演示
+-----------------------------------
+
+JeecgBoot vs 敲敲云
+> - JeecgBoot是低代码产品拥有系列低代码能力，比如流程设计、表单设计、大屏设计，代码生成器，适合半开发模式（开发+低代码结合），也可以集成零代码应用管理模块.
+> - 敲敲云是零代码产品，完全不写代码，通过配置搭建业务系统，其在jeecgboot基础上研发而成，删除了online、代码生成、OA等需要编码功能，只保留应用管理功能和聊天、日程、文件三个OA组件.
+
+
+- JeecgBoot低代码：  https://boot3.jeecg.com
+- 敲敲云零代码：https://app.qiaoqiaoyun.com
+- APP演示(多端): http://jeecg.com/appIndex
+
+
+### 流程视频介绍
+
+[![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/flow_video.png)](https://www.bilibili.com/video/BV1Nk4y1o7Qc)
+
+
+
+### 商业版功能简述
+
+> 详细的功能介绍，[请联系官方](https://jeecg.com/vip)
+
+```
+│─更多商业功能
+│  ├─流程设计器
+│  ├─简流设计器(类钉钉版)
+│  ├─门户设计（NEW）
+│  ├─表单设计器
+│  ├─大屏设计器
+│  └─我的任务
+│  └─历史流程
+│  └─历史流程
+│  └─流程实例管理
+│  └─流程监听管理
+│  └─流程表达式
+│  └─我发起的流程
+│  └─我的抄送
+│  └─流程委派、抄送、跳转
+│  └─OA办公组件
+│  └─零代码应用管理（无需编码，在线搭建应用系统）
+│  ├─积木报表企业版（含jimureport、jimubi）
+│  ├─AI流程设计器源码
+│  ├─Online全模块功能和源码
+│  ├─AI写文章（CMS）
+│  ├─AI表单字段建议（表单设计器）
+│  ├─OA办公协同组件
+│  ├─在线聊天功能
+│  ├─设计表单移动适配
+│  ├─设计表单支持外部填报
+│  ├─设计表单AI字段建议
+│  ├─设计表单视图功能(支持多种类型含日历、表格、看板、甘特图)
+│  └─。。。
+   
+```
+
+
+
+
+##### 流程设计
+![](https://oscimg.oschina.net/oscnet/up-981ce174e4fbb48c8a2ce4ccfd7372e2994.png)
+
+![](https://oscimg.oschina.net/oscnet/up-1dc0d052149ec675f3e4fad632b82b48add.png)
+
+![](https://oscimg.oschina.net/oscnet/up-de31bc2f9d9b8332c554b0954cc73d79593.png)
+
+![输入图片说明](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "在这里输入图片标题")
+
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "在这里输入图片标题")
+
+![输入图片说明](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "在这里输入图片标题")
+
+
+
+##### 表单设计器
+![](https://oscimg.oschina.net/oscnet/up-5f8cb657615714b02190b355e59f60c5937.png)
+
+![](https://oscimg.oschina.net/oscnet/up-d9659b2f324e33218476ec98c9b400e6508.png)
+
+![](https://oscimg.oschina.net/oscnet/up-4868615395272d3206dbb960ade02dbc291.png)

README.md

@@ -2,12 +2,13 @@
 JeecgBoot AI低代码平台
 ===============
 
-当前最新版本： 3.7.3（发布日期：2025-02-10） 
+当前最新版本： 3.8.2（发布日期：2025-08-04） 
 
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/jeecgboot/JeecgBoot/blob/master/LICENSE)
-[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://guojusoft.com)
-[![](https://img.shields.io/badge/version-3.7.3-brightgreen.svg)](https://github.com/jeecgboot/JeecgBoot)
+[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](https://jeecg.com)
+[![](https://img.shields.io/badge/blog-技术博客-orange.svg)](https://jeecg.blog.csdn.net)
+[![](https://img.shields.io/badge/version-3.8.2-brightgreen.svg)](https://github.com/jeecgboot/JeecgBoot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/jeecgboot/JeecgBoot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/jeecgboot/JeecgBoot)
 
@@ -16,45 +17,48 @@ JeecgBoot AI低代码平台
 项目介绍
 -----------------------------------
 
-<h3 align="center">Java AI Low Code Platform for Enterprise web applications</h3>
+<h3 align="center">企业级AI低代码平台</h3>
 
-JeecgBoot 是一款基于`BPM`和`代码生成器`的 AI低代码平台！前后端分离架构 SpringBoot2.x/3.x，SpringCloud，Ant Design Vue3，Mybatis-plus，Shiro，JWT，支持微服务、多租户;支持 AI 大模型 DeepSeek 和 ChatGPT、Ollama本地模型; 强大的代码生成器让前后端代码一键生成，无需写任何代码!  JeecgBoot 引领 AI 低代码开发模式(AI生成-> OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目80%的重复工作，让开发更多关注业务。既能快速提高效率，节省成本，同时又不失灵活性！AIGC能力：AI对话助手、AI建表、AI写文章、AI流程编排、AI知识库问答等等.
-
-JeecgBoot 提供了一系列 `AI能力` `低代码模块`，实现在线开发`真正的零代码`：Online表单开发、Online报表、报表配置能力、在线图表设计、仪表盘设计、大屏设计、移动配置能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）、AI对话助手，AI建表、AI写文章、AI流程编排、AI知识库问答、AI赋能低代码等等！
+JeecgBoot是一款企业级低代码平台集成了AI应用平台功能，旨在帮助开发者快速实现低代码开发和构建、部署个性化的 AI 应用。
+前后端分离架构Ant Design4、Vue3，SpringBoot2/3，SpringCloud Alibaba，Mybatis-plus，Shiro/SpringAuthorizationServer，强大的代码生成器让前后端代码一键生成，无需写任何代码；提供强大的报表和大屏工具，满足企业级数据产品需求！
+引领AI低代码开发模式: AI生成->OnlineCoding-> 代码生成-> 手工MERGE， 帮助Java项目解决80%的重复工作，让开发更多关注业务，提高效率、节省成本，同时又不失灵活性！低代码能力：Online表单、表单设计、流程设计、Online报表、大屏/仪表盘设计、报表设计; AI应用平台功能：AI知识库问答、AI模型管理、AI流程编排、AI聊天等，支持含ChatGPT、DeepSeek、Ollama等多种AI大模型
 
 
-`JEECG宗旨是:` 简单功能由OnlineCoding配置实现，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`；实现了低代码开发的同时又支持灵活编码，解决了当前低代码产品普遍不灵活的弊端！
+`AI赋能低代码:` 提供一套成熟AI应用平台功能：包含AI应用管理、AI模型管理、AI对话助手、AI知识库问答、AI流程编排、AI流程设计器，AI建表等功能; 支持各种AI大模型ChatGPT、DeepSeek、Ollama、智普、千问等.
+
+`JEECG宗旨是:` 简单功能由OnlineCoding零代码搭建，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`，解决了当前低代码产品普遍不灵活的弊端！
 
 `JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
 
-`AI赋能低代码:` 目前JeecgBoot支持AI大模型`ChatGPT`和`DeepSeek`，现在最新版默认使用`DeepSeek`，速度更快质量更高。目前提供了AI对话助手、AI建表、AI报表、AI写文章、AI流程编排、AI知识库问答等功能。
+
+
 
 
 适用项目
 -----------------------------------
-JeecgBoot AI低代码平台，可以应用在任何J2EE项目的开发中，支持信创国产化（默认适配达梦和人大金仓）。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
+JeecgBoot低代码平台，可以应用在任何J2EE项目的开发中，支持信创国产化。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）、AI知识库等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
+又是一个全栈式 AI 开发平台，快速帮助企业构建和部署个性化的 AI 应用。
+
+**信创兼容说明**
+- 操作系统：国产麒麟、银河麒麟等国产系统几乎都是基于 Linux 内核，因此它们具有良好的兼容性。
+- 数据库：达梦、人大金仓、TiDB
+- 中间件：东方通 TongWeb、TongRDS，宝兰德 AppServer、CacheDB, [信创配置文档](https://help.jeecg.com/java/tongweb-deploy/)
 
 
-#### 项目说明
-
-| 项目名                | 说明                     | 
-|--------------------|------------------------|
-| `jeecg-boot`    | 后端源码JAVA（SpringBoot微服务架构）        |
-| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite6+ts最新技术栈）  |
-| `jeecg-uniapp` | [配套APP框架](https://github.com/jeecgboot/jeecg-uniapp) 适配多个终端，支持APP、小程序、H5 |
-
-
-
-技术文档
+版本说明
 -----------------------------------
 
-- 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
-- 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
-- 快速体验： [一分钟体验低代码](https://jeecg.blog.csdn.net/article/details/106079007?spm=1001.2014.3001.5502 "一分钟体验零代码") | [在线体验零代码](https://app.qiaoqiaoyun.com/myapps/index "在线体验零代码")
-- 开发文档：  [文档中心](https://help.jeecg.com) | [AI集成配置(支持DeepSeek)](https://help.jeecg.com/java/ai/aichat.html)
-- 反馈问题：  [在Github上提Issues](https://github.com/jeecgboot/JeecgBoot/issues/new)
-- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [入门视频](http://jeecg.com/doc/video)
-- QQ交流群 ： ⑩716488839、⑨808791225(满)、其他(满)
+|下载                                 | JDK17 + SpringBoot3.3 + Shiro                                               |JDK17 + SpringBoot3.3+ SpringAuthorizationServer   | JDK17/JDK8 + SpringBoot2.7 |
+|------|----------------------------------------------------|-----------------------------------------------------------------------------|--------------------------------------------|
+| Github |  [`springboot3`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3)  | [`springboot3_sas`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3_sas) 分支 |[`master`](https://github.com/jeecgboot/JeecgBoot) 分支|
+| Gitee |  [`springboot3`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3/)      | [`springboot3_sas`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3_sas) 分支 |[`master`](https://gitee.com/jeecg/JeecgBoot)     分支 |
+
+
+- `jeecg-boot` 是后端JAVA源码项目（支持单体和微服务切换）.
+- `jeecgboot-vue3` 是前端VUE3源码项目（vue3+vite6+ts最新技术栈）.
+- `JeecgUniapp`  是[配套APP框架](https://github.com/jeecgboot/JeecgUniapp) 适配多个终端，支持APP、小程序、H5、鸿蒙、鸿蒙Next.
+- 参考 [文档](https://help.jeecg.com/ui/2dev/mini) 可以删除不需要的demo，制作一个精简版本
+
 
 
 
@@ -62,69 +66,122 @@ JeecgBoot AI低代码平台，可以应用在任何J2EE项目的开发中，支
 启动项目
 -----------------------------------
 
-- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
-- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick.html)
+> 默认账号密码： admin/123456
+
+- [开发环境搭建](https://help.jeecg.com/java/setup/tools)
+- [IDEA启动前后端(单体模式)](https://help.jeecg.com/java/setup/idea/startup)
+- [Docker一键启动(单体模式)](https://help.jeecg.com/java/docker/quick)
+- [IDEA启动前后端(微服务方式)](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
+- [Docker一键启动(微服务方式)](https://help.jeecg.com/java/docker/quickcloud)
 
 
-AIGC功能清单
+技术文档
 -----------------------------------
 
-- AI对聊天助手
-- AI建表（Online表单）
-- AI写文章（CMS）
-- AI表单建议（表单设计器）
-- AI流程编排（研发中）
-- AI知识库问答系统（研发中）
-- AI应用开发平台（研发中）
-- AI聊天窗口支持嵌入第三方（研发中）
+- 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
+- 在线演示：  [平台演示](https://boot3.jeecg.com) | [APP演示](https://jeecg.com/appIndex)
+- 入门指南：  [快速入门](http://www.jeecg.com/doc/quickstart)  | [代码生成使用](https://help.jeecg.com/java/codegen/online) | [开发文档](https://help.jeecg.com)  | [AI应用手册](https://help.jeecg.com/aigc) | [视频教程](http://jeecg.com/doc/video)
+- 技术支持：  [反馈问题](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md)    | [低代码体验一分钟](https://jeecg.blog.csdn.net/article/details/106079007) 
+- QQ交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
 
 
-<b>关注公众号了解官方动态</b>
+AI 应用平台介绍
+-----------------------------------
+
+一个全栈式 AI 开发平台，旨在帮助开发者快速构建和部署个性化的 AI 应用。
+
+JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
+其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。 
+
+- [详细专题介绍，请点击查看](README-AI.md)
+
+- AI视频介绍
+
+[![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecg_aivideo.png)](https://www.bilibili.com/video/BV1zmd7YFE4w)
+
+
+为什么选择JeecgBoot?
+-----------------------------------
+- 1.采用最新主流前后分离框架（Spring Boot3 + MyBatis + Ant Design4 + Vue3），容易上手；代码生成器依赖性低，灵活的扩展能力，可快速实现二次开发。
+- 2.前端大版本换代，最新版采用 Vue3.0 + TypeScript + Vite6 + Ant Design Vue4 等新技术方案。
+- 3.支持微服务Spring Cloud Alibaba（Nacos、Gateway、Sentinel、Skywalking），提供简易机制，支持单体和微服务自由切换（这样可以满足各类项目需求）。
+- 4.开发效率高，支持在线建表和AI建表，提供强大代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用。
+- 5.代码生成器提供强大模板机制，支持自定义模板，目前提供四套风格模板（单表两套、树模型一套、一对多三套）。
+- 6.提供强大的报表和大屏可视化工具，支持丰富的数据源连接，能够通过拖拉拽方式快速制作报表、大屏和门户设计；支持多种图表类型：柱形图、折线图、散点图、饼图、环形图、面积图、漏斗图、进度图、仪表盘、雷达图、地图等。
+- 7.低代码能力：在线表单（无需编码，通过在线配置表单，实现表单的增删改查，支持单表、树、一对多、一对一等模型，实现人人皆可编码），在线配置零代码开发、所见即所得支持23种类控件。
+- 8.低代码能力：在线报表、在线图表（无需编码，通过在线配置方式，实现数据报表和图形报表，可以快速抽取数据，减轻开发压力，实现人人皆可编码）。
+- 9.Online支持在线增强开发，提供在线代码编辑器，支持代码高亮、代码提示等功能，支持多种语言（Java、SQL、JavaScript等）。
+- 10.封装完善的用户、角色、菜单、组织机构、数据字典、在线定时任务等基础功能，支持访问授权、按钮权限、数据权限等功能。
+- 11.前端UI提供丰富的组件库，支持各种常用组件，如表格、树形控件、下拉框、日期选择器等，满足各种复杂的业务需求 [UI组件库文档](https://help.jeecg.com/category/ui%E7%BB%84%E4%BB%B6%E5%BA%93)。
+- 12.提供APP配套框架，一份多代码多终端适配，一份代码多终端适配，小程序、H5、安卓、iOS、鸿蒙Next。
+- 13.新版APP框架采用Uniapp、Vue3.0、Vite、Wot-design-uni、TypeScript等最新技术栈，包括二次封装组件、路由拦截、请求拦截等功能。实现了与JeecgBoot完美对接：目前已经实现登录、用户信息、通讯录、公告、移动首页、九宫格、聊天、Online表单、仪表盘等功能，提供了丰富的组件。
+- 14.提供了一套成熟的AI应用平台功能，从AI模型、知识库到AI应用搭建，助力企业快速落地AI服务，加速智能化升级。
+- 15.AI能力：目前JeecgBoot支持AI大模型chatgpt和deepseek，现在最新版默认使用deepseek，速度更快质量更高。目前提供了AI对话助手、AI知识库、AI应用、AI建表、AI报表等功能。
+- 16.提供新行编辑表格JVXETable，轻松满足各种复杂ERP布局，拥有更高的性能、更灵活的扩展、更强大的功能。
+- 17.平台首页风格，提供多种组合模式，支持自定义风格；支持门户设计，支持自定义首页。
+- 18.常用共通封装，各种工具类（定时任务、短信接口、邮件发送、Excel导入导出等），基本满足80%项目需求。
+- 19.简易Excel导入导出，支持单表导出和一对多表模式导出，生成的代码自带导入导出功能。
+- 20.集成智能报表工具，报表打印、图像报表和数据导出非常方便，可极其方便地生成PDF、Excel、Word等报表。
+- 21.采用前后分离技术，页面UI风格精美，针对常用组件做了封装：时间、行表格控件、截取显示控件、报表组件、编辑器等。
+- 22.查询过滤器：查询功能自动生成，后台动态拼SQL追加查询条件；支持多种匹配方式（全匹配/模糊查询/包含查询/不匹配查询）。
+- 23.数据权限（精细化数据权限控制，控制到行级、列表级、表单字段级，实现不同人看不同数据，不同人对同一个页面操作不同字段）。
+- 24.接口安全机制，可细化控制接口授权，非常简便实现不同客户端只看自己数据等控制；也提供了基于AK和SK认证鉴权的OpenAPI功能。
+- 25.活跃的社区支持；近年来，随着网络威胁的日益增加，团队在安全和漏洞管理方面积累了丰富的经验，能够为企业提供全面的安全解决方案。
+- 26.权限控制采用RBAC（Role-Based Access Control，基于角色的访问控制）。
+- 27.页面校验自动生成（必须输入、数字校验、金额校验、时间空间等）。
+- 28.支持SaaS服务模式，提供SaaS多租户架构方案。
+- 29.分布式文件服务，集成MinIO、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
+- 30.主流数据库兼容，一套代码完全兼容MySQL、PostgreSQL、Oracle、SQL Server、MariaDB、达梦、人大金仓等主流数据库。
+- 31.集成工作流Flowable，并实现了只需在页面配置流程转向，可极大简化BPM工作流的开发；用BPM的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的Java代码。
+- 32.低代码能力：在线流程设计，采用开源Flowable流程引擎，实现在线画流程、自定义表单、表单挂靠、业务流转。
+- 33.多数据源：极其简易的使用方式，在线配置数据源配置，便捷地从其他数据抓取数据。
+- 34.提供单点登录CAS集成方案，项目中已经提供完善的对接代码。
+- 35.低代码能力：表单设计器，支持用户自定义表单布局，支持单表、一对多表单，支持select、radio、checkbox、textarea、date、popup、列表、宏等控件。
+- 36.专业接口对接机制，统一采用RESTful接口方式，集成Swagger-UI在线接口文档，JWT token安全验证，方便客户端对接。
+- 37.高级组合查询功能，在线配置支持主子表关联查询，可保存查询历史。
+- 38.提供各种系统监控，实时跟踪系统运行情况（监控Redis、Tomcat、JVM、服务器信息、请求追踪、SQL监控）。
+- 39.消息中心（支持短信、邮件、微信推送等）；集成WebSocket消息通知机制。
+- 40.支持多语言，提供国际化方案。
+- 41.数据变更记录日志，可记录数据每次变更内容，通过版本对比功能查看历史变化。
+- 42.提供简单易用的打印插件，支持谷歌、火狐、IE11+等各种浏览器。
+- 43.后端采用Maven分模块开发方式；前端支持菜单动态路由。
+- 44.提供丰富的示例代码，涵盖了常用的业务场景，便于学习和参考。
 
-![公众号](https://jeecg.com/images/jeecg/qrcode_jeecgboot.jpg "在这里输入图片标题")
 
 
 技术架构：
 -----------------------------------
 
+#### 前端
+
+- 前端环境要求：Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上
+- 依赖管理：node、npm、pnpm
+- 前端IDE建议：IDEA、WebStorm、Vscode
+- 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能
+- 最新技术栈：Vue3.0 + TypeScript + Vite6 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6
+
+
 #### 后端
 
 - IDE建议： IDEA (必须安装lombok插件 )
-- 语言：Java 8+ (支持17)
+- 语言：Java 默认jdk17(支持jdk8、jdk21)
 - 依赖管理：Maven
-- 基础框架：Spring Boot 2.7.18
-- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
+- 基础框架：Spring Boot 3.5.5/2.7.18
+- 微服务框架： Spring Cloud Alibaba 2021.0.6.2
 - 持久层框架：MybatisPlus 3.5.3.2
-- 报表工具： JimuReport 1.9.3
-- 安全框架：Apache Shiro 1.12.0，Jwt 3.11.0
+- 报表工具： JimuReport 2.1.2
+- 安全框架：Apache Shiro 1.13.0，Jwt 4.5.0
 - 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
-- 数据库连接池：阿里巴巴Druid 1.1.22
+- 数据库连接池：阿里巴巴Druid 1.1.24
 - AI大模型：支持 `ChatGPT` `DeepSeek`切换
 - 日志打印：logback
 - 缓存：Redis
 - 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
-- 默认数据库脚本：MySQL5.7+
-- [其他数据库，需要自己转](https://my.oschina.net/jeecg/blog/4905722)
+- 默认提供MySQL5.7+数据库脚本
 
+#### 数据库支持
 
-#### 前端
-
-- 前端IDE建议：WebStorm、Vscode
-- 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能
-- 最新技术栈：Vue3.0 + TypeScript + Vite6 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6
-- 依赖管理：node、npm、pnpm
-
-
-#### 前端环境要求
-
-*   本地环境安装 `Node.js 、npm 、pnpm`
-*   pnpm 要求`9+` 版本以上
-*   Node.js 版本建议`v20.15.0`，要求`Node 20+` 版本以上
-
- ` ( 因为Vite6 需要 Node.js 18 / 20+ )`
-
-
-#### 支持库
+> jeecgboot平台支持以下数据库，默认我们只提供mysql脚本，其他数据库可以参考[转库文档](https://my.oschina.net/jeecg/blog/4905722)自己转。
 
 |  数据库   |  支持   |
 | --- | --- |
@@ -133,25 +190,16 @@ AIGC功能清单
 |  Sqlserver2017   |  √   |
 |   PostgreSQL   |  √   |
 |   MariaDB   |  √   |
-|   MariaDB   |  √   |
 |   达梦   |  √   |
 |   人大金仓   |  √   |
 |   TiDB     |  √   |
+|   kingbase8   |  √   |
 
-#### 支持AI大模型
 
-|  AI大模型   |  支持   |
-| --- | --- |
-|   DeepSeek   |  √   |
-|   ChatGTP   |  √   |
-|   Ollama本地搭建大模型   |  √   |
-
-AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 
  
 ## 微服务解决方案
 
-
 - 1、服务注册和发现 Nacos √
 - 2、统一配置中心 Nacos  √
 - 3、路由网关 gateway(三种加载方式) √
@@ -160,7 +208,7 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 - 6、分布式文件 Minio、阿里OSS √ 
 - 7、统一权限控制 JWT + Shiro √
 - 8、服务监控 SpringBootAdmin√
-- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking)
 - 10、消息中间件 RabbitMQ  √
 - 11、分布式任务 xxl-job  √ 
 - 12、分布式事务 Seata
@@ -169,62 +217,23 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 - 15、CAS 单点登录   √
 - 16、路由限流   √
 
-
-#### 微服务方式启动
-
-- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
-- [Docker一键启动微服务前后端](https://help.jeecg.com/java/docker/quickcloud.html)
-
-
 #### 微服务架构图
 ![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "在这里输入图片标题")
 
 
 
-为什么选择JeecgBoot?
+
+
+开源版与企业版区别?
 -----------------------------------
-* 1.采用最新主流前后分离框架（Springboot+Mybatis+antd+vue3），容易上手; 代码生成器依赖性低,灵活的扩展能力，可快速实现二次开发;
-* 2.支持微服务SpringCloud Alibaba(Nacos、Gateway、Sentinel、Skywalking)，提供切换机制支持单体和微服务自由切换
-* 3.开发效率高,采用代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用；引入AI能力，支持自动建表等功能；
-* 4.代码生成器提供强大模板机制，支持自定义模板，目前提供四套风格模板（单表两套、树模型一套、一对多三套）
-* 5.代码生成器非常智能，在线业务建模、在线配置、所见即所得支持23种类控件，一键生成前后端代码，大幅度提升开发效率，不再为重复工作发愁。
-* 6.AI能力：目前JeecgBoot支持AI大模型chatgpt和deepseek，现在最新版默认使用deepseek，速度更快质量更高。目前提供了AI对话助手、AI建表、AI报表等功能。
-* 6.低代码能力：Online在线表单（无需编码，通过在线配置表单，实现表单的增删改查，支持单表、树、一对多、一对一等模型，实现人人皆可编码）
-* 7.低代码能力：Online在线报表、Online在线图表（无需编码，通过在线配置方式，实现数据报表和图形报表，可以快速抽取数据，减轻开发压力，实现人人皆可编码）
-* 9.封装完善的用户、角色、菜单、组织机构、数据字典、在线定时任务等基础功能，支持访问授权、按钮权限、数据权限等功能
-* 10.常用共通封装，各种工具类(定时任务,短信接口,邮件发送,Excel导入导出等),基本满足80%项目需求
-* 11.简易Excel导入导出，支持单表导出和一对多表模式导出，生成的代码自带导入导出功能
-* 12.集成简易报表工具，图像报表和数据导出非常方便，可极其方便的生成图形报表、pdf、excel、word等报表；
-* 13.采用前后分离技术，页面UI风格精美，针对常用组件做了封装：时间、行表格控件、截取显示控件、报表组件，编辑器等等
-* 14.查询过滤器：查询功能自动生成，后台动态拼SQL追加查询条件；支持多种匹配方式（全匹配/模糊查询/包含查询/不匹配查询）；
-* 15.数据权限（精细化数据权限控制，控制到行级，列表级，表单字段级，实现不同人看不同数据，不同人对同一个页面操作不同字段
-* 16.页面校验自动生成(必须输入、数字校验、金额校验、时间空间等);
-* 17.支持SAAS服务模式，提供SaaS多租户架构方案。
-* 18.分布式文件服务，集成minio、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
-* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦、人大金仓等主流数据库。
-* 20.集成工作流flowable，并实现了只需在页面配置流程转向，可极大的简化bpm工作流的开发；用bpm的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的java代码；
-* 21.低代码能力：在线流程设计，采用开源flowable流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
-* 22.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
-* 23.提供单点登录CAS集成方案，项目中已经提供完善的对接代码
-* 24.低代码能力：表单设计器，支持用户自定义表单布局，支持单表，一对多表单、支持select、radio、checkbox、textarea、date、popup、列表、宏等控件
-* 25.专业接口对接机制，统一采用restful接口方式，集成swagger-ui在线接口文档，Jwt token安全验证，方便客户端对接
-* 26.接口安全机制，可细化控制接口授权，非常简便实现不同客户端只看自己数据等控制
-* 27.高级组合查询功能，在线配置支持主子表关联查询，可保存查询历史
-* 28.提供各种系统监控，实时跟踪系统运行情况（监控 Redis、Tomcat、jvm、服务器信息、请求追踪、SQL监控）
-* 29.消息中心（支持短信、邮件、微信推送等等）
-* 30.集成Websocket消息通知机制
-* 31.移动自适应效果优秀，提供APP发布方案：
-* 32.支持多语言，提供国际化方案；
-* 33.数据变更记录日志，可记录数据每次变更内容，通过版本对比功能查看历史变化
-* 34.平台UI强大，实现了移动自适应
-* 35.平台首页风格，提供多种组合模式，支持自定义风格
-* 36.提供简单易用的打印插件，支持谷歌、火狐、IE11+ 等各种浏览器
-* 37.示例代码丰富，提供很多学习案例参考
-* 38.采用maven分模块开发方式
-* 39.支持菜单动态路由
-* 40.权限控制采用 RBAC（Role-Based Access Control，基于角色的访问控制）
-* 41.提供新行编辑表格JVXETable，轻松满足各种复杂ERP布局，拥有更高的性能、更灵活的扩展、更强大的功能
-* 42.提供仪表盘设计器，类大屏设计支持移动端，免费的数据可视化设计工具，支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表和门户设计；目前支持多种图表类型：柱形图、折线图、散点图、饼图、环形图、面积图、漏斗图、进度图、仪表盘、雷达图、地图等等；
+
+ - JeecgBoot开源版采用 [Apache-2.0 license](LICENSE) 协议附加补充条款：允许商用使用，不会造成侵权行为，允许基于本平台软件开展业务系统开发（但在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件).
+ - 商业版与开源版主要区别在于商业版提供了技术支持 和 更多的企业级功能(例如：Online图表、流程监控、流程设计、流程审批、表单设计器、表单视图、积木报表企业版、OA办公、商业APP、零代码应用、Online模块源码等功能). [更多商业功能介绍，点击查看](README-Enterprise.md)
+ - JeecgBoot未来发展方向是：零代码平台的建设，也就是团队的另外一款产品 [敲敲云零代码](https://www.qiaoqiaoyun.com) ，无需编码即可通过拖拽快速搭建企业级应用，与JeecgBoot低代码平台形成互补，满足从简单业务到复杂系统的全场景开发需求，目前已经开源，[欢迎下载](https://qiaoqiaoyun.com/downloadCode)
+
+
+
+
 
 
 ### Jeecg Boot 产品功能蓝图
@@ -232,47 +241,19 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 
 
 
+####  系统功能架构图
 
-### 分支说明
-
-> 主干master更稳定，如果你对最新技术栈无要求，建议采用主干
-
-#### springboot3分支
- - 源码地址：https://github.com/jeecgboot/JeecgBoot/tree/springboot3
- - 架构说明：升级Spring Boot3 & JDK 17 + Undertow + springdoc + fastjson2
- 
-#### springboot3_sas分支
- - 源码地址：https://github.com/jeecgboot/JeecgBoot/tree/springboot3_sas
- - 架构说明：在springboot3分支基础上，采用SpringAuthorizationServer替换Shiro
+![](https://oscimg.oschina.net/oscnet/up-1569487b95a07dbc3599fb1349a2e3aaae1.png)
 
 
 
-### 功能模块
+### 开源版功能清单
 ```
-├─AI开发
-│  ├─支持AI大模型ChatGPT和DeepSeek
-│  ├─AI对话助手
-│  ├─AI建表
-│  ├─AI写文章
-│  ├─AI流程编排（研发中）
-│  ├─AI知识库问答系统（研发中）
-│  ├─AI应用开发平台（研发中）
-│  ├─AI聊天窗口支持嵌入第三方（研发中）
-├─Online在线开发(低代码)
-│  ├─Online在线表单
-│  ├─Online代码生成器
-│  ├─Online在线报表
-│  ├─仪表盘设计器
-│  ├─系统编码规则
-│  ├─系统校验规则
-├─积木报表设计器
-│  ├─打印设计器
-│  ├─数据报表设计
-│  ├─图形报表设计（支持echart）
 ├─系统管理
 │  ├─用户管理
 │  ├─角色管理
 │  ├─菜单管理
+│  ├─首页配置
 │  ├─权限设置（支持按钮权限、数据权限）
 │  ├─表单权限（控制字段禁用、隐藏）
 │  ├─部门管理
@@ -283,7 +264,36 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 │  └─职务管理
 │  └─通讯录
 │  ├─多数据源管理
-│  └─多租户管理（租户管理、租户角色、我的租户）
+│  ├─白名单管理
+│  ├─第三方配置（对接钉钉和企业微信）
+│  └─多租户管理（租户管理、租户角色、我的租户、租户默认套餐管理）
+├─Online在线开发(低代码)
+│  ├─Online在线表单
+│  ├─Online代码生成器
+│  ├─Online在线报表
+│  ├─仪表盘设计器
+│  ├─系统编码规则
+│  ├─系统校验规则
+│  ├─APP版本管理
+├─AI应用平台
+│  ├─AI知识库问答系统
+│  ├─AI大模型管理
+│  ├─AI流程编排
+│  ├─AI流程设计器
+│  ├─AI对话支持图片
+│  ├─AI对话助手(智能问答)
+│  ├─AI建表（Online表单）
+│  ├─AI聊天窗口支持嵌入第三方
+│  ├─AI聊天窗口支持移动端
+│  ├─支持常见大模型ChatGPT和DeepSeek、ollama等等
+│  ├─AI OCR示例
+├─数据可视化
+│  ├─报表设计器(支持打印设计）
+│  ├─大屏设和仪表盘设计
+├─OpenAPI（基于AK和SK认证鉴权）
+│  ├─接口管理
+│  ├─接口授权
+│  ├─接口文档
 ├─消息中心
 │  ├─消息管理
 │  ├─模板管理
@@ -295,8 +305,12 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 │  ├─高级查询器（弹窗自动组合查询条件）
 │  ├─Excel导入导出工具集成（支持单表，一对多 导入导出）
 │  ├─平台移动自适应支持
+│  ├─提供新版uniapp3的代码生成器模板
 ├─系统监控
 │  ├─Gateway路由网关
+│  ├─基于AK和SK认证鉴权OpenAPI功能
+│  ├─定时任务
+│  ├─数据源管理
 │  ├─性能扫描监控
 │  │  ├─监控 Redis
 │  │  ├─Tomcat
@@ -304,13 +318,11 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 │  │  ├─服务器信息
 │  │  ├─请求追踪
 │  │  ├─磁盘监控
-│  ├─定时任务
 │  ├─系统日志
 │  ├─消息中心（支持短信、邮件、微信推送等等）
 │  ├─数据日志（记录数据快照，可对比快照，查看数据变更情况）
-│  ├─系统通知
 │  ├─SQL监控
-│  ├─swagger-ui(在线接口文档)
+│  ├─在线用户
 │─报表示例
 │  ├─曲线图
 │  └─饼状图
@@ -375,46 +387,16 @@ AI集成文档： https://help.jeecg.com/java/ai/aichat.html
 │  ├─提供单点登录CAS集成方案
 │  ├─提供APP发布方案
 │  ├─集成Websocket消息通知机制
-│─更多商业功能
-│  ├─流程设计器
-│  ├─表单设计器
-│  ├─大屏设计器
-│  └─我的任务
-│  └─历史流程
-│  └─历史流程
-│  └─流程实例管理
-│  └─流程监听管理
-│  └─流程表达式
-│  └─我发起的流程
-│  └─我的抄送
-│  └─流程委派、抄送、跳转
-│  └─OA办公组件
-│  └─。。。
-   
+│  ├─支持electron桌面应用打包(支持windows、linux、macOS三大平台)
+│  ├─docker容器支持
+│  ├─提供移动APP框架及源码（Uniapp3版本）支持H5、小程序、APP、鸿蒙Next
+│  ├─提供移动APP低代码设计(Online表单、仪表盘)
 ```
 
 
 
 ### 系统效果
 
-
-##### AI功能
-
-AI聊天助手
-
-![](https://oscimg.oschina.net/oscnet//65298d5710b4e6039a5f802b5f8505c5.png)
-
-AI建表
-
-![](https://oscimg.oschina.net/oscnet/up-381423599f219a67def45dfd9a99df8ef3f.png)
-
-![](https://oscimg.oschina.net/oscnet/up-1508c2b0708c365605f68893044ee11f20d.png)
-
-AI写文章
-
-![](https://oscimg.oschina.net/oscnet/up-e3ee5b1fe497308805aa5e324b72994af79.png)
-
-
 ##### PC端
 ![](https://oscimg.oschina.net/oscnet/up-000530d95df337b43089ac77e562494f454.png)
 
@@ -434,6 +416,22 @@ AI写文章
 ![](https://oscimg.oschina.net/oscnet/up-16c07e000278329b69b228ae3189814b8e9.png)
 
 
+##### AI功能
+
+AI聊天助手
+
+![](https://oscimg.oschina.net/oscnet//65298d5710b4e6039a5f802b5f8505c5.png)
+
+AI建表
+
+![](https://oscimg.oschina.net/oscnet/up-381423599f219a67def45dfd9a99df8ef3f.png)
+
+![](https://oscimg.oschina.net/oscnet/up-1508c2b0708c365605f68893044ee11f20d.png)
+
+AI写文章
+
+![](https://oscimg.oschina.net/oscnet/up-e3ee5b1fe497308805aa5e324b72994af79.png)
+
 
 #####  仪表盘设计器
 
@@ -500,28 +498,6 @@ AI写文章
 ![](https://oscimg.oschina.net/oscnet/up-6b81781b43086819049c4421206810667c5.png)
 
 
-##### 流程设计
-![](https://oscimg.oschina.net/oscnet/up-981ce174e4fbb48c8a2ce4ccfd7372e2994.png)
-
-![](https://oscimg.oschina.net/oscnet/up-1dc0d052149ec675f3e4fad632b82b48add.png)
-
-![](https://oscimg.oschina.net/oscnet/up-de31bc2f9d9b8332c554b0954cc73d79593.png)
-
-![输入图片说明](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "在这里输入图片标题")
-
-![输入图片说明](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "在这里输入图片标题")
-
-![输入图片说明](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "在这里输入图片标题")
-
-
-
-##### 表单设计器
-![](https://oscimg.oschina.net/oscnet/up-5f8cb657615714b02190b355e59f60c5937.png)
-
-![](https://oscimg.oschina.net/oscnet/up-d9659b2f324e33218476ec98c9b400e6508.png)
-
-![](https://oscimg.oschina.net/oscnet/up-4868615395272d3206dbb960ade02dbc291.png)
-
 
 
 

check_jeecgenv.py

@@ -0,0 +1,216 @@
+import os
+import subprocess
+import re
+import sys
+from typing import Tuple, Optional
+
+def run_command(cmd: str) -> Tuple[int, str]:
+    """执行命令并返回退出码和输出"""
+    try:
+        result = subprocess.run(cmd, shell=True, check=False, 
+                              stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                              text=True)
+        return result.returncode, result.stdout.strip()
+    except Exception as e:
+        return -1, str(e)
+
+def check_java() -> bool:
+    """检查JDK 17+是否安装"""
+    print("\n检查JDK 17+...")
+    rc, output = run_command("java -version 2>&1")
+    if rc != 0:
+        print("❌ 未检测到Java，请安装JDK 17+")
+        return False
+    
+    version_pattern = r'"(\d+)(?:\.\d+)*(?:_\d+)?'
+    match = re.search(version_pattern, output)
+    if not match:
+        print("❌ 无法解析Java版本")
+        return False
+    
+    version = int(match.group(1))
+    if version >= 17:
+        print(f"✅ JDK版本 {version} (满足17+要求)")
+        return True
+    else:
+        print(f"❌ JDK版本 {version} (需要17+)")
+        return False
+
+def check_maven() -> bool:
+    """检查Maven是否安装"""
+    print("\n检查Maven...")
+    rc, output = run_command("mvn -v")
+    if rc == 0:
+        print("✅ Maven已安装")
+        return True
+    else:
+        print("❌ Maven未安装")
+        return False
+
+def check_node() -> bool:
+    """检查Node.js 20+是否安装"""
+    print("\n检查Node.js 20+...")
+    rc, output = run_command("node -v")
+    if rc != 0:
+        print("❌ Node.js未安装")
+        return False
+    
+    version_pattern = r'v(\d+)\.\d+\.\d+'
+    match = re.search(version_pattern, output)
+    if not match:
+        print("❌ 无法解析Node.js版本")
+        return False
+    
+    version = int(match.group(1))
+    if version >= 20:
+        print(f"✅ Node.js版本 {version} (满足20+要求)")
+        return True
+    else:
+        print(f"❌ Node.js版本 {version} (需要20+)")
+        return False
+
+def check_pnpm() -> bool:
+    """检查PNPM 9+是否安装"""
+    print("\n检查PNPM 9+...")
+    rc, output = run_command("pnpm -v")
+    if rc != 0:
+        print("❌ PNPM未安装")
+        return False
+    
+    try:
+        # 处理可能的版本号格式：v9.0.0 或 9.0.0 或 9
+        version_str = output.strip().lstrip('v').split('.')[0]
+        version = int(version_str)
+        
+        if version >= 9:
+            print(f"✅ PNPM版本 {output.strip()} (满足9+要求)")
+            return True
+        else:
+            print(f"❌ PNPM版本 {output.strip()} (需要9+)")
+            return False
+    except (ValueError, IndexError):
+        print(f"❌ 无法解析PNPM版本: {output.strip()}")
+        return False
+
+def check_redis_connection() -> bool:
+    """检查Redis连接"""
+    print("\n检查Redis连接...")
+    print("⚠️ 请确保已配置Redis连接信息并在jeecg-boot项目中正确配置")
+    print("⚠️ 此检查需要根据实际项目配置进行验证")
+    print("⚠️ 配置文件位置: jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml")
+    return True
+
+def check_mysql_connection() -> bool:
+    """检查MySQL连接"""
+    print("\n检查MySQL连接...")
+    print("⚠️ 请确保已配置MySQL连接信息并在jeecg-boot项目中正确配置")
+    print("⚠️ 此检查需要根据实际项目配置进行验证")
+    print("⚠️ 配置文件位置: jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml")
+    return True
+
+def print_mysql_config():
+    """打印MySQL配置并提示需要修改的位置"""
+    print("\nMySQL配置参考 (请检查以下配置是否正确):")
+    print("""
+spring.datasource.dynamic.datasource:
+  master:
+    url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: root       # ← 可能需要修改
+    password: root       # ← 可能需要修改
+    driver-class-name: com.mysql.cj.jdbc.Driver
+""")
+
+def check_ai_vector_db() -> bool:
+    """检查AI向量库(pgvector)配置"""
+    print("\n检查AI知识库向量库配置...")
+    print("⚠️ 如果需要使用AI知识库功能，请配置pgvector向量库")
+    print("⚠️ 配置文件位置: jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml")
+    print("\n配置参考:")
+    print("""
+jeecg.ai-rag:
+    embed-store:
+      host: 127.0.0.1       # ← 可能需要修改
+      port: 5432            # ← 可能需要修改
+      database: postgres    # ← 可能需要修改
+      user: postgres        # ← 可能需要修改
+      password: postgres    # ← 可能需要修改
+      table: embeddings     # ← 可能需要修改
+""")
+    print("⚠️ 注意: 请确保已安装PostgreSQL并添加pgvector扩展！docker安装参考：https://help.jeecg.com/aigc/config")
+    return True
+
+def check_ai_config() -> bool:
+    """检查AI账号配置"""
+    print("\n检查AI功能配置...")
+    print("⚠️ 如果需要使用AI聊天功能，请配置AI账号信息")
+    print("⚠️ 配置文件位置: jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml")
+    print("\n配置参考:")
+    print("""
+jeecg:
+  # AI集成
+  ai-chat:
+    enabled: true           # ← 启用AI功能
+    model: deepseek-chat    # ← 模型名称
+    apiKey: ??              # ← 必须修改为您的API Key
+    apiHost: https://api.deepseek.com/v1  # ← API地址
+    timeout: 60             # ← 超时时间(秒)
+""")
+    print("⚠️ 注意: 请确保已获取有效的API Key并正确配置！AI账号注册获取参考： https://help.jeecg.com/java/deepSeekSupport")
+    return True
+
+
+def print_redis_config():
+    """打印Redis配置并提示需要修改的位置"""
+    print("\nRedis配置参考 (请检查以下配置是否正确):")
+    print("""
+spring.redis:
+  database: 0
+  host: 127.0.0.1        # ← 可能需要修改
+  port: 6379             # ← 可能需要修改
+  password: ''           # ← 如果需要密码请修改
+""")
+
+def main():
+    print("="*50)
+    print("JeecgBoot 运行环境检查脚本")
+    print("="*50)
+    
+    all_checks_passed = True
+    
+    # 检查各项依赖
+    if not check_java():
+        all_checks_passed = False
+    
+    if not check_maven():
+        all_checks_passed = False
+    
+    if not check_node():
+        all_checks_passed = False
+    
+    if not check_pnpm():
+        all_checks_passed = False
+    
+    # 数据库提示
+    print("="*50)
+    check_redis_connection()
+    print_redis_config()
+    print("="*50)
+    check_mysql_connection()
+    print_mysql_config()
+    print("="*50)
+    check_ai_config()
+    print("="*50)
+    check_ai_vector_db()
+    
+    print("\n" + "="*50)
+    if all_checks_passed:
+        print("✅ 所有基础环境检查通过")
+        print("⚠️ 注意: 请确保Redis和MySQL、AI账号、向量库pgvector 已正确配置并连接成功")
+    else:
+        print("❌ 部分环境检查未通过，请根据上述提示解决问题")
+    
+    print("="*50)
+
+if __name__ == "__main__":
+    main()
+    input("\n按回车键退出...")  # 等待用户输入

docker-compose-cloud.yml

@@ -18,20 +18,33 @@ services:
       --max_allowed_packet=128M
       --default-authentication-plugin=caching_sha2_password
     ports:
-      - 3306:3306
+      - 13306:3306
     networks:
       - jeecg-boot
 
   jeecg-boot-redis:
     image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
-    ports:
-      - 6379:6379
+#    ports:
+#      - 6379:6379
     restart: always
     hostname: jeecg-boot-redis
     container_name: jeecg-boot-redis
     networks:
       - jeecg-boot
 
+  jeecg-boot-pgvector:
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
+    container_name: jeecg-boot-pgvector
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: vector_db
+    ports:
+      - 5432:5432
+    restart: always
+    networks:
+      - jeecg-boot
+      
   jeecg-boot-nacos:
     restart: always
     build:
@@ -121,6 +134,7 @@ services:
   jeecg-vue:
     build:
       context: ./jeecgboot-vue3
+      dockerfile: Dockerfile.cloud
     container_name: jeecgboot-vue3-nginx
     image: jeecgboot-vue3
     depends_on:

docker-compose.yml

@@ -18,20 +18,33 @@ services:
       --max_allowed_packet=128M
       --default-authentication-plugin=caching_sha2_password
     ports:
-      - 3306:3306
+      - 13306:3306
     networks:
       - jeecg-boot
 
   jeecg-boot-redis:
     image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
-    ports:
-      - 6379:6379
+    # ports:
+    #   - 3792:6379
     restart: always
     hostname: jeecg-boot-redis
     container_name: jeecg-boot-redis
     networks:
       - jeecg-boot
 
+  jeecg-boot-pgvector:
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
+    container_name: jeecg-boot-pgvector
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: vector_db
+    ports:
+      - 5432:5432
+    restart: always
+    networks:
+      - jeecg-boot
+      
   jeecg-boot-system:
     build:
       context: ./jeecg-boot/jeecg-module-system/jeecg-system-start

jeecg-boot/README.md

@@ -2,12 +2,12 @@
 JeecgBoot 低代码开发平台
 ===============
 
-当前最新版本： 3.7.3（发布日期：2025-02-10） 
+当前最新版本： 3.8.2（发布日期：2025-08-04） 
 
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
-[![](https://img.shields.io/badge/version-3.7.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.8.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -35,7 +35,7 @@ JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端
 
 - 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
 - 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart)
-- QQ交流群 ： ⑩716488839、⑨808791225、其他(满)
+- QQ交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
 - 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
 > 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 
 
@@ -44,14 +44,14 @@ JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端
 启动项目
 -----------------------------------
 
-- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
-- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick.html)
+- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup)
+- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick)
 
 
 微服务启动
 -----------------------------------
-- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
-- [Docker启动微服务后台](https://help.jeecg.com/java/docker/springcloud.html)
+- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
+- [Docker启动微服务后台](https://help.jeecg.com/java/docker/springcloud)
 
 
 
@@ -66,10 +66,10 @@ JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端
 - 基础框架：Spring Boot 2.7.18
 - 微服务框架： Spring Cloud Alibaba 2021.0.1.0
 - 持久层框架：MybatisPlus 3.5.3.2
-- 报表工具： JimuReport 1.8.1
+- 报表工具： JimuReport 1.9.4
 - 安全框架：Apache Shiro 1.12.0，Jwt 3.11.0
 - 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
-- 数据库连接池：阿里巴巴Druid 1.1.22
+- 数据库连接池：阿里巴巴Druid 1.1.24
 - 日志打印：logback
 - 缓存：Redis
 - 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
@@ -113,7 +113,7 @@ JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端
 - 6、分布式文件 Minio、阿里OSS √ 
 - 7、统一权限控制 JWT + Shiro √
 - 8、服务监控 SpringBootAdmin√
-- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking)
 - 10、消息中间件 RabbitMQ  √
 - 11、分布式任务 xxl-job  √ 
 - 12、分布式事务 Seata

jeecg-boot/db/其他数据库脚本/oracle11g dmp说明.txt

@@ -0,0 +1,5 @@
+oracle导出编码：  export NLS_LANG=AMERICAN_AMERICA.ZHS16GBK
+
+导出用户：  jeecgbootos
+
+导入命令：  imp scott/tiger@orcl file=jeecgboot-oracle11g.dmp

jeecg-boot/db/版本升级说明.md

@@ -3,7 +3,6 @@
 > JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。
 
 ### 增量升级方案
-
 #### 1.代码合并
  本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；
 
@@ -12,12 +11,5 @@
 - 其他库请手工执行SQL, 目录： `jeecg-module-system\jeecg-system-start\src\main\resources\flyway\sql\mysql`
 > 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。
 
-#### 3.其他数据库脚本说明
-  原先官方默认提供oracle和SqlServer的脚本，但是维护成本太高，未提供脚本的数据库，可以参考下面的文档自己转
-   https://my.oschina.net/jeecg/blog/4905722
-   （注意：定时任务的表qrtz_*，需要删掉用原始的脚本重新执行一下）
-   quartz-2.2.3-distribution.tar.gz放到百度网盘中，大家自己下载，执行所需数据库脚本
-   https://pan.baidu.com/s/1WrmZdUuAPg3iBwJ-LoHWyg?pwd=8mdz 
-
-#### 4.兼容问题
+#### 3.兼容问题
  每次发版，会针对不兼容地方重点说明。

jeecg-boot/docker-compose.yml

@@ -18,7 +18,7 @@ services:
       --max_allowed_packet=128M
       --default-authentication-plugin=caching_sha2_password
     ports:
-      - 3306:3306
+      - 13306:3306
     networks:
       - jeecg-boot
 
@@ -32,6 +32,19 @@ services:
     networks:
       - jeecg-boot
 
+  jeecg-boot-pgvector:
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
+    container_name: jeecg-boot-pgvector
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: vector_db
+    ports:
+      - 5432:5432
+    restart: always
+    networks:
+      - jeecg-boot
+        
   jeecg-boot-system:
     build:
       context: ./jeecg-module-system/jeecg-system-start

jeecg-boot/jeecg-boot-base-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>3.7.3</version>
+		<version>3.8.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-core</artifactId>
@@ -49,6 +49,16 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
 		<!-- websocket -->
 		<dependency>
@@ -101,6 +111,16 @@
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>${mybatis-plus.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
+			<version>${mybatis-plus.version}</version>
+		</dependency>
+		<!-- minidao -->
+		<dependency>
+			<groupId>org.jeecgframework</groupId>
+			<artifactId>minidao-spring-boot-starter-jsqlparser-4.9</artifactId>
+		</dependency>
 
 		<!-- druid -->
 		<dependency>
@@ -201,14 +221,9 @@
 		</dependency>
 
 		<!-- knife4j -->
-<!--		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-spring-boot-starter</artifactId>
-			<version>3.0.3</version>
-		</dependency>-->
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
+			<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
 			<version>${knife4j-spring-boot-starter.version}</version>
 		</dependency>
 
@@ -218,6 +233,16 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>codegenerate</artifactId>
 			<version>${codegenerate.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-io</artifactId>
+					<groupId>commons-io</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>mysql-connector-java</artifactId>
+					<groupId>mysql</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- AutoPoi Excel工具类-->
@@ -247,6 +272,12 @@
 		<dependency>
 			<groupId>io.minio</groupId>
 			<artifactId>minio</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>checker-qual</artifactId>
+					<groupId>org.checkerframework</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- 阿里云短信 -->
@@ -288,7 +319,6 @@
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-crypto</artifactId>
 		</dependency>
-
 		<!-- chatgpt -->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java

@@ -92,6 +92,12 @@ public class MessageDTO implements Serializable {
     
     //---【邮件相关参数】-------------------------------------------------------------
 
+    /**
+     * 枚举：org.jeecg.common.constant.enums.NoticeTypeEnum
+     * 通知类型(system:系统消息、file:知识库、flow:流程、plan:日程计划、meeting:会议)
+     */
+    private String noticeType;
+    
     public MessageDTO(){
     }
 

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java

@@ -1,8 +1,8 @@
 package org.jeecg.common.api.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.jeecg.common.constant.CommonConstant;
 
@@ -15,7 +15,7 @@ import java.io.Serializable;
  * @date  2019年1月19日
  */
 @Data
-@ApiModel(value="接口返回对象", description="接口返回对象")
+@Schema(description="接口返回对象")
 public class Result<T> implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -23,31 +23,31 @@ public class Result<T> implements Serializable {
 	/**
 	 * 成功标志
 	 */
-	@ApiModelProperty(value = "成功标志")
+	@Schema(description = "成功标志")
 	private boolean success = true;
 
 	/**
 	 * 返回处理消息
 	 */
-	@ApiModelProperty(value = "返回处理消息")
+	@Schema(description = "返回处理消息")
 	private String message = "";
 
 	/**
 	 * 返回代码
 	 */
-	@ApiModelProperty(value = "返回代码")
+	@Schema(description = "返回代码")
 	private Integer code = 0;
 	
 	/**
 	 * 返回数据对象 data
 	 */
-	@ApiModelProperty(value = "返回数据对象")
+	@Schema(description = "返回数据对象")
 	private T result;
 	
 	/**
 	 * 时间戳
 	 */
-	@ApiModelProperty(value = "时间戳")
+	@Schema(description = "时间戳")
 	private long timestamp = System.currentTimeMillis();
 
 	public Result() {

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -303,6 +303,11 @@ public interface CommonConstant {
      */
     String SYS_USER_ID_MAPPING_CACHE = "sys:cache:user:id_mapping";
 
+    /**
+     * 系统角色管理员编码
+     */
+    String SYS_ROLE_ADMIN = "admin";
+
     /**
      * 考勤补卡业务状态 （1：同意  2：不同意）
      */
@@ -428,6 +433,11 @@ public interface CommonConstant {
     */
    String NOTICE_MSG_BUS_TYPE = "NOTICE_MSG_BUS_TYPE";
 
+    /**
+     * 通知类型，用于区分来源 file 知识 flow 流程 plan 日程 system 系统消息 
+     */
+    String NOTICE_TYPE = "noticeType";
+
     /**
      * 邮箱消息中地址登录时地址后携带的token,需要替换成真实的token值
      */
@@ -629,4 +639,24 @@ public interface CommonConstant {
     * 修改手机号验证码请求次数超出
     */
    Integer PHONE_SMS_FAIL_CODE = 40002;
+
+
+    /**
+     * 自定义首页关联关系(ROLE:表示角色 USER:表示用户)
+     *
+     */
+    String HOME_RELATION_ROLE = "ROLE";
+    String HOME_RELATION_USER = "USER";
+
+    /**
+     * 是否置顶(0否 1是)
+     */
+    Integer IZ_TOP_1 = 1;
+    Integer IZ_TOP_0 = 0;
+    
+    
+    //关注流程缓存前缀
+    String FLOW_FOCUS_NOTICE_PREFIX = "flow:runtimeData:focus:notice:";
+    //任务缓办时间缓存前缀
+    String FLOW_TASK_DELAY_PREFIX = "flow:runtimeData:task:delay:";
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java

@@ -4,6 +4,20 @@ package org.jeecg.common.constant;
  * @author: jeecg-boot
  */
 public interface DataBaseConstant {
+
+	/**
+	 * 内置的系统变量键列表
+	 */
+	public static final String[] SYSTEM_KEYS = {
+			DataBaseConstant.SYS_ORG_CODE, DataBaseConstant.SYS_ORG_CODE_TABLE, DataBaseConstant.SYS_MULTI_ORG_CODE,
+			DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE, DataBaseConstant.SYS_ORG_ID, DataBaseConstant.SYS_ORG_ID_TABLE,
+			DataBaseConstant.SYS_ROLE_CODE, DataBaseConstant.SYS_ROLE_CODE_TABLE, DataBaseConstant.SYS_USER_CODE,
+			DataBaseConstant.SYS_USER_CODE_TABLE, DataBaseConstant.SYS_USER_ID, DataBaseConstant.SYS_USER_ID_TABLE,
+			DataBaseConstant.SYS_USER_NAME, DataBaseConstant.SYS_USER_NAME_TABLE, DataBaseConstant.SYS_DATE,
+			DataBaseConstant.SYS_DATE_TABLE, DataBaseConstant.SYS_TIME, DataBaseConstant.SYS_TIME_TABLE,
+			DataBaseConstant.SYS_BASE_PATH
+	};
+	
 	//*********数据库类型****************************************
 
     /**MYSQL数据库*/

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java

@@ -9,13 +9,13 @@ import org.apache.commons.lang3.StringUtils;
 public enum DySmsEnum {
 
     /**登录短信模板编码*/
-	LOGIN_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
+    LOGIN_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
     /**忘记密码短信模板编码*/
-	FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
-	/**修改密码短信模板编码*/
-	CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"),
-	/**注册账号短信模板编码*/
-	REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","code");
+    FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
+    /**修改密码短信模板编码*/
+    CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"),
+    /**注册账号短信模板编码*/
+    REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","code");
 	
 	/**
 	 * 短信模板编码

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java

@@ -13,6 +13,10 @@ public enum EmailTemplateEnum {
      * 流程催办
      */
     BPM_CUIBAN_EMAIL("bpm_cuiban_email", "/templates/email/bpm_cuiban_email.ftl"),
+    /**
+     * 流程抄送
+     */
+    BPM_CC_EMAIL("bpm_cc_email", "/templates/email/bpm_cc_email.ftl"),
     /**
      * 流程新任务
      */

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/NoticeTypeEnum.java

@@ -0,0 +1,75 @@
+package org.jeecg.common.constant.enums;
+
+/**
+* @Description: 文件类型枚举类
+*
+* @author: wangshuai
+* @date: 2025/6/26 17:29
+*/
+public enum NoticeTypeEnum {
+    
+    //VUE3专用
+    NOTICE_TYPE_FILE("知识库消息","file"),
+    NOTICE_TYPE_FLOW("工作流消息","flow"),
+    NOTICE_TYPE_PLAN("日程消息","plan"),
+    //暂时没用到
+    NOTICE_TYPE_MEETING("会议消息","meeting"),
+    NOTICE_TYPE_SYSTEM("系统消息","system");
+
+    /**
+     * 文件类型名称
+     */
+    private String name;
+
+    /**
+     * 文件类型值
+     */
+    private String value;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    NoticeTypeEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * 获取聊天通知类型
+     * 
+     * @param value
+     * @return
+     */
+    public static String getChatNoticeType(String value){
+        return value + "Notice";
+    }
+
+    /**
+     * 获取通知名称
+     *
+     * @param value
+     * @return
+     */
+    public static String getNoticeNameByValue(String value){
+        value = value.replace("Notice","");
+        for (NoticeTypeEnum e : NoticeTypeEnum.values()) {
+            if (e.getValue().equals(value)) {
+                return e.getName();
+            }
+        }
+        return "系统消息";
+    }
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootAssertException.java

@@ -0,0 +1,21 @@
+package org.jeecg.common.exception;
+
+/**
+ * jeecgboot断言异常
+ * for [QQYUN-10990]AIRAG
+ * @author chenrui
+ * @date 2025/2/14 14:31
+ */
+public class JeecgBootAssertException extends JeecgBootException {
+	private static final long serialVersionUID = 1L;
+
+
+	public JeecgBootAssertException(String message) {
+		super(message);
+	}
+
+	public JeecgBootAssertException(String message, int errCode) {
+		super(message, errCode);
+	}
+
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java

@@ -1,6 +1,7 @@
 package org.jeecg.common.exception;
 
 import cn.hutool.core.util.ObjectUtil;
+import io.undertow.server.RequestTooBigException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.shiro.SecurityUtils;
@@ -23,16 +24,20 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.redis.connection.PoolException;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.ObjectError;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
+import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 异常处理器
@@ -47,6 +52,13 @@ public class JeecgBootExceptionHandler {
 	@Resource
 	BaseCommonService baseCommonService;
 
+	@ExceptionHandler(MethodArgumentNotValidException.class)
+	public Result<?> handleValidationExceptions(MethodArgumentNotValidException e) {
+		log.error(e.getMessage(), e);
+		addSysLog(e);
+		return Result.error("校验失败！" + e.getBindingResult().getAllErrors().stream().map(ObjectError::getDefaultMessage).collect(Collectors.joining(",")));
+	}
+	
 	/**
 	 * 处理自定义异常
 	 */
@@ -156,6 +168,27 @@ public class JeecgBootExceptionHandler {
         return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! ");
     }
 
+	/**
+	 * 处理文件过大异常.
+	 * jdk17中的MultipartException异常类已经被拆分成了MultipartException和MaxUploadSizeExceededException
+	 * for [QQYUN-11716]上传大图片失败没有精确提示
+	 * @param e
+	 * @return
+	 * @author chenrui
+	 * @date 2025/4/8 16:13
+	 */
+	@ExceptionHandler(MultipartException.class)
+	public Result<?> handleMaxUploadSizeExceededException(MultipartException e) {
+		Throwable cause = e.getCause();
+		if (cause instanceof IllegalStateException && cause.getCause() instanceof RequestTooBigException) {
+			log.error("文件大小超出限制: {}", cause.getMessage(), e);
+			addSysLog(e);
+			return Result.error("文件大小超出限制, 请压缩或降低文件质量!");
+		} else {
+			return handleException(e);
+		}
+	}
+
     @ExceptionHandler(DataIntegrityViolationException.class)
     public Result<?> handleDataIntegrityViolationException(DataIntegrityViolationException e) {
     	log.error(e.getMessage(), e);
@@ -211,11 +244,16 @@ public class JeecgBootExceptionHandler {
         } catch (NullPointerException | BeansException ignored) {
         }
         if (null != request) {
+			//update-begin---author:chenrui ---date:20250408  for：[QQYUN-11716]上传大图片失败没有精确提示------------
 			//请求的参数
-			Map<String, String[]> parameterMap = request.getParameterMap();
-			if(!CollectionUtils.isEmpty(parameterMap)){
-				log.setMethod(oConvertUtils.mapToString(request.getParameterMap()));
+			if (!isTooBigException(e)) {
+				// 文件上传过大异常时不能获取参数,否则会报错
+				Map<String, String[]> parameterMap = request.getParameterMap();
+				if(!CollectionUtils.isEmpty(parameterMap)) {
+					log.setMethod(oConvertUtils.mapToString(request.getParameterMap()));
+				}
 			}
+			//update-end---author:chenrui ---date:20250408  for：[QQYUN-11716]上传大图片失败没有精确提示------------
             // 请求地址
             log.setRequestUrl(request.getRequestURI());
             //设置IP地址
@@ -241,4 +279,26 @@ public class JeecgBootExceptionHandler {
     }
 	//update-end---author:chenrui ---date:20240423  for：[QQYUN-8732]把错误的日志都抓取了 方便后续处理，单独弄个日志类型------------
 
+	/**
+	 * 是否文件过大异常
+	 * for [QQYUN-11716]上传大图片失败没有精确提示
+	 * @param e
+	 * @return
+	 * @author chenrui
+	 * @date 2025/4/8 20:21
+	 */
+	private static boolean isTooBigException(Throwable e) {
+		boolean isTooBigException = false;
+		if(e instanceof MultipartException){
+			Throwable cause = e.getCause();
+			if (cause instanceof IllegalStateException && cause.getCause() instanceof RequestTooBigException){
+				isTooBigException = true;
+			}
+		}
+		if(e instanceof MaxUploadSizeExceededException){
+			isTooBigException = true;
+		}
+		return isTooBigException;
+	}
+
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -30,20 +30,20 @@ public class JeecgEntity implements Serializable {
      * ID
      */
     @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private java.lang.String id;
 
     /**
      * 创建人
      */
-    @ApiModelProperty(value = "创建人")
+    @Schema(description = "创建人")
     @Excel(name = "创建人", width = 15)
     private java.lang.String createBy;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -52,14 +52,14 @@ public class JeecgEntity implements Serializable {
     /**
      * 更新人
      */
-    @ApiModelProperty(value = "更新人")
+    @Schema(description = "更新人")
     @Excel(name = "更新人", width = 15)
     private java.lang.String updateBy;
 
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -11,6 +11,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
@@ -257,7 +258,68 @@ public class QueryGenerator {
 		if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) {
 			order = parameterMap.get(ORDER_TYPE)[0];
 		}
-        log.debug("排序规则>>列:" + column + ",排序方式:" + order);
+		
+		if(oConvertUtils.isNotEmpty(column)){
+			log.info("单字段排序规则>> column:" + column + ",排序方式:" + order);
+		}
+
+		// 1. 列表多字段排序优先
+		if(parameterMap!=null&& parameterMap.containsKey("sortInfoString")) {
+			// 多字段排序
+			String sortInfoString = parameterMap.get("sortInfoString")[0];
+			log.info("多字段排序规则>> sortInfoString:" + sortInfoString);
+			List<OrderItem> orderItemList = SqlConcatUtil.getQueryConditionOrders(column, order, sortInfoString);
+			log.info(orderItemList.toString());
+			if (orderItemList != null && !orderItemList.isEmpty()) {
+				for (OrderItem item : orderItemList) {
+					// 一、获取排序数据库字段
+					String columnName = item.getColumn();
+					// 1.字典字段，去掉字典翻译文本后缀
+					if(columnName.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+						columnName = columnName.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+					}
+					// 2.实体驼峰字段转为数据库字段
+					columnName = SqlInjectionUtil.getSqlInjectSortField(columnName);
+
+					// 二、设置字段排序规则
+					if (item.isAsc()) {
+						queryWrapper.orderByAsc(columnName);
+					} else {
+						queryWrapper.orderByDesc(columnName);
+					}
+				}
+			}
+			return;
+		}
+
+		// 2. 列表单字段默认排序
+		if(oConvertUtils.isEmpty(column) && parameterMap!=null&& parameterMap.containsKey("defSortString")) {
+			// 多字段排序
+			String sortInfoString = parameterMap.get("defSortString")[0];
+			log.info("默认多字段排序规则>> defSortString:" + sortInfoString);
+			List<OrderItem> orderItemList = SqlConcatUtil.getQueryConditionOrders(column, order, sortInfoString);
+			log.info(orderItemList.toString());
+			if (orderItemList != null && !orderItemList.isEmpty()) {
+				for (OrderItem item : orderItemList) {
+					// 一、获取排序数据库字段
+					String columnName = item.getColumn();
+					// 1.字典字段，去掉字典翻译文本后缀
+					if(columnName.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+						columnName = columnName.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+					}
+					// 2.实体驼峰字段转为数据库字段
+					columnName = SqlInjectionUtil.getSqlInjectSortField(columnName);
+					
+					// 二、设置字段排序规则
+					if (item.isAsc()) {
+						queryWrapper.orderByAsc(columnName);
+					} else {
+						queryWrapper.orderByDesc(columnName);
+					}
+				}
+			}
+			return;
+		}
 		
 		//update-begin-author:scott date:2022-11-07 for:避免用户自定义表无默认字段{创建时间}，导致排序报错
 		//TODO 避免用户自定义表无默认字段创建时间，导致排序报错

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java

@@ -6,6 +6,17 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -20,16 +31,6 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 /**
  * @Author Scott
  * @Date 2018-07-12 14:23
@@ -199,11 +200,13 @@ public class JwtUtil {
 		}
 		//update-begin---author:chenrui ---date:20250107  for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
 		// 是否存在字符串标志
-		boolean multiStr = false;
+		boolean multiStr;
 		if(oConvertUtils.isNotEmpty(key) && key.trim().matches("^\\[\\w+]$")){
 			key = key.substring(1,key.length()-1);
 			multiStr = true;
-		}
+		} else {
+            multiStr = false;
+        }
 		//update-end---author:chenrui ---date:20250107  for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
 		//替换为当前系统时间(年月日)
 		if (key.equals(DataBaseConstant.SYS_DATE)|| key.toLowerCase().equals(DataBaseConstant.SYS_DATE_TABLE)) {
@@ -286,7 +289,15 @@ public class JwtUtil {
 					//update-begin---author:chenrui ---date:20250107  for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
 					returnValue = user.getSysMultiOrgCode().stream()
 							.filter(Objects::nonNull)
-							.map(orgCode -> "'" + orgCode + "'")
+							//update-begin---author:chenrui ---date:20250224  for：[issues/7288]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
+							.map(orgCode -> {
+								if (multiStr) {
+									return "'" + orgCode + "'";
+								} else {
+									return orgCode;
+								}
+							})
+							//update-end---author:chenrui ---date:20250224  for：[issues/7288]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
 							.collect(Collectors.joining(", "));
 					//update-end---author:chenrui ---date:20250107  for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------
 				}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java

@@ -1,13 +1,22 @@
 package org.jeecg.common.system.util;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
 import org.jeecg.common.constant.SymbolConstant;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.oConvertUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -240,4 +249,46 @@ public class SqlConcatUtil {
         return CommonUtils.getDatabaseType();
     }
 
+    /**
+     * 获取前端传过来的 "多字段排序信息: sortInfoString"
+     * @return
+     */
+    public static List<OrderItem> getQueryConditionOrders(String column, String order, String queryInfoString){
+        List<OrderItem> list = new ArrayList<>();
+        if(oConvertUtils.isEmpty(queryInfoString)){
+            //默认以创建时间倒序查询
+            if(CommonConstant.ORDER_TYPE_DESC.equalsIgnoreCase(order)){
+                list.add(OrderItem.desc(column));
+            }else{
+                list.add(OrderItem.asc(column));
+            }
+        }else{
+            // 【TV360X-967】URL解码（微服务下需要）
+            if (queryInfoString.contains("%22column%22")) {
+                log.info("queryInfoString 原生 = {}", queryInfoString);
+                try {
+                    queryInfoString = URLDecoder.decode(queryInfoString, "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    throw new JeecgBootException(e);
+                }
+                log.info("queryInfoString 解码 = {}", queryInfoString);
+            }
+            JSONArray array = JSONArray.parseArray(queryInfoString);
+            Iterator it = array.iterator();
+            while(it.hasNext()){
+                JSONObject json = (JSONObject)it.next();
+                String tempColumn = json.getString("column");
+                if(oConvertUtils.isNotEmpty(tempColumn)){
+                    String tempOrder = json.getString("order");
+                    if(CommonConstant.ORDER_TYPE_DESC.equalsIgnoreCase(tempOrder)){
+                        list.add(OrderItem.desc(tempColumn));
+                    }else{
+                        list.add(OrderItem.asc(tempColumn));
+                    }
+                }
+            }
+        }
+        return list;
+    }
+    
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -68,6 +68,12 @@ public class LoginUser {
 	@SensitiveField
 	private String avatar;
 
+	/**
+	 * 工号
+	 */
+	@SensitiveField
+	private String workNo;
+
 	/**
 	 * 生日
 	 */

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/AssertUtils.java

@@ -0,0 +1,239 @@
+package org.jeecg.common.util;
+
+
+import org.jeecg.common.exception.JeecgBootAssertException;
+
+/**
+ * 断言检查工具
+ * for for [QQYUN-10990]AIRAG
+ * @author chenrui
+ * @date 2017-06-22 10:05:56
+ */
+public class AssertUtils {
+
+    /**
+     * 确保对象为空,如果不为空抛出异常
+     *
+     * @param msg
+     * @param obj
+     * @throws JeecgBootAssertException
+     * @author chenrui
+     * @date 2017-06-22 10:05:56
+     */
+    public static void assertEmpty(String msg, Object obj) {
+        if (oConvertUtils.isObjectNotEmpty(obj)) {
+            throw new JeecgBootAssertException(msg);
+        }
+    }
+
+
+    /**
+     * 确保对象不为空,如果为空抛出异常
+     *
+     * @param msg
+     * @param obj
+     * @throws JeecgBootAssertException
+     * @author chenrui
+     * @date 2017-06-22 10:05:56
+     */
+    public static void assertNotEmpty(String msg, Object obj) {
+        if (oConvertUtils.isObjectEmpty(obj)) {
+            throw new JeecgBootAssertException(msg);
+        }
+    }
+
+
+    /**
+     * 验证对象是否相同
+     *
+     * @param message
+     * @param expected
+     * @param actual
+     * @author chenrui
+     * @date 2018/9/12 15:45
+     */
+    public static void assertEquals(String message, Object expected,
+                                    Object actual) {
+        if (oConvertUtils.isEqual(expected, actual)) {
+            return;
+        }
+        throw new JeecgBootAssertException(message);
+    }
+
+    /**
+     * 验证不相同
+     *
+     * @param message
+     * @param expected
+     * @param actual
+     * @author chenrui
+     * @date 2018/9/12 15:45
+     */
+    public static void assertNotEquals(String message, Object expected,
+                                       Object actual) {
+        if (oConvertUtils.isEqual(expected, actual)) {
+            throw new JeecgBootAssertException(message);
+        }
+
+    }
+
+    /**
+     * 验证是否相等
+     *
+     * @param message
+     * @param expected
+     * @param actual
+     * @author chenrui
+     * @date 2018/9/12 15:45
+     */
+    public static void assertSame(String message, Object expected,
+                                  Object actual) {
+        if (expected == actual) {
+            return;
+        }
+        throw new JeecgBootAssertException(message);
+    }
+
+    /**
+     * 验证不相等
+     *
+     * @param message
+     * @param unexpected
+     * @param actual
+     * @author chenrui
+     * @date 2018/9/12 15:45
+     */
+    public static void assertNotSame(String message, Object unexpected,
+                                     Object actual) {
+        if (unexpected == actual) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+    /**
+     * 验证是否为真
+     *
+     * @param message
+     * @param condition
+     */
+    public static void assertTrue(String message, boolean condition) {
+        if (!condition) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+    /**
+     * 验证 condition是否为false
+     *
+     * @param message
+     * @param condition
+     */
+    public static void assertFalse(String message, boolean condition) {
+        assertTrue(message, !condition);
+    }
+
+
+    /**
+     * 验证是否存在
+     *
+     * @param message
+     * @param obj
+     * @param objs
+     * @param <T>
+     * @throws JeecgBootAssertException
+     * @author chenrui
+     * @date 2018/1/31 22:14
+     */
+    public static <T> void assertIn(String message, T obj, T... objs) {
+        assertNotEmpty(message, obj);
+        assertNotEmpty(message, objs);
+        if (!oConvertUtils.isIn(obj, objs)) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+    /**
+     * 验证是否不存在
+     *
+     * @param message
+     * @param obj
+     * @param objs
+     * @param <T>
+     * @throws JeecgBootAssertException
+     * @author chenrui
+     * @date 2018/1/31 22:14
+     */
+
+    public static <T> void assertNotIn(String message, T obj, T... objs) {
+        assertNotEmpty(message, obj);
+        assertNotEmpty(message, objs);
+        if (oConvertUtils.isIn(obj, objs)) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+
+    /**
+     * 确保src大于des
+     *
+     * @param message
+     * @param src
+     * @param des
+     * @author chenrui
+     * @date 2018/9/19 15:30
+     */
+    public static void assertGt(String message, Number src, Number des) {
+        if (oConvertUtils.isGt(src, des)) {
+            return;
+        }
+        throw new JeecgBootAssertException(message);
+    }
+
+    /**
+     * 确保src大于等于des
+     *
+     * @param message
+     * @param src
+     * @param des
+     * @author chenrui
+     * @date 2018/9/19 15:30
+     */
+    public static void assertGe(String message, Number src, Number des) {
+        if (oConvertUtils.isGe(src, des)) {
+            return;
+        }
+        throw new JeecgBootAssertException(message);
+    }
+
+
+    /**
+     * 确保src小于des
+     *
+     * @param message
+     * @param src
+     * @param des
+     * @author chenrui
+     * @date 2018/9/19 15:30
+     */
+    public static void assertLt(String message, Number src, Number des) {
+        if (oConvertUtils.isGe(src, des)) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+    /**
+     * 确保src小于等于des
+     *
+     * @param message
+     * @param src
+     * @param des
+     * @author chenrui
+     * @date 2018/9/19 15:30
+     */
+    public static void assertLe(String message, Number src, Number des) {
+        if (oConvertUtils.isGt(src, des)) {
+            throw new JeecgBootAssertException(message);
+        }
+    }
+
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java

@@ -8,6 +8,7 @@ import org.jeecg.common.constant.ServiceNameConstants;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -16,6 +17,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
  * @Description: spring上下文工具类
  * @author: jeecg-boot
  */
+@Lazy(false)
 @Component
 public class SpringContextUtils implements ApplicationContextAware {
 

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java

@@ -17,6 +17,12 @@ import java.util.regex.Pattern;
  */
 @Slf4j
 public class SqlInjectionUtil {
+
+	/**
+	 * sql注入黑名单数据库名
+	 */
+	public final static String XSS_STR_TABLE = "peformance_schema|information_schema";
+
 	/**
 	 * 默认—sql注入关键词
 	 */
@@ -168,6 +174,27 @@ public class SqlInjectionUtil {
 		return false;
 	}
 
+	/**
+	 * 判断是否存在SQL注入关键词字符串
+	 *
+	 * @param keyword
+	 * @return
+	 */
+	@SuppressWarnings("AlibabaUndefineMagicConstant")
+	private static boolean isExistSqlInjectTableKeyword(String sql, String keyword) {
+		// 需要匹配的，sql注入关键词
+		String[] matchingTexts = new String[]{"`" + keyword, "(" + keyword, "(`" + keyword};
+		for (String matchingText : matchingTexts) {
+			String[] checkTexts = new String[]{" " + matchingText, "from" + matchingText};
+			for (String checkText : checkTexts) {
+				if (sql.contains(checkText)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * sql注入过滤处理，遇到注入关键字抛异常
 	 * 
@@ -208,6 +235,14 @@ public class SqlInjectionUtil {
 				throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value);
 			}
 		}
+		String[] xssTableArr = XSS_STR_TABLE.split("\\|");
+		for (String xssTableStr : xssTableArr) {
+            if (isExistSqlInjectTableKeyword(value, xssTableStr)) {
+                log.error(SqlInjectionUtil.SQL_INJECTION_KEYWORD_TIP, xssTableStr);
+                log.error(SqlInjectionUtil.SQL_INJECTION_TIP_VARIABLE, value);
+                throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value);
+            }
+        }
 
 		// 三、SQL注入检测存在绕过风险 (正则校验)
 		for (String regularOriginal : XSS_REGULAR_STR_ARRAY) {
@@ -244,6 +279,14 @@ public class SqlInjectionUtil {
 				throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value);
 			}
 		}
+		String[] xssTableArr = XSS_STR_TABLE.split("\\|");
+		for (String xssTableStr : xssTableArr) {
+			if (isExistSqlInjectTableKeyword(value, xssTableStr)) {
+				log.error(SqlInjectionUtil.SQL_INJECTION_KEYWORD_TIP, xssTableStr);
+				log.error(SqlInjectionUtil.SQL_INJECTION_TIP_VARIABLE, value);
+				throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value);
+			}
+		}
 
 		// 三、SQL注入检测存在绕过风险 (正则校验)
 		for (String regularOriginal : XSS_REGULAR_STR_ARRAY) {

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java

@@ -68,6 +68,13 @@ public class DbTypeUtils {
         return dbTypeIf(dbType, DbType.ORACLE, DbType.ORACLE_12C, DbType.DM);
     }
 
+    /**
+     * 是否是达梦
+     */
+    public static boolean dbTypeIsDm(DbType dbType) {
+        return dbTypeIf(dbType, DbType.DM);
+    }
+
     public static boolean dbTypeIsSqlServer(DbType dbType) {
         return dbTypeIf(dbType, DbType.SQL_SERVER, DbType.SQL_SERVER2005);
     }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java

@@ -34,6 +34,7 @@ public class SsrfFileTypeFilter {
         FILE_TYPE_WHITE_LIST.add("bmp");
         FILE_TYPE_WHITE_LIST.add("svg");
         FILE_TYPE_WHITE_LIST.add("ico");
+        FILE_TYPE_WHITE_LIST.add("heic");
 
         //文本文件
         FILE_TYPE_WHITE_LIST.add("txt");
@@ -42,6 +43,7 @@ public class SsrfFileTypeFilter {
         FILE_TYPE_WHITE_LIST.add("pdf");
         FILE_TYPE_WHITE_LIST.add("csv");
 //        FILE_TYPE_WHITE_LIST.add("xml");
+        FILE_TYPE_WHITE_LIST.add("md");
 
         //音视频文件
         FILE_TYPE_WHITE_LIST.add("mp4");
@@ -65,6 +67,10 @@ public class SsrfFileTypeFilter {
         FILE_TYPE_WHITE_LIST.add("apk");
         FILE_TYPE_WHITE_LIST.add("wgt");
 
+        //幻灯片文件后缀
+        FILE_TYPE_WHITE_LIST.add("ppt");
+        FILE_TYPE_WHITE_LIST.add("pptx");
+
         //设置禁止文件的头部标记
         FILE_TYPE_MAP.put("3c25402070616765206c", "jsp");
         FILE_TYPE_MAP.put("3c3f7068700a0a2f2a2a0a202a205048", "php");

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java

@@ -7,12 +7,14 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.SymbolConstant;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.springframework.beans.BeanUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -463,7 +465,7 @@ public class oConvertUtils {
 			return false;
 		}
 
-		String[] childs = childArray.toArray(new String[]{});
+		List<String> childs = childArray.toJavaList(String.class);
 		for (String v : childs) {
 			if (!isIn(v, all)) {
 				return false;
@@ -1029,4 +1031,117 @@ public class oConvertUtils {
 		return result;
 	}
 
+	/**
+	 * 判断对象是否为空 <br/>
+	 * 支持各种类型的对象
+	 * for for [QQYUN-10990]AIRAG
+	 * @param obj
+	 * @return
+	 * @author chenrui
+	 * @date 2025/2/13 18:34
+	 */
+	public static boolean isObjectEmpty(Object obj) {
+		if (null == obj) {
+			return true;
+		}
+
+		if (obj instanceof CharSequence) {
+			return isEmpty(obj);
+		} else if (obj instanceof Map) {
+			return ((Map<?, ?>) obj).isEmpty();
+		} else if (obj instanceof Iterable) {
+			return isObjectEmpty(((Iterable<?>) obj).iterator());
+		} else if (obj instanceof Iterator) {
+			return !((Iterator<?>) obj).hasNext();
+		} else if (isArray(obj)) {
+			return 0 == Array.getLength(obj);
+		}
+		return false;
+	}
+
+	/**
+	 * iterator 是否为空
+	 * for for [QQYUN-10990]AIRAG
+	 * @param iterator Iterator对象
+	 * @return 是否为空
+	 */
+	public static boolean isEmptyIterator(Iterator<?> iterator) {
+		return null == iterator || false == iterator.hasNext();
+	}
+
+
+	/**
+	 * 判断对象是否不为空
+	 * for for [QQYUN-10990]AIRAG
+	 * @param object
+	 * @return
+	 * @author chenrui
+	 * @date 2025/2/13 18:35
+	 */
+	public static boolean isObjectNotEmpty(Object object) {
+		return !isObjectEmpty(object);
+	}
+
+	/**
+	 * 如果src大于des返回true
+	 * for [QQYUN-10990]AIRAG
+	 * @param src
+	 * @param des
+	 * @return
+	 * @author: chenrui
+	 * @date: 2018/9/19 15:30
+	 */
+	public static boolean isGt(Number src, Number des) {
+		if (null == src || null == des) {
+			throw new IllegalArgumentException("参数不能为空");
+		}
+		if (src.doubleValue() > des.doubleValue()) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 如果src大于等于des返回true
+	 * for [QQYUN-10990]AIRAG
+	 * @param src
+	 * @param des
+	 * @return
+	 * @author: chenrui
+	 * @date: 2018/9/19 15:30
+	 */
+	public static boolean isGe(Number src, Number des) {
+		if (null == src || null == des) {
+			throw new IllegalArgumentException("参数不能为空");
+		}
+		if (src.doubleValue() < des.doubleValue()) {
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * 判断是否存在
+	 * for [QQYUN-10990]AIRAG
+	 * @param obj
+	 * @param objs
+	 * @param <T>
+	 * @return
+	 * @author chenrui
+	 * @date 2020/9/12 15:50
+	 */
+	public static <T> boolean isIn(T obj, T... objs) {
+		return isIn(obj, objs);
+	}
+
+	/**
+	 * 判断租户ID是否有效
+	 * @param tenantId
+	 * @return
+	 */
+	public static boolean isEffectiveTenant(String tenantId) {
+		return MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && isNotEmpty(tenantId) && !("0").equals(tenantId);
+	}
+	
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java

@@ -3,6 +3,8 @@ package org.jeecg.common.util.security;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.exception.JeecgSqlInjectionException;
+import org.jeecg.common.util.SqlInjectionUtil;
+import org.jeecg.common.util.oConvertUtils;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -66,6 +68,8 @@ public abstract class AbstractQueryBlackListHandler {
         if(flag == false){
             return false;
         }
+        Set<String> xssTableSet = new HashSet<>(Arrays.asList(SqlInjectionUtil.XSS_STR_TABLE.split("\\|")));
+
         for (QueryTable table : list) {
             String name = table.getName();
             String fieldRule = ruleMap.get(name);
@@ -81,6 +85,16 @@ public abstract class AbstractQueryBlackListHandler {
                 }
 
             }
+            // 判断是否调用了黑名单数据库
+            String dbName = table.getDbName();
+            if (oConvertUtils.isNotEmpty(dbName)) {
+                dbName = dbName.toLowerCase().trim();
+                if (xssTableSet.contains(dbName)) {
+                    flag = false;
+                    log.warn("sql黑名单校验，数据库【" + dbName + "】禁止查询");
+                    break;
+                }
+            }
         }
 
         // 返回黑名单校验结果（不合法直接抛出异常）
@@ -135,6 +149,8 @@ public abstract class AbstractQueryBlackListHandler {
      * 查询的表的信息
      */
     protected class QueryTable {
+        //数据库名
+        private String dbName;
         //表名
         private String name;
         //表的别名
@@ -158,6 +174,14 @@ public abstract class AbstractQueryBlackListHandler {
             this.fields.add(field);
         }
 
+        public String getDbName() {
+            return dbName;
+        }
+
+        public void setDbName(String dbName) {
+            this.dbName = dbName;
+        }
+
         public String getName() {
             return name;
         }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionAstNodeVisitor.java

@@ -1,33 +0,0 @@
-package org.jeecg.common.util.sqlInjection;
-
-import net.sf.jsqlparser.parser.CCJSqlParserDefaultVisitor;
-import net.sf.jsqlparser.parser.SimpleNode;
-import net.sf.jsqlparser.statement.select.UnionOp;
-import org.jeecg.common.exception.JeecgSqlInjectionException;
-
-/**
- * 基于抽象语法树(AST)的注入攻击分析实现
- *
- * @author guyadong
- */
-public class InjectionAstNodeVisitor extends CCJSqlParserDefaultVisitor {
-    public InjectionAstNodeVisitor() {
-    }
-
-    /**
-     * 处理禁止联合查询
-     *
-     * @param node
-     * @param data
-     * @return
-     */
-    @Override
-    public Object visit(SimpleNode node, Object data) {
-        Object value = node.jjtGetValue();
-        if (value instanceof UnionOp) {
-            throw new JeecgSqlInjectionException("DISABLE UNION");
-        }
-        return super.visit(node, data);
-    }
-}
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java

@@ -1,172 +0,0 @@
-package org.jeecg.common.util.sqlInjection;
-
-
-import net.sf.jsqlparser.expression.BinaryExpression;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.Function;
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.ComparisonOperator;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.select.Join;
-import net.sf.jsqlparser.statement.select.OrderByElement;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectItem;
-import net.sf.jsqlparser.statement.select.SubSelect;
-import net.sf.jsqlparser.statement.select.WithItem;
-import net.sf.jsqlparser.util.TablesNamesFinder;
-import org.jeecg.common.exception.JeecgSqlInjectionException;
-import org.jeecg.common.util.sqlInjection.parse.ConstAnalyzer;
-import org.jeecg.common.util.sqlInjection.parse.ParserSupport;
-
-/**
- * 基于SQL语法对象的SQL注入攻击分析实现
- *
- * @author guyadong
- */
-public class InjectionSyntaxObjectAnalyzer extends TablesNamesFinder {
-    /**
-     * 危险函数名
-     */
-    private static final String DANGROUS_FUNCTIONS = "(sleep|benchmark|extractvalue|updatexml|ST_LatFromGeoHash|ST_LongFromGeoHash|GTID_SUBSET|GTID_SUBTRACT|floor|ST_Pointfromgeohash"
-            + "|geometrycollection|multipoint|polygon|multipolygon|linestring|multilinestring)";
-
-    private static ThreadLocal<Boolean> disableSubselect = new ThreadLocal<Boolean>() {
-        @Override
-        protected Boolean initialValue() {
-            return true;
-        }
-    };
-    private ConstAnalyzer constAnalyzer = new ConstAnalyzer();
-
-    public InjectionSyntaxObjectAnalyzer() {
-        super();
-        init(true);
-
-    }
-
-    @Override
-    public void visitBinaryExpression(BinaryExpression binaryExpression) {
-        if (binaryExpression instanceof ComparisonOperator) {
-            if (isConst(binaryExpression.getLeftExpression()) && isConst(binaryExpression.getRightExpression())) {
-                /** 禁用恒等式 */
-                throw new JeecgSqlInjectionException("DISABLE IDENTICAL EQUATION " + binaryExpression);
-            }
-        }
-        super.visitBinaryExpression(binaryExpression);
-    }
-
-    @Override
-    public void visit(AndExpression andExpression) {
-        super.visit(andExpression);
-        checkConstExpress(andExpression.getLeftExpression());
-        checkConstExpress(andExpression.getRightExpression());
-    }
-
-    @Override
-    public void visit(OrExpression orExpression) {
-        super.visit(orExpression);
-        checkConstExpress(orExpression.getLeftExpression());
-        checkConstExpress(orExpression.getRightExpression());
-    }
-
-    @Override
-    public void visit(Function function) {
-        if (function.getName().matches(DANGROUS_FUNCTIONS)) {
-            /** 禁用危险函数 */
-            throw new JeecgSqlInjectionException("DANGROUS FUNCTION: " + function.getName());
-        }
-        super.visit(function);
-    }
-
-    @Override
-    public void visit(WithItem withItem) {
-        try {
-            /** 允许 WITH 语句中的子查询 */
-            disableSubselect.set(false);
-            super.visit(withItem);
-        } finally {
-            disableSubselect.set(true);
-        }
-    }
-
-    @Override
-    public void visit(SubSelect subSelect) {
-        try {
-            /** 允许语句中的子查询 */
-            disableSubselect.set(false);
-            super.visit(subSelect);
-        } finally {
-            disableSubselect.set(true);
-        }
-//        if (disableSubselect.get()) {
-//            // 禁用子查询
-//            throw new JeecgSqlInjectionException("DISABLE subselect " + subSelect);
-//        }
-    }
-
-    @Override
-    public void visit(Column tableColumn) {
-        if (ParserSupport.isBoolean(tableColumn)) {
-            throw new JeecgSqlInjectionException("DISABLE CONST BOOL " + tableColumn);
-        }
-        super.visit(tableColumn);
-    }
-
-    @Override
-    public void visit(PlainSelect plainSelect) {
-        if (plainSelect.getSelectItems() != null) {
-            for (SelectItem item : plainSelect.getSelectItems()) {
-                item.accept(this);
-            }
-        }
-
-        if (plainSelect.getFromItem() != null) {
-            plainSelect.getFromItem().accept(this);
-        }
-
-        if (plainSelect.getJoins() != null) {
-            for (Join join : plainSelect.getJoins()) {
-                join.getRightItem().accept(this);
-                for (Expression e : join.getOnExpressions()) {
-                    e.accept(this);
-                }
-            }
-        }
-        if (plainSelect.getWhere() != null) {
-            plainSelect.getWhere().accept(this);
-            checkConstExpress(plainSelect.getWhere());
-        }
-
-        if (plainSelect.getHaving() != null) {
-            plainSelect.getHaving().accept(this);
-        }
-
-        if (plainSelect.getOracleHierarchical() != null) {
-            plainSelect.getOracleHierarchical().accept(this);
-        }
-        if (plainSelect.getOrderByElements() != null) {
-            for (OrderByElement orderByElement : plainSelect.getOrderByElements()) {
-                orderByElement.getExpression().accept(this);
-            }
-        }
-        if (plainSelect.getGroupBy() != null) {
-            for (Expression expression : plainSelect.getGroupBy().getGroupByExpressionList().getExpressions()) {
-                expression.accept(this);
-            }
-        }
-    }
-
-    private boolean isConst(Expression expression) {
-        return constAnalyzer.isConstExpression(expression);
-    }
-
-    private void checkConstExpress(Expression expression) {
-        if (constAnalyzer.isConstExpression(expression)) {
-            /** 禁用常量表达式 */
-            throw new JeecgSqlInjectionException("DISABLE CONST EXPRESSION " + expression);
-        }
-    }
-}
-
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java

@@ -1,65 +0,0 @@
-package org.jeecg.common.util.sqlInjection;
-
-import org.jeecg.common.exception.JeecgSqlInjectionException;
-import org.jeecg.common.util.sqlInjection.parse.ParserSupport;
-;
-
-/**
- * SQL注入攻击分析器
- *
- * @author guyadong
- * 参考:
- * https://blog.csdn.net/10km/article/details/127767358
- * https://gitee.com/l0km/sql2java/tree/dev/sql2java-manager/src/main/java/gu/sql2java/parser
- */
-public class SqlInjectionAnalyzer {
-
-    //启用/关闭注入攻击检查
-    private boolean injectCheckEnable = true;
-    //防止SQL注入攻击分析实现
-    private final InjectionSyntaxObjectAnalyzer injectionChecker;
-    private final InjectionAstNodeVisitor injectionVisitor;
-
-    public SqlInjectionAnalyzer() {
-        this.injectionChecker = new InjectionSyntaxObjectAnalyzer();
-        this.injectionVisitor = new InjectionAstNodeVisitor();
-    }
-
-    /**
-     * 启用/关闭注入攻击检查,默认启动
-     *
-     * @param enable
-     * @return
-     */
-    public SqlInjectionAnalyzer injectCheckEnable(boolean enable) {
-        injectCheckEnable = enable;
-        return this;
-    }
-
-    /**
-     * 对解析后的SQL对象执行注入攻击分析，有注入攻击的危险则抛出异常{@link JeecgSqlInjectionException}
-     *
-     * @param sqlParserInfo
-     * @throws JeecgSqlInjectionException
-     */
-    public ParserSupport.SqlParserInfo injectAnalyse(ParserSupport.SqlParserInfo sqlParserInfo) throws JeecgSqlInjectionException {
-        if (null != sqlParserInfo && injectCheckEnable) {
-            /** SQL注入攻击检查 */
-            sqlParserInfo.statement.accept(injectionChecker);
-            sqlParserInfo.simpleNode.jjtAccept(injectionVisitor, null);
-        }
-        return sqlParserInfo;
-    }
-
-    /**
-     * sql校验
-     */
-    public static void checkSql(String sql,boolean check){
-        SqlInjectionAnalyzer sqlInjectionAnalyzer = new SqlInjectionAnalyzer();
-        sqlInjectionAnalyzer.injectCheckEnable(check);
-        ParserSupport.SqlParserInfo sqlParserInfo = ParserSupport.parse0(sql, null,null);
-        sqlInjectionAnalyzer.injectAnalyse(sqlParserInfo);
-    }
-}
-
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java

@@ -1,569 +0,0 @@
-package org.jeecg.common.util.sqlInjection.parse;
-
-import net.sf.jsqlparser.expression.*;
-import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseOr;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseRightShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseXor;
-import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
-import net.sf.jsqlparser.expression.operators.arithmetic.Division;
-import net.sf.jsqlparser.expression.operators.arithmetic.IntegerDivision;
-import net.sf.jsqlparser.expression.operators.arithmetic.Modulo;
-import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
-import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
-import net.sf.jsqlparser.expression.operators.relational.Between;
-import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
-import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
-import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
-import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
-import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
-import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
-import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
-import net.sf.jsqlparser.expression.operators.relational.ItemsListVisitor;
-import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
-import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
-import net.sf.jsqlparser.expression.operators.relational.Matches;
-import net.sf.jsqlparser.expression.operators.relational.MinorThan;
-import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
-import net.sf.jsqlparser.expression.operators.relational.MultiExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.NamedExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
-import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
-import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.select.AllColumns;
-import net.sf.jsqlparser.statement.select.AllTableColumns;
-import net.sf.jsqlparser.statement.select.OrderByElement;
-import net.sf.jsqlparser.statement.select.SubSelect;
-
-/**
- * 判断表达是否为常量的分析器
- *
- * @author guyadong
- */
-public class ConstAnalyzer implements ExpressionVisitor, ItemsListVisitor {
-
-    private static ThreadLocal<Boolean> constFlag = new ThreadLocal<Boolean>() {
-        @Override
-        protected Boolean initialValue() {
-            return true;
-        }
-    };
-
-    @Override
-    public void visit(NullValue value) {
-    }
-
-    @Override
-    public void visit(Function function) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(SignedExpression expr) {
-        expr.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(JdbcParameter parameter) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(JdbcNamedParameter parameter) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(DoubleValue value) {
-
-    }
-
-    @Override
-    public void visit(LongValue value) {
-
-    }
-
-    @Override
-    public void visit(DateValue value) {
-
-    }
-
-    @Override
-    public void visit(TimeValue value) {
-
-    }
-
-    @Override
-    public void visit(TimestampValue value) {
-
-    }
-
-    @Override
-    public void visit(Parenthesis parenthesis) {
-        parenthesis.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(StringValue value) {
-
-    }
-
-    @Override
-    public void visit(Addition expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Division expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(IntegerDivision expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Multiplication expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Subtraction expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(AndExpression expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(OrExpression expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(XorExpression expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Between expr) {
-        expr.getLeftExpression().accept(this);
-        expr.getBetweenExpressionStart().accept(this);
-        expr.getBetweenExpressionEnd().accept(this);
-    }
-
-    /**
-     * 用于处理 OverlapsCondition 类型的表达式
-     * @param overlapsCondition
-     */
-    @Override
-    public void visit(OverlapsCondition overlapsCondition) {
-        constFlag.set(false);
-    }
-    /**
-     * 用于处理 SafeCastExpression 类型的表达式。
-     * @param safeCastExpression
-     */
-    @Override
-    public void visit(SafeCastExpression safeCastExpression) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(EqualsTo expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(GreaterThan expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(GreaterThanEquals expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(InExpression expr) {
-        if (expr.getLeftExpression() != null) {
-            expr.getLeftExpression().accept(this);
-        }
-    }
-
-    @Override
-    public void visit(IsNullExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
-    @Override
-    public void visit(FullTextSearch expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(IsBooleanExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
-    @Override
-    public void visit(LikeExpression expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(MinorThan expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(MinorThanEquals expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(NotEqualsTo expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Column column) {
-        if (!ParserSupport.isBoolean(column)) {
-            constFlag.set(false);
-        }
-    }
-
-    @Override
-    public void visit(SubSelect subSelect) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(CaseExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(WhenClause expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(ExistsExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(AnyComparisonExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(Concat expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(Matches expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(BitwiseAnd expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(BitwiseOr expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(BitwiseXor expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(CastExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
-    @Override
-    public void visit(TryCastExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(Modulo expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(AnalyticExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(ExtractExpression expr) {
-        expr.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(IntervalExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(OracleHierarchicalExpression expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(RegExpMatchOperator expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(ExpressionList expressionList) {
-        for (Expression expr : expressionList.getExpressions()) {
-            expr.accept(this);
-        }
-    }
-
-    @Override
-    public void visit(NamedExpressionList namedExpressionList) {
-        for (Expression expr : namedExpressionList.getExpressions()) {
-            expr.accept(this);
-        }
-    }
-
-    @Override
-    public void visit(MultiExpressionList multiExprList) {
-        for (ExpressionList list : multiExprList.getExpressionLists()) {
-            visit(list);
-        }
-    }
-
-    @Override
-    public void visit(NotExpression notExpr) {
-        notExpr.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(BitwiseRightShift expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(BitwiseLeftShift expr) {
-        visitBinaryExpression(expr);
-    }
-
-    protected void visitBinaryExpression(BinaryExpression expr) {
-        expr.getLeftExpression().accept(this);
-        expr.getRightExpression().accept(this);
-    }
-
-    @Override
-    public void visit(JsonExpression jsonExpr) {
-        jsonExpr.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(JsonOperator expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(RegExpMySQLOperator expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(UserVariable var) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(NumericBind bind) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(KeepExpression expr) {
-        for (OrderByElement element : expr.getOrderByElements()) {
-            element.getExpression().accept(this);
-        }
-    }
-
-    @Override
-    public void visit(MySQLGroupConcat groupConcat) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(ValueListExpression valueListExpression) {
-        for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
-            expr.accept(this);
-        }
-    }
-
-    @Override
-    public void visit(AllColumns allColumns) {
-
-    }
-
-    @Override
-    public void visit(AllTableColumns allTableColumns) {
-
-    }
-
-    @Override
-    public void visit(AllValue allValue) {
-
-    }
-
-    @Override
-    public void visit(IsDistinctExpression isDistinctExpression) {
-        visitBinaryExpression(isDistinctExpression);
-    }
-
-    @Override
-    public void visit(RowGetExpression rowGetExpression) {
-        rowGetExpression.getExpression().accept(this);
-    }
-
-    @Override
-    public void visit(HexValue hexValue) {
-
-    }
-
-    @Override
-    public void visit(OracleHint hint) {
-
-    }
-
-    @Override
-    public void visit(TimeKeyExpression timeKeyExpression) {
-
-    }
-
-    @Override
-    public void visit(DateTimeLiteralExpression literal) {
-    }
-
-    @Override
-    public void visit(NextValExpression nextVal) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(CollateExpression col) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(SimilarToExpression expr) {
-        visitBinaryExpression(expr);
-    }
-
-    @Override
-    public void visit(ArrayExpression array) {
-        array.getObjExpression().accept(this);
-        if (array.getIndexExpression() != null) {
-            array.getIndexExpression().accept(this);
-        }
-        if (array.getStartIndexExpression() != null) {
-            array.getStartIndexExpression().accept(this);
-        }
-        if (array.getStopIndexExpression() != null) {
-            array.getStopIndexExpression().accept(this);
-        }
-    }
-
-    @Override
-    public void visit(ArrayConstructor aThis) {
-        for (Expression expression : aThis.getExpressions()) {
-            expression.accept(this);
-        }
-    }
-
-    @Override
-    public void visit(VariableAssignment var) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(XMLSerializeExpr expr) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(TimezoneExpression expr) {
-        expr.getLeftExpression().accept(this);
-    }
-
-    @Override
-    public void visit(JsonAggregateFunction expression) {
-        Expression expr = expression.getExpression();
-        if (expr != null) {
-            expr.accept(this);
-        }
-
-        expr = expression.getFilterExpression();
-        if (expr != null) {
-            expr.accept(this);
-        }
-    }
-
-    @Override
-    public void visit(JsonFunction expression) {
-        for (JsonFunctionExpression expr : expression.getExpressions()) {
-            expr.getExpression().accept(this);
-        }
-    }
-
-    @Override
-    public void visit(ConnectByRootOperator connectByRootOperator) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(OracleNamedFunctionParameter oracleNamedFunctionParameter) {
-        constFlag.set(false);
-    }
-
-    @Override
-    public void visit(GeometryDistance geometryDistance) {
-        visitBinaryExpression(geometryDistance);
-    }
-
-    @Override
-    public void visit(RowConstructor rowConstructor) {
-        constFlag.set(false);
-    }
-
-    public boolean isConstExpression(Expression expression) {
-        if (null != expression) {
-            constFlag.set(true);
-            expression.accept(this);
-            return constFlag.get();
-        }
-        return false;
-    }
-}
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ParserSupport.java

@@ -1,177 +0,0 @@
-package org.jeecg.common.util.sqlInjection.parse;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.parser.*;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectBody;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.google.common.base.Throwables;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.exception.JeecgSqlInjectionException;
-
-/**
- * 解析sql支持
- */
-@Slf4j
-public class ParserSupport {
-    /**
-     * 解析SELECT SQL语句,解析失败或非SELECT语句则抛出异常
-     *
-     * @param sql
-     * @return
-     */
-    public static Select parseSelect(String sql) {
-        Statement stmt;
-        try {
-            stmt = CCJSqlParserUtil.parse(checkNotNull(sql, "sql is null"));
-        } catch (JSQLParserException e) {
-            throw new JeecgBootException(e);
-        }
-        checkArgument(stmt instanceof Select, "%s is not  SELECT statment", sql);
-        Select select = (Select) stmt;
-        SelectBody selectBody = select.getSelectBody();
-        // 暂时只支持简单的SELECT xxxx FROM ....语句不支持复杂语句如WITH
-        checkArgument(selectBody instanceof PlainSelect, "ONLY SUPPORT plain select statement %s", sql);
-        return (Select) stmt;
-    }
-
-    /**
-     * 解析SELECT SQL语句,解析失败或非SELECT语句则
-     *
-     * @param sql
-     * @return
-     */
-    public static Select parseSelectUnchecked(String sql) {
-        try {
-            return parseSelect(sql);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * 实现SQL语句解析,解析成功则返回解析后的{@link Statement}，
-     * 并通过{@code visitor}参数提供基于AST(抽象语法树)的遍历所有节点的能力。
-     *
-     * @param sql                 SQL语句
-     * @param visitor             遍历所有节点的{@link SimpleNodeVisitor}接口实例，为{@code null}忽略
-     * @param sqlSyntaxNormalizer SQL语句分析转换器，为{@code null}忽略
-     * @throws JSQLParserException 输入的SQL语句有语法错误
-     * @see #parse0(String, CCJSqlParserVisitor, SqlSyntaxNormalizer)
-     */
-    public static Statement parse(String sql, CCJSqlParserVisitor visitor, SqlSyntaxNormalizer sqlSyntaxNormalizer) throws JSQLParserException {
-        return parse0(sql, visitor, sqlSyntaxNormalizer).statement;
-    }
-
-    /**
-     * 参照{@link CCJSqlParserUtil#parseAST(String)}和{@link CCJSqlParserUtil#parse(String)}实现SQL语句解析,
-     * 解析成功则返回解析后的{@link SqlParserInfo}对象，
-     * 并通过{@code visitor}参数提供基于AST(抽象语法树)的遍历所有节点的能力。
-     *
-     * @param sql               SQL语句
-     * @param visitor           遍历所有节点的{@link SimpleNodeVisitor}接口实例，为{@code null}忽略
-     * @param sqlSyntaxAnalyzer SQL语句分析转换器，为{@code null}忽略
-     * @throws JSQLParserException 输入的SQL语句有语法错误
-     * @see net.sf.jsqlparser.parser.Node#jjtAccept(SimpleNodeVisitor, Object)
-     */
-    public static SqlParserInfo parse0(String sql, CCJSqlParserVisitor visitor, SqlSyntaxNormalizer sqlSyntaxAnalyzer) throws JeecgSqlInjectionException {
-
-        //检查是否非select开头，暂不支持
-        if(!sql.toLowerCase().trim().startsWith("select ")) {
-            log.warn("传入sql 非select开头，不支持非select开头的语句解析！");
-            return null;
-        }
-
-        //检查是否存储过程，暂不支持
-        if(sql.toLowerCase().trim().startsWith("call ")){
-            log.warn("传入call 开头存储过程，不支持存储过程解析！");
-            return null;
-        }
-
-        //检查特殊语义的特殊字符，目前检查冒号、$、#三种特殊语义字符
-        String specialCharacters = "[:$#]";
-        Pattern pattern = Pattern.compile(specialCharacters);
-        Matcher matcher = pattern.matcher(sql);
-        if (matcher.find()) {
-            sql = sql.replaceAll("[:$#]", "@");
-        }
-
-        checkArgument(null != sql, "sql is null");
-        boolean allowComplexParsing = CCJSqlParserUtil.getNestingDepth(sql) <= CCJSqlParserUtil.ALLOWED_NESTING_DEPTH;
-
-        CCJSqlParser parser = CCJSqlParserUtil.newParser(sql).withAllowComplexParsing(allowComplexParsing);
-        Statement stmt;
-        try {
-            stmt = parser.Statement();
-        } catch (Exception ex) {
-            log.error("请注意，SQL语法可能存在问题---> {}", ex.getMessage());
-            throw new JeecgSqlInjectionException("请注意，SQL语法可能存在问题:"+sql);
-        }
-        if (null != visitor) {
-            parser.getASTRoot().jjtAccept(visitor, null);
-        }
-        if (null != sqlSyntaxAnalyzer) {
-            stmt.accept(sqlSyntaxAnalyzer.resetChanged());
-        }
-        return new SqlParserInfo(stmt.toString(), stmt, (SimpleNode) parser.getASTRoot());
-    }
-
-    /**
-     * 调用{@link CCJSqlParser}解析SQL语句部件返回解析生成的对象,如{@code 'ORDER BY id DESC'}
-     *
-     * @param <T>
-     * @param input
-     * @param method     指定调用的{@link CCJSqlParser}解析方法
-     * @param targetType 返回的解析对象类型
-     * @return
-     * @since 3.18.3
-     */
-    public static <T> T parseComponent(String input, String method, Class<T> targetType) {
-        try {
-            CCJSqlParser parser = new CCJSqlParser(new StringProvider(input));
-            try {
-                return checkNotNull(targetType, "targetType is null").cast(parser.getClass().getMethod(method).invoke(parser));
-            } catch (InvocationTargetException e) {
-                Throwables.throwIfUnchecked(e.getTargetException());
-                throw new RuntimeException(e.getTargetException());
-            }
-        } catch (IllegalAccessException | NoSuchMethodException | SecurityException e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 如果{@link Column}没有定义table,且字段名为true/false(不区分大小写)则视为布尔常量
-     *
-     * @param column
-     */
-    public static boolean isBoolean(Column column) {
-        return null != column && null == column.getTable() &&
-                Pattern.compile("(true|false)", Pattern.CASE_INSENSITIVE).matcher(column.getColumnName()).matches();
-    }
-
-    public static class SqlParserInfo {
-        public String nativeSql;
-        public Statement statement;
-        public SimpleNode simpleNode;
-
-        SqlParserInfo(String nativeSql, Statement statement, SimpleNode simpleNode) {
-            this.nativeSql = nativeSql;
-            this.statement = statement;
-            this.simpleNode = simpleNode;
-        }
-    }
-}
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/SqlSyntaxNormalizer.java

@@ -1,37 +0,0 @@
-package org.jeecg.common.util.sqlInjection.parse;
-
-import net.sf.jsqlparser.util.TablesNamesFinder;
-
-/**
- *  SQL语句分析转换器基类<br>
- * 基于SQL语法对象实现对SQL的修改
- * （暂时用不到）
- *
- * @author guyadong
- * @since 3.17.0
- */
-public class SqlSyntaxNormalizer extends TablesNamesFinder {
-    protected static final ThreadLocal<Boolean> changed = new ThreadLocal<>();
-
-    public SqlSyntaxNormalizer() {
-        super();
-        init(true);
-
-    }
-
-    /**
-     * 语句改变返回{@code true},否则返回{@code false}
-     */
-    public boolean changed() {
-        return Boolean.TRUE.equals(changed.get());
-    }
-
-    /**
-     * 复位线程局部变量{@link #changed}状态
-     */
-    public SqlSyntaxNormalizer resetChanged() {
-        changed.remove();
-        return this;
-    }
-}
-

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java

@@ -1,255 +1,255 @@
-package org.jeecg.common.util.sqlparse;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.expression.*;
-import net.sf.jsqlparser.parser.CCJSqlParserManager;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.select.*;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 解析所有表名和字段的类
- */
-@Slf4j
-public class JSqlParserAllTableManager {
-
-    private final String sql;
-    private final Map<String, SelectSqlInfo> allTableMap = new HashMap<>();
-    /**
-     * 别名对应实际表名
-     */
-    private final Map<String, String> tableAliasMap = new HashMap<>();
-
-    /**
-     * 解析后的sql
-     */
-    private String parsedSql = null;
-
-    JSqlParserAllTableManager(String selectSql) {
-        this.sql = selectSql;
-    }
-
-    /**
-     * 开始解析
-     *
-     * @return
-     * @throws JSQLParserException
-     */
-    public Map<String, SelectSqlInfo> parse() throws JSQLParserException {
-        // 1. 创建解析器
-        CCJSqlParserManager mgr = new CCJSqlParserManager();
-        // 2. 使用解析器解析sql生成具有层次结构的java类
-        Statement stmt = mgr.parse(new StringReader(this.sql));
-        if (stmt instanceof Select) {
-            Select selectStatement = (Select) stmt;
-            SelectBody selectBody = selectStatement.getSelectBody();
-            this.parsedSql = selectBody.toString();
-            // 3. 解析select查询sql的信息
-            if (selectBody instanceof PlainSelect) {
-                PlainSelect plainSelect = (PlainSelect) selectBody;
-                // 4. 合并 fromItems
-                List<FromItem> fromItems = new ArrayList<>();
-                fromItems.add(plainSelect.getFromItem());
-                // 4.1 处理join的表
-                List<Join> joins = plainSelect.getJoins();
-                if (joins != null) {
-                    joins.forEach(join -> fromItems.add(join.getRightItem()));
-                }
-                // 5. 处理 fromItems
-                for (FromItem fromItem : fromItems) {
-                    // 5.1 通过表名的方式from
-                    if (fromItem instanceof Table) {
-                        this.addSqlInfoByTable((Table) fromItem);
-                    }
-                    // 5.2 通过子查询的方式from
-                    else if (fromItem instanceof SubSelect) {
-                        this.handleSubSelect((SubSelect) fromItem);
-                    }
-                }
-                // 6. 解析 selectFields
-                List<SelectItem> selectItems = plainSelect.getSelectItems();
-                for (SelectItem selectItem : selectItems) {
-                    // 6.1 查询的是全部字段
-                    if (selectItem instanceof AllColumns) {
-                        // 当 selectItem 为 AllColumns 时，fromItem 必定为 Table
-                        String tableName = plainSelect.getFromItem(Table.class).getName();
-                        // 此处必定不为空，因为在解析 fromItem 时，已经将表名添加到 allTableMap 中
-                        SelectSqlInfo sqlInfo = this.allTableMap.get(tableName);
-                        assert sqlInfo != null;
-                        // 设置为查询全部字段
-                        sqlInfo.setSelectAll(true);
-                        sqlInfo.setSelectFields(null);
-                        sqlInfo.setRealSelectFields(null);
-                    }
-                    // 6.2 查询的是带表别名（ u.* )的全部字段
-                    else if (selectItem instanceof AllTableColumns) {
-                        AllTableColumns allTableColumns = (AllTableColumns) selectItem;
-                        String aliasName = allTableColumns.getTable().getName();
-                        // 通过别名获取表名
-                        String tableName = this.tableAliasMap.get(aliasName);
-                        if (tableName == null) {
-                            tableName = aliasName;
-                        }
-                        SelectSqlInfo sqlInfo = this.allTableMap.get(tableName);
-                        // 如果此处为空，则说明该字段是通过子查询获取的，所以可以不处理，只有实际表才需要处理
-                        if (sqlInfo != null) {
-                            // 设置为查询全部字段
-                            sqlInfo.setSelectAll(true);
-                            sqlInfo.setSelectFields(null);
-                            sqlInfo.setRealSelectFields(null);
-                        }
-                    }
-                    // 6.3 各种字段表达式处理
-                    else if (selectItem instanceof SelectExpressionItem) {
-                        SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
-                        Expression expression = selectExpressionItem.getExpression();
-                        Alias alias = selectExpressionItem.getAlias();
-                        this.handleExpression(expression, alias, plainSelect.getFromItem());
-                    }
-                }
-            } else {
-                log.warn("暂时尚未处理该类型的 SelectBody: {}", selectBody.getClass().getName());
-                throw new JeecgBootException("暂时尚未处理该类型的 SelectBody");
-            }
-        } else {
-            // 非 select 查询sql，不做处理
-            throw new JeecgBootException("非 select 查询sql，不做处理");
-        }
-        return this.allTableMap;
-    }
-
-    /**
-     * 处理子查询
-     *
-     * @param subSelect
-     */
-    private void handleSubSelect(SubSelect subSelect) {
-        try {
-            String subSelectSql = subSelect.getSelectBody().toString();
-            // 递归调用解析
-            Map<String, SelectSqlInfo> map = JSqlParserUtils.parseAllSelectTable(subSelectSql);
-            if (map != null) {
-                this.assignMap(map);
-            }
-        } catch (Exception e) {
-            log.error("解析子查询出错", e);
-        }
-    }
-
-    /**
-     * 处理查询字段表达式
-     *
-     * @param expression
-     */
-    private void handleExpression(Expression expression, Alias alias, FromItem fromItem) {
-        // 处理函数式字段  CONCAT(name,'(',age,')')
-        if (expression instanceof Function) {
-            Function functionExp = (Function) expression;
-            List<Expression> expressions = functionExp.getParameters().getExpressions();
-            for (Expression expItem : expressions) {
-                this.handleExpression(expItem, null, fromItem);
-            }
-            return;
-        }
-        // 处理字段上的子查询
-        if (expression instanceof SubSelect) {
-            this.handleSubSelect((SubSelect) expression);
-            return;
-        }
-        // 不处理字面量
-        if (expression instanceof StringValue ||
-                expression instanceof NullValue ||
-                expression instanceof LongValue ||
-                expression instanceof DoubleValue ||
-                expression instanceof HexValue ||
-                expression instanceof DateValue ||
-                expression instanceof TimestampValue ||
-                expression instanceof TimeValue
-        ) {
-            return;
-        }
-
-        // 处理字段
-        if (expression instanceof Column) {
-            Column column = (Column) expression;
-            // 查询字段名
-            String fieldName = column.getColumnName();
-            String aliasName = fieldName;
-            if (alias != null) {
-                aliasName = alias.getName();
-            }
-            String tableName;
-            if (column.getTable() != null) {
-                // 通过列的表名获取 sqlInfo
-                // 例如 user.name，这里的 tableName 就是 user
-                tableName = column.getTable().getName();
-                // 有可能是别名，需要转换为真实表名
-                if (this.tableAliasMap.get(tableName) != null) {
-                    tableName = this.tableAliasMap.get(tableName);
-                }
-            } else {
-                // 当column的table为空时，说明是 fromItem 中的字段
-                tableName = ((Table) fromItem).getName();
-            }
-            SelectSqlInfo $sqlInfo = this.allTableMap.get(tableName);
-            if ($sqlInfo != null) {
-                $sqlInfo.addSelectField(aliasName, fieldName);
-            } else {
-                log.warn("发生意外情况，未找到表名为 {} 的 SelectSqlInfo", tableName);
-            }
-        }
-    }
-
-    /**
-     * 根据表名添加sqlInfo
-     *
-     * @param table
-     */
-    private void addSqlInfoByTable(Table table) {
-        String tableName = table.getName();
-        // 解析 aliasName
-        if (table.getAlias() != null) {
-            this.tableAliasMap.put(table.getAlias().getName(), tableName);
-        }
-        SelectSqlInfo sqlInfo = new SelectSqlInfo(this.parsedSql);
-        sqlInfo.setFromTableName(table.getName());
-        this.allTableMap.put(sqlInfo.getFromTableName(), sqlInfo);
-    }
-
-    /**
-     * 合并map
-     *
-     * @param source
-     */
-    private void assignMap(Map<String, SelectSqlInfo> source) {
-        for (Map.Entry<String, SelectSqlInfo> entry : source.entrySet()) {
-            SelectSqlInfo sqlInfo = this.allTableMap.get(entry.getKey());
-            if (sqlInfo == null) {
-                this.allTableMap.put(entry.getKey(), entry.getValue());
-            } else {
-                // 合并
-                if (sqlInfo.getSelectFields() == null) {
-                    sqlInfo.setSelectFields(entry.getValue().getSelectFields());
-                } else {
-                    sqlInfo.getSelectFields().addAll(entry.getValue().getSelectFields());
-                }
-                if (sqlInfo.getRealSelectFields() == null) {
-                    sqlInfo.setRealSelectFields(entry.getValue().getRealSelectFields());
-                } else {
-                    sqlInfo.getRealSelectFields().addAll(entry.getValue().getRealSelectFields());
-                }
-            }
-        }
-    }
-
-}
+//package org.jeecg.common.util.sqlparse;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import net.sf.jsqlparser.JSQLParserException;
+//import net.sf.jsqlparser.expression.*;
+//import net.sf.jsqlparser.parser.CCJSqlParserManager;
+//import net.sf.jsqlparser.schema.Column;
+//import net.sf.jsqlparser.schema.Table;
+//import net.sf.jsqlparser.statement.Statement;
+//import net.sf.jsqlparser.statement.select.*;
+//import org.jeecg.common.exception.JeecgBootException;
+//import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo;
+//
+//import java.io.StringReader;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * 解析所有表名和字段的类
+// */
+//@Slf4j
+//public class JSqlParserAllTableManager {
+//
+//    private final String sql;
+//    private final Map<String, SelectSqlInfo> allTableMap = new HashMap<>();
+//    /**
+//     * 别名对应实际表名
+//     */
+//    private final Map<String, String> tableAliasMap = new HashMap<>();
+//
+//    /**
+//     * 解析后的sql
+//     */
+//    private String parsedSql = null;
+//
+//    JSqlParserAllTableManager(String selectSql) {
+//        this.sql = selectSql;
+//    }
+//
+//    /**
+//     * 开始解析
+//     *
+//     * @return
+//     * @throws JSQLParserException
+//     */
+//    public Map<String, SelectSqlInfo> parse() throws JSQLParserException {
+//        // 1. 创建解析器
+//        CCJSqlParserManager mgr = new CCJSqlParserManager();
+//        // 2. 使用解析器解析sql生成具有层次结构的java类
+//        Statement stmt = mgr.parse(new StringReader(this.sql));
+//        if (stmt instanceof Select) {
+//            Select selectStatement = (Select) stmt;
+//            SelectBody selectBody = selectStatement.getSelectBody();
+//            this.parsedSql = selectBody.toString();
+//            // 3. 解析select查询sql的信息
+//            if (selectBody instanceof PlainSelect) {
+//                PlainSelect plainSelect = (PlainSelect) selectBody;
+//                // 4. 合并 fromItems
+//                List<FromItem> fromItems = new ArrayList<>();
+//                fromItems.add(plainSelect.getFromItem());
+//                // 4.1 处理join的表
+//                List<Join> joins = plainSelect.getJoins();
+//                if (joins != null) {
+//                    joins.forEach(join -> fromItems.add(join.getRightItem()));
+//                }
+//                // 5. 处理 fromItems
+//                for (FromItem fromItem : fromItems) {
+//                    // 5.1 通过表名的方式from
+//                    if (fromItem instanceof Table) {
+//                        this.addSqlInfoByTable((Table) fromItem);
+//                    }
+//                    // 5.2 通过子查询的方式from
+//                    else if (fromItem instanceof SubSelect) {
+//                        this.handleSubSelect((SubSelect) fromItem);
+//                    }
+//                }
+//                // 6. 解析 selectFields
+//                List<SelectItem> selectItems = plainSelect.getSelectItems();
+//                for (SelectItem selectItem : selectItems) {
+//                    // 6.1 查询的是全部字段
+//                    if (selectItem instanceof AllColumns) {
+//                        // 当 selectItem 为 AllColumns 时，fromItem 必定为 Table
+//                        String tableName = plainSelect.getFromItem(Table.class).getName();
+//                        // 此处必定不为空，因为在解析 fromItem 时，已经将表名添加到 allTableMap 中
+//                        SelectSqlInfo sqlInfo = this.allTableMap.get(tableName);
+//                        assert sqlInfo != null;
+//                        // 设置为查询全部字段
+//                        sqlInfo.setSelectAll(true);
+//                        sqlInfo.setSelectFields(null);
+//                        sqlInfo.setRealSelectFields(null);
+//                    }
+//                    // 6.2 查询的是带表别名（ u.* )的全部字段
+//                    else if (selectItem instanceof AllTableColumns) {
+//                        AllTableColumns allTableColumns = (AllTableColumns) selectItem;
+//                        String aliasName = allTableColumns.getTable().getName();
+//                        // 通过别名获取表名
+//                        String tableName = this.tableAliasMap.get(aliasName);
+//                        if (tableName == null) {
+//                            tableName = aliasName;
+//                        }
+//                        SelectSqlInfo sqlInfo = this.allTableMap.get(tableName);
+//                        // 如果此处为空，则说明该字段是通过子查询获取的，所以可以不处理，只有实际表才需要处理
+//                        if (sqlInfo != null) {
+//                            // 设置为查询全部字段
+//                            sqlInfo.setSelectAll(true);
+//                            sqlInfo.setSelectFields(null);
+//                            sqlInfo.setRealSelectFields(null);
+//                        }
+//                    }
+//                    // 6.3 各种字段表达式处理
+//                    else if (selectItem instanceof SelectExpressionItem) {
+//                        SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
+//                        Expression expression = selectExpressionItem.getExpression();
+//                        Alias alias = selectExpressionItem.getAlias();
+//                        this.handleExpression(expression, alias, plainSelect.getFromItem());
+//                    }
+//                }
+//            } else {
+//                log.warn("暂时尚未处理该类型的 SelectBody: {}", selectBody.getClass().getName());
+//                throw new JeecgBootException("暂时尚未处理该类型的 SelectBody");
+//            }
+//        } else {
+//            // 非 select 查询sql，不做处理
+//            throw new JeecgBootException("非 select 查询sql，不做处理");
+//        }
+//        return this.allTableMap;
+//    }
+//
+//    /**
+//     * 处理子查询
+//     *
+//     * @param subSelect
+//     */
+//    private void handleSubSelect(SubSelect subSelect) {
+//        try {
+//            String subSelectSql = subSelect.getSelectBody().toString();
+//            // 递归调用解析
+//            Map<String, SelectSqlInfo> map = JSqlParserUtils.parseAllSelectTable(subSelectSql);
+//            if (map != null) {
+//                this.assignMap(map);
+//            }
+//        } catch (Exception e) {
+//            log.error("解析子查询出错", e);
+//        }
+//    }
+//
+//    /**
+//     * 处理查询字段表达式
+//     *
+//     * @param expression
+//     */
+//    private void handleExpression(Expression expression, Alias alias, FromItem fromItem) {
+//        // 处理函数式字段  CONCAT(name,'(',age,')')
+//        if (expression instanceof Function) {
+//            Function functionExp = (Function) expression;
+//            List<Expression> expressions = functionExp.getParameters().getExpressions();
+//            for (Expression expItem : expressions) {
+//                this.handleExpression(expItem, null, fromItem);
+//            }
+//            return;
+//        }
+//        // 处理字段上的子查询
+//        if (expression instanceof SubSelect) {
+//            this.handleSubSelect((SubSelect) expression);
+//            return;
+//        }
+//        // 不处理字面量
+//        if (expression instanceof StringValue ||
+//                expression instanceof NullValue ||
+//                expression instanceof LongValue ||
+//                expression instanceof DoubleValue ||
+//                expression instanceof HexValue ||
+//                expression instanceof DateValue ||
+//                expression instanceof TimestampValue ||
+//                expression instanceof TimeValue
+//        ) {
+//            return;
+//        }
+//
+//        // 处理字段
+//        if (expression instanceof Column) {
+//            Column column = (Column) expression;
+//            // 查询字段名
+//            String fieldName = column.getColumnName();
+//            String aliasName = fieldName;
+//            if (alias != null) {
+//                aliasName = alias.getName();
+//            }
+//            String tableName;
+//            if (column.getTable() != null) {
+//                // 通过列的表名获取 sqlInfo
+//                // 例如 user.name，这里的 tableName 就是 user
+//                tableName = column.getTable().getName();
+//                // 有可能是别名，需要转换为真实表名
+//                if (this.tableAliasMap.get(tableName) != null) {
+//                    tableName = this.tableAliasMap.get(tableName);
+//                }
+//            } else {
+//                // 当column的table为空时，说明是 fromItem 中的字段
+//                tableName = ((Table) fromItem).getName();
+//            }
+//            SelectSqlInfo $sqlInfo = this.allTableMap.get(tableName);
+//            if ($sqlInfo != null) {
+//                $sqlInfo.addSelectField(aliasName, fieldName);
+//            } else {
+//                log.warn("发生意外情况，未找到表名为 {} 的 SelectSqlInfo", tableName);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 根据表名添加sqlInfo
+//     *
+//     * @param table
+//     */
+//    private void addSqlInfoByTable(Table table) {
+//        String tableName = table.getName();
+//        // 解析 aliasName
+//        if (table.getAlias() != null) {
+//            this.tableAliasMap.put(table.getAlias().getName(), tableName);
+//        }
+//        SelectSqlInfo sqlInfo = new SelectSqlInfo(this.parsedSql);
+//        sqlInfo.setFromTableName(table.getName());
+//        this.allTableMap.put(sqlInfo.getFromTableName(), sqlInfo);
+//    }
+//
+//    /**
+//     * 合并map
+//     *
+//     * @param source
+//     */
+//    private void assignMap(Map<String, SelectSqlInfo> source) {
+//        for (Map.Entry<String, SelectSqlInfo> entry : source.entrySet()) {
+//            SelectSqlInfo sqlInfo = this.allTableMap.get(entry.getKey());
+//            if (sqlInfo == null) {
+//                this.allTableMap.put(entry.getKey(), entry.getValue());
+//            } else {
+//                // 合并
+//                if (sqlInfo.getSelectFields() == null) {
+//                    sqlInfo.setSelectFields(entry.getValue().getSelectFields());
+//                } else {
+//                    sqlInfo.getSelectFields().addAll(entry.getValue().getSelectFields());
+//                }
+//                if (sqlInfo.getRealSelectFields() == null) {
+//                    sqlInfo.setRealSelectFields(entry.getValue().getRealSelectFields());
+//                } else {
+//                    sqlInfo.getRealSelectFields().addAll(entry.getValue().getRealSelectFields());
+//                }
+//            }
+//        }
+//    }
+//
+//}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java

@@ -1,190 +1,190 @@
-package org.jeecg.common.util.sqlparse;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import net.sf.jsqlparser.expression.*;
-import net.sf.jsqlparser.parser.CCJSqlParserManager;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.select.*;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo;
-
-import java.io.StringReader;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-public class JSqlParserUtils {
-
-    /**
-     * 解析 查询（select）sql的信息，
-     * 此方法会展开所有子查询到一个map里，
-     * key只存真实的表名，如果查询的没有真实的表名，则会被忽略。
-     * value只存真实的字段名，如果查询的没有真实的字段名，则会被忽略。
-     * <p>
-     * 例如：SELECT a.*,d.age,(SELECT count(1) FROM sys_depart) AS count FROM (SELECT username AS foo, realname FROM sys_user) a, demo d
-     * 解析后的结果为：{sys_user=[username, realname], demo=[age], sys_depart=[]}
-     *
-     * @param selectSql
-     * @return
-     */
-    public static Map<String, SelectSqlInfo> parseAllSelectTable(String selectSql) throws JSQLParserException {
-        if (oConvertUtils.isEmpty(selectSql)) {
-            return null;
-        }
-        // log.info("解析查询Sql：{}", selectSql);
-        JSqlParserAllTableManager allTableManager = new JSqlParserAllTableManager(selectSql);
-        return allTableManager.parse();
-    }
-
-    /**
-     * 解析 查询（select）sql的信息，子查询嵌套
-     *
-     * @param selectSql
-     * @return
-     */
-    public static SelectSqlInfo parseSelectSqlInfo(String selectSql) throws JSQLParserException {
-        if (oConvertUtils.isEmpty(selectSql)) {
-            return null;
-        }
-        // log.info("解析查询Sql：{}", selectSql);
-        // 使用 JSqlParer 解析sql
-        // 1、创建解析器
-        CCJSqlParserManager mgr = new CCJSqlParserManager();
-        // 2、使用解析器解析sql生成具有层次结构的java类
-        Statement stmt = mgr.parse(new StringReader(selectSql));
-        if (stmt instanceof Select) {
-            Select selectStatement = (Select) stmt;
-            // 3、解析select查询sql的信息
-            return JSqlParserUtils.parseBySelectBody(selectStatement.getSelectBody());
-        } else {
-            // 非 select 查询sql，不做处理
-            throw new JeecgBootException("非 select 查询sql，不做处理");
-        }
-    }
-
-    /**
-     * 解析 select 查询sql的信息
-     *
-     * @param selectBody
-     * @return
-     */
-    private static SelectSqlInfo parseBySelectBody(SelectBody selectBody) {
-        // 判断是否使用了union等操作
-        if (selectBody instanceof SetOperationList) {
-            // 如果使用了union等操作，则只解析第一个查询
-            List<SelectBody> selectBodyList = ((SetOperationList) selectBody).getSelects();
-            return JSqlParserUtils.parseBySelectBody(selectBodyList.get(0));
-        }
-        // 简单的select查询
-        if (selectBody instanceof PlainSelect) {
-            SelectSqlInfo sqlInfo = new SelectSqlInfo(selectBody);
-            PlainSelect plainSelect = (PlainSelect) selectBody;
-            FromItem fromItem = plainSelect.getFromItem();
-            // 解析 aliasName
-            if (fromItem.getAlias() != null) {
-                sqlInfo.setFromTableAliasName(fromItem.getAlias().getName());
-            }
-            // 解析 表名
-            if (fromItem instanceof Table) {
-                // 通过表名的方式from
-                Table fromTable = (Table) fromItem;
-                sqlInfo.setFromTableName(fromTable.getName());
-            } else if (fromItem instanceof SubSelect) {
-                // 通过子查询的方式from
-                SubSelect fromSubSelect = (SubSelect) fromItem;
-                SelectSqlInfo subSqlInfo = JSqlParserUtils.parseBySelectBody(fromSubSelect.getSelectBody());
-                sqlInfo.setFromSubSelect(subSqlInfo);
-            }
-            // 解析 selectFields
-            List<SelectItem> selectItems = plainSelect.getSelectItems();
-            for (SelectItem selectItem : selectItems) {
-                if (selectItem instanceof AllColumns || selectItem instanceof AllTableColumns) {
-                    // 全部字段
-                    sqlInfo.setSelectAll(true);
-                    sqlInfo.setSelectFields(null);
-                    sqlInfo.setRealSelectFields(null);
-                    break;
-                } else if (selectItem instanceof SelectExpressionItem) {
-                    // 获取单个查询字段名
-                    SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
-                    Expression expression = selectExpressionItem.getExpression();
-                    Alias alias = selectExpressionItem.getAlias();
-                    JSqlParserUtils.handleExpression(sqlInfo, expression, alias);
-                }
-            }
-            return sqlInfo;
-        } else {
-            log.warn("暂时尚未处理该类型的 SelectBody: {}", selectBody.getClass().getName());
-            throw new JeecgBootException("暂时尚未处理该类型的 SelectBody");
-        }
-    }
-
-    /**
-     * 处理查询字段表达式
-     *
-     * @param sqlInfo
-     * @param expression
-     * @param alias      是否有别名，无传null
-     */
-    private static void handleExpression(SelectSqlInfo sqlInfo, Expression expression, Alias alias) {
-        // 处理函数式字段  CONCAT(name,'(',age,')')
-        if (expression instanceof Function) {
-            JSqlParserUtils.handleFunctionExpression((Function) expression, sqlInfo);
-            return;
-        }
-        // 处理字段上的子查询
-        if (expression instanceof SubSelect) {
-            SubSelect subSelect = (SubSelect) expression;
-            SelectSqlInfo subSqlInfo = JSqlParserUtils.parseBySelectBody(subSelect.getSelectBody());
-            // 注：字段上的子查询，必须只查询一个字段，否则会报错，所以可以放心合并
-            sqlInfo.getSelectFields().addAll(subSqlInfo.getSelectFields());
-            sqlInfo.getRealSelectFields().addAll(subSqlInfo.getAllRealSelectFields());
-            return;
-        }
-        // 不处理字面量
-        if (expression instanceof StringValue ||
-                expression instanceof NullValue ||
-                expression instanceof LongValue ||
-                expression instanceof DoubleValue ||
-                expression instanceof HexValue ||
-                expression instanceof DateValue ||
-                expression instanceof TimestampValue ||
-                expression instanceof TimeValue
-        ) {
-            return;
-        }
-
-        // 查询字段名
-        String selectField = expression.toString();
-        // 实际查询字段名
-        String realSelectField = selectField;
-        // 判断是否有别名
-        if (alias != null) {
-            selectField = alias.getName();
-        }
-        // 获取真实字段名
-        if (expression instanceof Column) {
-            Column column = (Column) expression;
-            realSelectField = column.getColumnName();
-        }
-        sqlInfo.addSelectField(selectField, realSelectField);
-    }
-
-    /**
-     * 处理函数式字段
-     *
-     * @param functionExp
-     * @param sqlInfo
-     */
-    private static void handleFunctionExpression(Function functionExp, SelectSqlInfo sqlInfo) {
-        List<Expression> expressions = functionExp.getParameters().getExpressions();
-        for (Expression expression : expressions) {
-            JSqlParserUtils.handleExpression(sqlInfo, expression, null);
-        }
-    }
-
-}
+//package org.jeecg.common.util.sqlparse;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import net.sf.jsqlparser.JSQLParserException;
+//import net.sf.jsqlparser.expression.*;
+//import net.sf.jsqlparser.parser.CCJSqlParserManager;
+//import net.sf.jsqlparser.schema.Column;
+//import net.sf.jsqlparser.schema.Table;
+//import net.sf.jsqlparser.statement.Statement;
+//import net.sf.jsqlparser.statement.select.*;
+//import org.jeecg.common.exception.JeecgBootException;
+//import org.jeecg.common.util.oConvertUtils;
+//import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo;
+//
+//import java.io.StringReader;
+//import java.util.List;
+//import java.util.Map;
+//
+//@Slf4j
+//public class JSqlParserUtils {
+//
+//    /**
+//     * 解析 查询（select）sql的信息，
+//     * 此方法会展开所有子查询到一个map里，
+//     * key只存真实的表名，如果查询的没有真实的表名，则会被忽略。
+//     * value只存真实的字段名，如果查询的没有真实的字段名，则会被忽略。
+//     * <p>
+//     * 例如：SELECT a.*,d.age,(SELECT count(1) FROM sys_depart) AS count FROM (SELECT username AS foo, realname FROM sys_user) a, demo d
+//     * 解析后的结果为：{sys_user=[username, realname], demo=[age], sys_depart=[]}
+//     *
+//     * @param selectSql
+//     * @return
+//     */
+//    public static Map<String, SelectSqlInfo> parseAllSelectTable(String selectSql) throws JSQLParserException {
+//        if (oConvertUtils.isEmpty(selectSql)) {
+//            return null;
+//        }
+//        // log.info("解析查询Sql：{}", selectSql);
+//        JSqlParserAllTableManager allTableManager = new JSqlParserAllTableManager(selectSql);
+//        return allTableManager.parse();
+//    }
+//
+//    /**
+//     * 解析 查询（select）sql的信息，子查询嵌套
+//     *
+//     * @param selectSql
+//     * @return
+//     */
+//    public static SelectSqlInfo parseSelectSqlInfo(String selectSql) throws JSQLParserException {
+//        if (oConvertUtils.isEmpty(selectSql)) {
+//            return null;
+//        }
+//        // log.info("解析查询Sql：{}", selectSql);
+//        // 使用 JSqlParer 解析sql
+//        // 1、创建解析器
+//        CCJSqlParserManager mgr = new CCJSqlParserManager();
+//        // 2、使用解析器解析sql生成具有层次结构的java类
+//        Statement stmt = mgr.parse(new StringReader(selectSql));
+//        if (stmt instanceof Select) {
+//            Select selectStatement = (Select) stmt;
+//            // 3、解析select查询sql的信息
+//            return JSqlParserUtils.parseBySelectBody(selectStatement.getSelectBody());
+//        } else {
+//            // 非 select 查询sql，不做处理
+//            throw new JeecgBootException("非 select 查询sql，不做处理");
+//        }
+//    }
+//
+//    /**
+//     * 解析 select 查询sql的信息
+//     *
+//     * @param selectBody
+//     * @return
+//     */
+//    private static SelectSqlInfo parseBySelectBody(SelectBody selectBody) {
+//        // 判断是否使用了union等操作
+//        if (selectBody instanceof SetOperationList) {
+//            // 如果使用了union等操作，则只解析第一个查询
+//            List<SelectBody> selectBodyList = ((SetOperationList) selectBody).getSelects();
+//            return JSqlParserUtils.parseBySelectBody(selectBodyList.get(0));
+//        }
+//        // 简单的select查询
+//        if (selectBody instanceof PlainSelect) {
+//            SelectSqlInfo sqlInfo = new SelectSqlInfo(selectBody);
+//            PlainSelect plainSelect = (PlainSelect) selectBody;
+//            FromItem fromItem = plainSelect.getFromItem();
+//            // 解析 aliasName
+//            if (fromItem.getAlias() != null) {
+//                sqlInfo.setFromTableAliasName(fromItem.getAlias().getName());
+//            }
+//            // 解析 表名
+//            if (fromItem instanceof Table) {
+//                // 通过表名的方式from
+//                Table fromTable = (Table) fromItem;
+//                sqlInfo.setFromTableName(fromTable.getName());
+//            } else if (fromItem instanceof SubSelect) {
+//                // 通过子查询的方式from
+//                SubSelect fromSubSelect = (SubSelect) fromItem;
+//                SelectSqlInfo subSqlInfo = JSqlParserUtils.parseBySelectBody(fromSubSelect.getSelectBody());
+//                sqlInfo.setFromSubSelect(subSqlInfo);
+//            }
+//            // 解析 selectFields
+//            List<SelectItem> selectItems = plainSelect.getSelectItems();
+//            for (SelectItem selectItem : selectItems) {
+//                if (selectItem instanceof AllColumns || selectItem instanceof AllTableColumns) {
+//                    // 全部字段
+//                    sqlInfo.setSelectAll(true);
+//                    sqlInfo.setSelectFields(null);
+//                    sqlInfo.setRealSelectFields(null);
+//                    break;
+//                } else if (selectItem instanceof SelectExpressionItem) {
+//                    // 获取单个查询字段名
+//                    SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
+//                    Expression expression = selectExpressionItem.getExpression();
+//                    Alias alias = selectExpressionItem.getAlias();
+//                    JSqlParserUtils.handleExpression(sqlInfo, expression, alias);
+//                }
+//            }
+//            return sqlInfo;
+//        } else {
+//            log.warn("暂时尚未处理该类型的 SelectBody: {}", selectBody.getClass().getName());
+//            throw new JeecgBootException("暂时尚未处理该类型的 SelectBody");
+//        }
+//    }
+//
+//    /**
+//     * 处理查询字段表达式
+//     *
+//     * @param sqlInfo
+//     * @param expression
+//     * @param alias      是否有别名，无传null
+//     */
+//    private static void handleExpression(SelectSqlInfo sqlInfo, Expression expression, Alias alias) {
+//        // 处理函数式字段  CONCAT(name,'(',age,')')
+//        if (expression instanceof Function) {
+//            JSqlParserUtils.handleFunctionExpression((Function) expression, sqlInfo);
+//            return;
+//        }
+//        // 处理字段上的子查询
+//        if (expression instanceof SubSelect) {
+//            SubSelect subSelect = (SubSelect) expression;
+//            SelectSqlInfo subSqlInfo = JSqlParserUtils.parseBySelectBody(subSelect.getSelectBody());
+//            // 注：字段上的子查询，必须只查询一个字段，否则会报错，所以可以放心合并
+//            sqlInfo.getSelectFields().addAll(subSqlInfo.getSelectFields());
+//            sqlInfo.getRealSelectFields().addAll(subSqlInfo.getAllRealSelectFields());
+//            return;
+//        }
+//        // 不处理字面量
+//        if (expression instanceof StringValue ||
+//                expression instanceof NullValue ||
+//                expression instanceof LongValue ||
+//                expression instanceof DoubleValue ||
+//                expression instanceof HexValue ||
+//                expression instanceof DateValue ||
+//                expression instanceof TimestampValue ||
+//                expression instanceof TimeValue
+//        ) {
+//            return;
+//        }
+//
+//        // 查询字段名
+//        String selectField = expression.toString();
+//        // 实际查询字段名
+//        String realSelectField = selectField;
+//        // 判断是否有别名
+//        if (alias != null) {
+//            selectField = alias.getName();
+//        }
+//        // 获取真实字段名
+//        if (expression instanceof Column) {
+//            Column column = (Column) expression;
+//            realSelectField = column.getColumnName();
+//        }
+//        sqlInfo.addSelectField(selectField, realSelectField);
+//    }
+//
+//    /**
+//     * 处理函数式字段
+//     *
+//     * @param functionExp
+//     * @param sqlInfo
+//     */
+//    private static void handleFunctionExpression(Function functionExp, SelectSqlInfo sqlInfo) {
+//        List<Expression> expressions = functionExp.getParameters().getExpressions();
+//        for (Expression expression : expressions) {
+//            JSqlParserUtils.handleExpression(sqlInfo, expression, null);
+//        }
+//    }
+//
+//}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java

@@ -1,101 +1,101 @@
-package org.jeecg.common.util.sqlparse.vo;
-
-import lombok.Data;
-import net.sf.jsqlparser.statement.select.SelectBody;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * select 查询 sql 的信息
- */
-@Data
-public class SelectSqlInfo {
-
-    /**
-     * 查询的表名，如果是子查询，则此处为null
-     */
-    private String fromTableName;
-    /**
-     * 表别名
-     */
-    private String fromTableAliasName;
-    /**
-     * 通过子查询获取的表信息，例如：select name from (select * from user) u
-     * 如果不是子查询，则为null
-     */
-    private SelectSqlInfo fromSubSelect;
-    /**
-     * 查询的字段集合，如果是 * 则为null，如果设了别名则为别名
-     */
-    private Set<String> selectFields;
-    /**
-     * 真实的查询字段集合，如果是 * 则为null，如果设了别名则为原始字段名
-     */
-    private Set<String> realSelectFields;
-    /**
-     * 是否是查询所有字段
-     */
-    private boolean selectAll;
-
-    /**
-     * 解析之后的 SQL （关键字都是大写）
-     */
-    private final String parsedSql;
-
-    public SelectSqlInfo(String parsedSql) {
-        this.parsedSql = parsedSql;
-    }
-
-    public SelectSqlInfo(SelectBody selectBody) {
-        this.parsedSql = selectBody.toString();
-    }
-
-    public void addSelectField(String selectField, String realSelectField) {
-        if (this.selectFields == null) {
-            this.selectFields = new HashSet<>();
-        }
-        if (this.realSelectFields == null) {
-            this.realSelectFields = new HashSet<>();
-        }
-        this.selectFields.add(selectField);
-        this.realSelectFields.add(realSelectField);
-    }
-
-    /**
-     * 获取所有字段，包括子查询里的。
-     *
-     * @return
-     */
-    public Set<String> getAllRealSelectFields() {
-        Set<String> fields = new HashSet<>();
-        // 递归获取所有字段，起个直观的方法名为：
-        this.recursiveGetAllFields(this, fields);
-        return fields;
-    }
-
-    /**
-     * 递归获取所有字段
-     */
-    private void recursiveGetAllFields(SelectSqlInfo sqlInfo, Set<String> fields) {
-        if (!sqlInfo.isSelectAll() && sqlInfo.getRealSelectFields() != null) {
-            fields.addAll(sqlInfo.getRealSelectFields());
-        }
-        if (sqlInfo.getFromSubSelect() != null) {
-            recursiveGetAllFields(sqlInfo.getFromSubSelect(), fields);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "SelectSqlInfo{" +
-                "fromTableName='" + fromTableName + '\'' +
-                ", fromSubSelect=" + fromSubSelect +
-                ", aliasName='" + fromTableAliasName + '\'' +
-                ", selectFields=" + selectFields +
-                ", realSelectFields=" + realSelectFields +
-                ", selectAll=" + selectAll +
-                "}";
-    }
-
-}
+//package org.jeecg.common.util.sqlparse.vo;
+//
+//import lombok.Data;
+//import net.sf.jsqlparser.statement.select.SelectBody;
+//
+//import java.util.HashSet;
+//import java.util.Set;
+//
+///**
+// * select 查询 sql 的信息
+// */
+//@Data
+//public class SelectSqlInfo {
+//
+//    /**
+//     * 查询的表名，如果是子查询，则此处为null
+//     */
+//    private String fromTableName;
+//    /**
+//     * 表别名
+//     */
+//    private String fromTableAliasName;
+//    /**
+//     * 通过子查询获取的表信息，例如：select name from (select * from user) u
+//     * 如果不是子查询，则为null
+//     */
+//    private SelectSqlInfo fromSubSelect;
+//    /**
+//     * 查询的字段集合，如果是 * 则为null，如果设了别名则为别名
+//     */
+//    private Set<String> selectFields;
+//    /**
+//     * 真实的查询字段集合，如果是 * 则为null，如果设了别名则为原始字段名
+//     */
+//    private Set<String> realSelectFields;
+//    /**
+//     * 是否是查询所有字段
+//     */
+//    private boolean selectAll;
+//
+//    /**
+//     * 解析之后的 SQL （关键字都是大写）
+//     */
+//    private final String parsedSql;
+//
+//    public SelectSqlInfo(String parsedSql) {
+//        this.parsedSql = parsedSql;
+//    }
+//
+//    public SelectSqlInfo(SelectBody selectBody) {
+//        this.parsedSql = selectBody.toString();
+//    }
+//
+//    public void addSelectField(String selectField, String realSelectField) {
+//        if (this.selectFields == null) {
+//            this.selectFields = new HashSet<>();
+//        }
+//        if (this.realSelectFields == null) {
+//            this.realSelectFields = new HashSet<>();
+//        }
+//        this.selectFields.add(selectField);
+//        this.realSelectFields.add(realSelectField);
+//    }
+//
+//    /**
+//     * 获取所有字段，包括子查询里的。
+//     *
+//     * @return
+//     */
+//    public Set<String> getAllRealSelectFields() {
+//        Set<String> fields = new HashSet<>();
+//        // 递归获取所有字段，起个直观的方法名为：
+//        this.recursiveGetAllFields(this, fields);
+//        return fields;
+//    }
+//
+//    /**
+//     * 递归获取所有字段
+//     */
+//    private void recursiveGetAllFields(SelectSqlInfo sqlInfo, Set<String> fields) {
+//        if (!sqlInfo.isSelectAll() && sqlInfo.getRealSelectFields() != null) {
+//            fields.addAll(sqlInfo.getRealSelectFields());
+//        }
+//        if (sqlInfo.getFromSubSelect() != null) {
+//            recursiveGetAllFields(sqlInfo.getFromSubSelect(), fields);
+//        }
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return "SelectSqlInfo{" +
+//                "fromTableName='" + fromTableName + '\'' +
+//                ", fromSubSelect=" + fromSubSelect +
+//                ", aliasName='" + fromTableAliasName + '\'' +
+//                ", selectFields=" + selectFields +
+//                ", realSelectFields=" + realSelectFields +
+//                ", selectAll=" + selectAll +
+//                "}";
+//    }
+//
+//}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java

@@ -17,6 +17,10 @@ public class JeecgBaseConfig {
      * @TODO 降低使用成本加的默认值,实际以 yml配置 为准
      */
     private String signatureSecret = "dd05f1c54d63749eda95f9fa6d49v442a";
+    /**
+     * 自定义后台资源前缀，解决表单设计器无法通过前端nginx转发访问
+     */
+    private String customResourcePrefixPath;
     /**
      * 需要加强校验的接口清单
      */
@@ -68,6 +72,19 @@ public class JeecgBaseConfig {
      */
     private BaiduApi baiduApi;    
     
+    /**
+     * 高德开放API配置
+     */
+    private GaoDeApi gaoDeApi;
+
+    public String getCustomResourcePrefixPath() {
+        return customResourcePrefixPath;
+    }
+
+    public void setCustomResourcePrefixPath(String customResourcePrefixPath) {
+        this.customResourcePrefixPath = customResourcePrefixPath;
+    }
+
     public Elasticsearch getElasticsearch() {
         return elasticsearch;
     }
@@ -156,4 +173,11 @@ public class JeecgBaseConfig {
         this.baiduApi = baiduApi;
     }
 
+    public GaoDeApi getGaoDeApi() {
+        return gaoDeApi;
+    }
+
+    public void setGaoDeApi(GaoDeApi gaoDeApi) {
+        this.gaoDeApi = gaoDeApi;
+    }
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -1,188 +1,188 @@
-package org.jeecg.config;
-
-
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author scott
- */
-@Configuration
-@EnableSwagger2WebMvc
-@Import(BeanValidatorPluginsConfiguration.class)
-public class Swagger2Config implements WebMvcConfigurer {
-
-    /**
-     *
-     * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
-     *
-     * @param registry
-     */
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
-    /**
-     * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
-     *
-     * @return Docket
-     */
-    @Bean(value = "defaultApi2")
-    public Docket defaultApi2() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                //此包路径下的类，才生成接口文档
-                .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
-                //加了ApiOperation注解的类，才生成接口文档
-                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                .paths(PathSelectors.any())
-                .build()
-                .securitySchemes(Collections.singletonList(securityScheme()))
-                .securityContexts(securityContexts())
-                .globalOperationParameters(setHeaderToken());
-    }
-
-    /***
-     * oauth2配置
-     * 需要增加swagger授权回调地址
-     * http://localhost:8888/webjars/springfox-swagger-ui/o2c.html
-     * @return
-     */
-    @Bean
-    SecurityScheme securityScheme() {
-        return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
-    }
-    /**
-     * JWT token
-     * @return
-     */
-    private List<Parameter> setHeaderToken() {
-        ParameterBuilder tokenPar = new ParameterBuilder();
-        List<Parameter> pars = new ArrayList<>();
-        tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-        pars.add(tokenPar.build());
-        //update-begin-author:liusq---date:2024-08-15--for:  开启多租户时，全局参数增加租户id
-        if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
-            ParameterBuilder tenantPar = new ParameterBuilder();
-            tenantPar.name(CommonConstant.TENANT_ID).description("租户ID").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-            pars.add(tenantPar.build());
-        }
-        //update-end-author:liusq---date:2024-08-15--for: 开启多租户时，全局参数增加租户id
-
-        return pars;
-    }
-
-    /**
-     * api文档的详细信息函数,注意这里的注解引用的是哪个
-     *
-     * @return
-     */
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                // //大标题
-                .title("JeecgBoot 后台服务API接口文档")
-                // 版本号
-                .version("1.0")
-//				.termsOfServiceUrl("NO terms of service")
-                // 描述
-                .description("后台API接口")
-                // 作者
-                .contact(new Contact("北京国炬信息技术有限公司","www.jeccg.com","jeecgos@163.com"))
-                .license("The Apache License, Version 2.0")
-                .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
-                .build();
-    }
-
-    /**
-     * 新增 securityContexts 保持登录状态
-     */
-    private List<SecurityContext> securityContexts() {
-        return new ArrayList(
-                Collections.singleton(SecurityContext.builder()
-                        .securityReferences(defaultAuth())
-                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
-                        .build())
-        );
-    }
-
-    private List<SecurityReference> defaultAuth() {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        return new ArrayList(
-                Collections.singleton(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes)));
-    }
-
-    /**
-     * 解决springboot2.6 和springfox不兼容问题
-     * @return
-     */
-    @Bean
-    public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
-        return new BeanPostProcessor() {
-
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-                if (bean instanceof WebMvcRequestHandlerProvider) {
-                    customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
-                }
-                return bean;
-            }
-
-            private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
-                List<T> copy = mappings.stream()
-                        .filter(mapping -> mapping.getPatternParser() == null)
-                        .collect(Collectors.toList());
-                mappings.clear();
-                mappings.addAll(copy);
-            }
-
-            @SuppressWarnings("unchecked")
-            private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
-                try {
-                    Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
-                    field.setAccessible(true);
-                    return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
-                } catch (IllegalArgumentException | IllegalAccessException e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-        };
-    }
-
-
-}
+//package org.jeecg.config;
+//
+//
+//import io.swagger.v3.oas.annotations.Operation;
+//import org.jeecg.common.constant.CommonConstant;
+//import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+//import org.springframework.beans.BeansException;
+//import org.springframework.beans.factory.config.BeanPostProcessor;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Import;
+//import org.springframework.util.ReflectionUtils;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
+//import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.ParameterBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.schema.ModelRef;
+//import springfox.documentation.service.*;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spi.service.contexts.SecurityContext;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+//
+//import java.lang.reflect.Field;
+//import java.util.ArrayList;
+//import java.util.Collections;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * @Author scott
+// */
+//@Configuration
+//@EnableSwagger2WebMvc
+//@Import(BeanValidatorPluginsConfiguration.class)
+//public class Swagger2Config implements WebMvcConfigurer {
+//
+//    /**
+//     *
+//     * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
+//     *
+//     * @param registry
+//     */
+//    @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+//    }
+//
+//    /**
+//     * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
+//     *
+//     * @return Docket
+//     */
+//    @Bean(value = "defaultApi2")
+//    public Docket defaultApi2() {
+//        return new Docket(DocumentationType.SWAGGER_2)
+//                .apiInfo(apiInfo())
+//                .select()
+//                //此包路径下的类，才生成接口文档
+//                .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
+//                //加了ApiOperation注解的类，才生成接口文档
+//                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+//                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+//                .paths(PathSelectors.any())
+//                .build()
+//                .securitySchemes(Collections.singletonList(securityScheme()))
+//                .securityContexts(securityContexts())
+//                .globalOperationParameters(setHeaderToken());
+//    }
+//
+//    /***
+//     * oauth2配置
+//     * 需要增加swagger授权回调地址
+//     * http://localhost:8888/webjars/springfox-swagger-ui/o2c.html
+//     * @return
+//     */
+//    @Bean
+//    SecurityScheme securityScheme() {
+//        return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
+//    }
+//    /**
+//     * JWT token
+//     * @return
+//     */
+//    private List<Parameter> setHeaderToken() {
+//        ParameterBuilder tokenPar = new ParameterBuilder();
+//        List<Parameter> pars = new ArrayList<>();
+//        tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+//        pars.add(tokenPar.build());
+//        //update-begin-author:liusq---date:2024-08-15--for:  开启多租户时，全局参数增加租户id
+//        if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
+//            ParameterBuilder tenantPar = new ParameterBuilder();
+//            tenantPar.name(CommonConstant.TENANT_ID).description("租户ID").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+//            pars.add(tenantPar.build());
+//        }
+//        //update-end-author:liusq---date:2024-08-15--for: 开启多租户时，全局参数增加租户id
+//
+//        return pars;
+//    }
+//
+//    /**
+//     * api文档的详细信息函数,注意这里的注解引用的是哪个
+//     *
+//     * @return
+//     */
+//    private ApiInfo apiInfo() {
+//        return new ApiInfoBuilder()
+//                // //大标题
+//                .title("JeecgBoot 后台服务API接口文档")
+//                // 版本号
+//                .version("1.0")
+////				.termsOfServiceUrl("NO terms of service")
+//                // 描述
+//                .description("后台API接口")
+//                // 作者
+//                .contact(new Contact("北京国炬信息技术有限公司","www.jeccg.com","jeecgos@163.com"))
+//                .license("The Apache License, Version 2.0")
+//                .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
+//                .build();
+//    }
+//
+//    /**
+//     * 新增 securityContexts 保持登录状态
+//     */
+//    private List<SecurityContext> securityContexts() {
+//        return new ArrayList(
+//                Collections.singleton(SecurityContext.builder()
+//                        .securityReferences(defaultAuth())
+//                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
+//                        .build())
+//        );
+//    }
+//
+//    private List<SecurityReference> defaultAuth() {
+//        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+//        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+//        authorizationScopes[0] = authorizationScope;
+//        return new ArrayList(
+//                Collections.singleton(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes)));
+//    }
+//
+//    /**
+//     * 解决springboot2.6 和springfox不兼容问题
+//     * @return
+//     */
+//    @Bean
+//    public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
+//        return new BeanPostProcessor() {
+//
+//            @Override
+//            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+//                if (bean instanceof WebMvcRequestHandlerProvider) {
+//                    customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
+//                }
+//                return bean;
+//            }
+//
+//            private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
+//                List<T> copy = mappings.stream()
+//                        .filter(mapping -> mapping.getPatternParser() == null)
+//                        .collect(Collectors.toList());
+//                mappings.clear();
+//                mappings.addAll(copy);
+//            }
+//
+//            @SuppressWarnings("unchecked")
+//            private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
+//                try {
+//                    Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
+//                    field.setAccessible(true);
+//                    return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+//                } catch (IllegalArgumentException | IllegalAccessException e) {
+//                    throw new IllegalStateException(e);
+//                }
+//            }
+//        };
+//    }
+//
+//
+//}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java

@@ -0,0 +1,100 @@
+package org.jeecg.config;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
+import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
+import org.springdoc.core.filters.GlobalOpenApiMethodFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author eightmonth
+ */
+@Slf4j
+@Configuration
+@PropertySource("classpath:config/default-spring-doc.properties")
+public class Swagger3Config implements WebMvcConfigurer {
+    // 定义不需要注入安全要求的路径集合
+    Set<String> excludedPaths = new HashSet<>(Arrays.asList(
+            "/sys/randomImage/{key}",
+            "/sys/login",
+            "/sys/phoneLogin",
+            "/sys/mLogin",
+            "/sys/sms",
+            "/sys/cas/client/validateLogin",
+            "/test/jeecgDemo/demo3",
+            "/sys/thirdLogin/**",
+            "/sys/user/register"
+    ));
+
+    /**
+     *
+     * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
+     *
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    @Bean
+    public GlobalOpenApiMethodFilter globalOpenApiMethodFilter() {
+        return method -> method.isAnnotationPresent(Operation.class);
+    }
+
+    @Bean
+    public GlobalOpenApiCustomizer globalOpenApiCustomizer() {
+        return openApi -> {
+            // 全局添加鉴权参数
+            if (openApi.getPaths() != null) {
+                openApi.getPaths().forEach((path, pathItem) -> {
+                    //log.debug("path: {}", path);
+                    // 检查当前路径是否在排除列表中
+                    boolean isExcluded = excludedPaths.stream().anyMatch(
+                            excludedPath -> excludedPath.equals(path) || (excludedPath.endsWith("**") && path.startsWith(excludedPath.substring(0, excludedPath.length() - 2)))
+                    );
+
+                    if (!isExcluded) {
+                        // 接口添加鉴权参数
+                        pathItem.readOperations().forEach(operation ->
+                                operation.addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN))
+                        );
+                    }
+                });
+            }
+        };
+    }
+
+    @Bean
+    public OpenAPI customOpenAPI() {
+        return new OpenAPI()
+                .info(new Info()
+                        .title("JeecgBoot 后台服务API接口文档")
+                        .version("3.8.2")
+                        .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com"))
+                        .description( "后台API接口")
+                        .termsOfService("NO terms of service")
+                        .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")))
+                .addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN))
+                .components(new Components().addSecuritySchemes(CommonConstant.X_ACCESS_TOKEN,
+                        new SecurityScheme().name(CommonConstant.X_ACCESS_TOKEN).type(SecurityScheme.Type.HTTP)));
+    }
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -11,15 +11,17 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.event.EventListener;
+import org.springframework.http.CacheControl;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.cors.CorsConfiguration;
@@ -37,6 +39,7 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Spring Boot 2.0 解决跨域问题
@@ -55,6 +58,14 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     @Autowired(required = false)
     private PrometheusMeterRegistry prometheusMeterRegistry;
 
+    /**
+     * meterRegistryPostProcessor
+     * for [QQYUN-12558]【监控】系统监控的头两个tab不好使，接口404
+     */
+    @Autowired(required = false)
+    @Qualifier("meterRegistryPostProcessor")
+    private BeanPostProcessor meterRegistryPostProcessor;
+
     /**
      * 静态资源的配置 - 使得可以从磁盘中读取 Html、图片、视频、音频等
      */
@@ -67,6 +78,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
                     .addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//");
         }
         resourceHandlerRegistration.addResourceLocations(staticLocations.split(","));
+        // 设置缓存控制标头 Cache-Control有效期为30天
+        resourceHandlerRegistration.setCacheControl(CacheControl.maxAge(30, TimeUnit.DAYS));
     }
 
     /**
@@ -75,7 +88,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
      */
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/").setViewName("doc.html");
+        registry.addViewController("/").setViewName("redirect:/doc.html");
     }
 
     @Bean
@@ -141,11 +154,17 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 
 
     /**
-     * 解决metrics端点不显示jvm信息的问题(zyf)
+     * 监听应用启动完成事件，确保 PrometheusMeterRegistry 已经初始化
+     * for [QQYUN-12558]【监控】系统监控的头两个tab不好使，接口404
+     * @param event
+     * @author chenrui
+     * @date 2025/5/26 16:46
      */
-    @Bean
-    InitializingBean forcePrometheusPostProcessor(BeanPostProcessor meterRegistryPostProcessor) {
-        return () -> meterRegistryPostProcessor.postProcessAfterInitialization(prometheusMeterRegistry, "");
+    @EventListener
+    public void onApplicationReady(ApplicationReadyEvent event) {
+        if(null != meterRegistryPostProcessor){
+            meterRegistryPostProcessor.postProcessAfterInitialization(prometheusMeterRegistry, "");
+        }
     }
 
 //    /**

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java

@@ -8,12 +8,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class LowCodeModeConfiguration implements WebMvcConfigurer {
 
-    public LowCodeModeInterceptor payInterceptor() {
-        return new LowCodeModeInterceptor();
+    private final LowCodeModeInterceptor lowCodeModeInterceptor;
+
+    public LowCodeModeConfiguration(LowCodeModeInterceptor lowCodeModeInterceptor) {
+        this.lowCodeModeInterceptor = lowCodeModeInterceptor;
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(payInterceptor()).addPathPatterns(LowCodeUrlsEnum.getLowCodeInterceptUrls());
+        registry.addInterceptor(lowCodeModeInterceptor).addPathPatterns(LowCodeUrlsEnum.getLowCodeInterceptUrls());
     }
 }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java

@@ -6,15 +6,12 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.config.JeecgBaseConfig;
-import org.jeecg.config.firewall.interceptor.enums.LowCodeUrlsEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.AntPathMatcher;
+import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.annotation.Resource;
@@ -41,6 +38,7 @@ import java.util.Set;
  * @date 20230904
  */
 @Slf4j
+@Component
 public class LowCodeModeInterceptor implements HandlerInterceptor {
     /**
      * 低代码开发模式
@@ -50,18 +48,22 @@ public class LowCodeModeInterceptor implements HandlerInterceptor {
 
     @Resource
     private JeecgBaseConfig jeecgBaseConfig;
-    @Autowired
-    private CommonAPI commonAPI;
     
     /**
      * 在请求处理之前进行调用
      */
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        CommonAPI commonAPI = null;
+        log.info("低代码模式，拦截请求路径：" + request.getRequestURI());
+        
         //1、验证是否开启低代码开发模式控制
         if (jeecgBaseConfig == null) {
             jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class);
         }
+        if (commonAPI == null) {
+            commonAPI = SpringContextUtils.getBean(CommonAPI.class);
+        }
 
         if (jeecgBaseConfig.getFirewall()!=null && LowCodeModeInterceptor.LOW_CODE_MODE_PROD.equals(jeecgBaseConfig.getFirewall().getLowCodeMode())) {
             String requestURI = request.getRequestURI().substring(request.getContextPath().length());
@@ -70,6 +72,9 @@ public class LowCodeModeInterceptor implements HandlerInterceptor {
             Set<String> hasRoles = null;
             if (loginUser == null) {
                 loginUser = commonAPI.getUserByName(JwtUtil.getUserNameByToken(SpringContextUtils.getHttpServletRequest()));
+            }
+
+            if (loginUser != null) {
                 //当前登录人拥有的角色
                 hasRoles = commonAPI.queryUserRolesById(loginUser.getId());
             }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -1,11 +1,16 @@
 package org.jeecg.config.mybatis;
 
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.log.Log;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.TenantConstant;
@@ -13,6 +18,7 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,15 +29,19 @@ import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerIntercept
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
+import javax.sql.DataSource;
 
 /**
  * 单数据源配置（jeecg.datasource.open = false时生效）
  * @Author zhoujf
  *
  */
+@Slf4j
 @Configuration
 @MapperScan(value={"org.jeecg.**.mapper*"})
 public class MybatisPlusSaasConfig {
+    @Autowired
+    private DataSource dataSource;
     
     /**
      * 是否开启系统模块的租户隔离
@@ -60,7 +70,18 @@ public class MybatisPlusSaasConfig {
             TENANT_TABLE.add("sys_category");
             TENANT_TABLE.add("sys_data_source");
             TENANT_TABLE.add("sys_position");
-            //TENANT_TABLE.add("sys_announcement");
+            //b-2.仪表盘
+            TENANT_TABLE.add("onl_drag_page");
+            TENANT_TABLE.add("onl_drag_dataset_head");
+            TENANT_TABLE.add("jimu_report_data_source");
+            TENANT_TABLE.add("jimu_report");
+            TENANT_TABLE.add("jimu_dict");
+            //b-4.AIRAG
+            TENANT_TABLE.add("airag_app");
+            TENANT_TABLE.add("airag_flow");
+            TENANT_TABLE.add("airag_knowledge");
+            TENANT_TABLE.add("airag_knowledge_doc");
+            TENANT_TABLE.add("airag_model");
         }
 
         //2.示例测试
@@ -111,7 +132,23 @@ public class MybatisPlusSaasConfig {
         //update-begin-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
         interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor());
         //update-end-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+        
+        //update-begin---author:scott ---date:2025-08-02  for：【issues/8666】升级mybatisPlus后SqlServer分页使用OFFSET ？ ROWS FETCH NEXT ？ ROWS ONLY，导致online报表报错---
+        DbType dbType = null;
+        try {
+             dbType = JdbcUtils.getDbType(dataSource.getConnection().getMetaData().getURL());
+             log.info("当前数据库类型: {}", dbType);
+        } catch (SQLException e) {
+            Log.error(e.getMessage(), e);
+        }
+        if (dbType!=null && (dbType == DbType.SQL_SERVER || dbType == DbType.SQL_SERVER2005)) {
+            // 如果是SQL Server则覆盖为2005分页方式
+            interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.SQL_SERVER2005));
+        } else {
+            interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+        }
+        //update-end---author:scott ---date::2025-08-02  for：【issues/8666】升级mybatisPlus后SqlServer分页使用OFFSET ？ ROWS FETCH NEXT ？ ROWS ONLY，导致online报表报错---
+        
         //【jeecg-boot/issues/3847】增加@Version乐观锁支持 
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
         return interceptor;

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -109,7 +109,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
         filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码
         filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除
-
+        filterChainDefinitionMap.put("/openapi/call/**", "anon"); // 开放平台接口排除
 
         //update-begin--Author:scott Date:20221116 for：排除静态资源后缀
         filterChainDefinitionMap.put("/", "anon");
@@ -134,7 +134,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/swagger-ui.html", "anon");
         filterChainDefinitionMap.put("/swagger**/**", "anon");
         filterChainDefinitionMap.put("/webjars/**", "anon");
-        filterChainDefinitionMap.put("/v2/**", "anon");
+        filterChainDefinitionMap.put("/v3/**", "anon");
 
         // update-begin--Author:sunjianlei Date:20210510 for：排除消息通告查看详情页面（用于第三方APP）
         filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
@@ -153,7 +153,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/drag/share/view/**", "anon");
         filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getAllChartData", "anon");
         filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalData", "anon");
+        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getMapDataByCode", "anon");
+        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalDataByCompId", "anon");
         filterChainDefinitionMap.put("/drag/mock/json/**", "anon");
+        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getDictByCodes", "anon");
+
         filterChainDefinitionMap.put("/jimubi/view", "anon");
         filterChainDefinitionMap.put("/jimubi/share/view/**", "anon");
 
@@ -169,6 +173,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告
         filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块
         filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
+        //App vue3版本查询版本接口
+        filterChainDefinitionMap.put("/sys/version/app3version", "anon");
+        //仪表盘（按钮通信）
+        filterChainDefinitionMap.put("/dragChannelSocket/**","anon");
         
         //性能监控——安全隐患泄露TOEKN（durid连接池也有）
         //filterChainDefinitionMap.put("/actuator/**", "anon");
@@ -180,8 +188,6 @@ public class ShiroConfig {
         // 企业微信证书排除
         filterChainDefinitionMap.put("/WW_verify*", "anon");
         
-        filterChainDefinitionMap.put("/openapi/call/**", "anon");
-
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
         //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
@@ -217,6 +223,11 @@ public class ShiroConfig {
         //update-begin---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
         registration.addUrlPatterns("/test/ai/chat/send");
         //update-end---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
+        registration.addUrlPatterns("/airag/flow/run");
+        registration.addUrlPatterns("/airag/flow/debug");
+        registration.addUrlPatterns("/airag/chat/send");
+        registration.addUrlPatterns("/airag/app/debug");
+        registration.addUrlPatterns("/airag/app/prompt/generate");
         //支持异步
         registration.setAsyncSupported(true);
         registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/IgnoreAuthPostProcessor.java

@@ -91,6 +91,10 @@ public class IgnoreAuthPostProcessor implements InitializingBean {
         if (bases.length > 0) {
             for (String base : bases) {
                 for (String uri : uris) {
+                    // 如果uri包含路径占位符, 则需要将其替换为*
+                    if (uri.matches(".*\\{.*}.*")) {
+                        uri = uri.replaceAll("\\{.*?}", "*");
+                    }
                     urls.add(prefix(base) + prefix(uri));
                 }
             }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/InMemoryIgnoreAuth.java

@@ -1,5 +1,7 @@
 package org.jeecg.config.shiro.ignore;
 
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,6 +14,7 @@ import java.util.List;
 public class InMemoryIgnoreAuth {
     private static final List<String> IGNORE_AUTH_LIST = new ArrayList<>();
 
+    private static PathMatcher MATCHER = new AntPathMatcher();
     public InMemoryIgnoreAuth() {}
 
     public static void set(List<String> list) {
@@ -28,7 +31,7 @@ public class InMemoryIgnoreAuth {
 
     public static boolean contains(String url) {
         for (String ignoreAuth : IGNORE_AUTH_LIST) {
-            if (url.endsWith(ignoreAuth)) {
+            if(MATCHER.match(ignoreAuth,url)){
                 return true;
             }
         }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/GaoDeApi.java

@@ -0,0 +1,17 @@
+package org.jeecg.config.vo;
+
+import lombok.Data;
+
+/**
+* @Description: 高德开放api配置
+*
+* @author: wangshuai
+* @date: 2025/7/17 20:32
+*/
+@Data
+public class GaoDeApi {
+    /**应用key*/
+    private String apiKey;
+    /**应用秘钥*/
+    private String secretKey;
+}

jeecg-boot/jeecg-boot-base-core/src/main/resources/config/default-spring-doc.properties

@@ -0,0 +1,2 @@
+springdoc.auto-tag-classes: false
+springdoc.packages-to-scan: org.jeecg

jeecg-boot/jeecg-boot-base-core/src/main/resources/templates/email/bpm_cc_email.ftl

@@ -0,0 +1,104 @@
+<html>
+<head>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8">
+</head>
+
+<body>
+<div  class="box-content">
+    <div  class="info-top">
+        <img src="https://www.jeecg.com/images/logo.png" style="float: left; margin: 0 10px 0 0; width: 32px;height:32px" /><div style="color:#fff"><strong>【重要】流程抄送的通知</strong></div>
+    </div>
+    <div class="info-wrap">
+        <div class="tips" style="padding:15px;">
+            <p style="margin: 10px 0;">
+               您好，您有一个新的流程抄送任务亟待查看，任务内容如下：：
+            </p>
+            <table style="width: 400px; border-spacing: 0px; border-collapse: collapse; border: none; margin-top: 20px;"><tbody>
+                <tr style="height: 45px;">
+                    <td style="width: 150px; height: 40px; background: #F6F6F6;border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        流程名称
+                    </td>
+                    <td style="width: 250px;height: 40px; border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        ${bpm_name}<a style="color: #006eff;" href="${url}" target="_blank" rel="noopener">[立刻查看]</a>
+                    </td>
+                </tr>
+                <tr style="height: 45px;">
+                    <td style="width: 150px;height: 40px; background: #F6F6F6;border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        抄送任务
+                    </td>
+                    <td style="width: 250px;height: 40px; border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        ${bpm_task}
+                    </td>
+                </tr>
+                <tr style="height: 45px;">
+                    <td style="width: 150px; height: 40px; background: #F6F6F6;border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        抄送时间
+                    </td>
+                    <td style="width: 250px;height: 40px; border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        ${datetime}
+                    </td>
+                </tr>
+                <tr style="height: 45px;">
+                    <td style="width: 150px; height: 40px; background: #F6F6F6;border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        抄送内容
+                    </td>
+                    <td style="width: 250px;height: 40px; border: 1px solid #DBDBDB; font-size: 14px; font-weight: normal; text-align: left; padding-left: 14px;">
+                        ${remark}
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="footer">北京国炬平台</div>
+    </div>
+    <div style="margin-top: 60px;margin-bottom: 10px;">
+        <span style="font-size: 13px; font-weight: bold; color: #666;">温馨提醒</span>
+        <div style="line-height: 24px; margin-top: 10px;">
+            <div style="font-size: 13px; color: #666;">使用过程中如有任何问题，请联系系统管理员。</div>
+        </div>
+    </div>
+    <div style="width: 600px; margin: 0 auto;  margin-top: 50px; font-size: 12px; -webkit-font-smoothing: subpixel-antialiased; text-size-adjust: 100%;">
+        <p style="text-align: center; line-height: 20.4px; text-size-adjust: 100%; font-family: 'Microsoft YaHei'!important; padding: 0px !important; margin: 0px !important; color: #7e8890 !important;">
+            <span class="appleLinks">Copyright © 2023-2024 北京国炬信息技术有限公司. 保留所有权利。</span>
+        </p>
+        <p style="text-align: center;line-height: 20.4px; text-size-adjust: 100%; font-family: 'Microsoft YaHei'!important; padding: 0px !important; margin: 0px; color: #7e8890 !important; margin-top: 10px;">
+            <span class="appleLinks">邮件由系统自动发送，请勿直接回复本邮件！</span>
+        </p>
+    </div>
+</div>
+</body>
+
+<style>
+    .box-content{
+        width: 80%;
+        margin: 20px auto;
+        max-width: 800px;
+        min-width: 600px;
+    }
+
+    .info-top{
+        padding: 15px 25px;
+        border-top-left-radius: 10px;
+        border-top-right-radius: 10px;
+        background: #4ea3f2;
+        color: #fff;
+        overflow: hidden;
+        line-height: 32px;
+    }
+
+    .info-wrap{
+        border-bottom-left-radius: 10px;
+        border-bottom-right-radius: 10px;
+        border:1px solid #ddd;
+        overflow: hidden;
+        padding: 15px 15px 20px;
+    }
+
+    .footer{
+        text-align: right;
+        color: #999;
+        padding: 0 15px 15px;
+    }
+</style>
+
+</html>

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestInjectWithSqlParser.java

@@ -1,75 +0,0 @@
-package org.jeecg.test.sqlinjection;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import org.jeecg.common.util.SqlInjectionUtil;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-
-/**
- * SQL注入攻击检查测试
- * @author: liusq
- * @date: 2023年09月08日
- */
-@Slf4j
-public class TestInjectWithSqlParser {
-    /**
-     * 注入测试
-     *
-     * @param sql
-     * @return
-     */
-    private boolean isExistSqlInject(String sql) {
-        try {
-            SqlInjectionUtil.specialFilterContentForOnlineReport(sql);
-            return false;
-        } catch (Exception e) {
-            log.info("===================================================");
-            return true;
-        }
-    }
-
-
-    @Test
-    public void test() throws JSQLParserException {
-        //不存在sql注入
-        assertFalse(isExistSqlInject("select * from fm_time where dept_id=:sqlparamsmap.id and time=:sqlparamsmap.time"));
-        assertFalse(isExistSqlInject("select * from test"));
-        assertFalse(isExistSqlInject("select load_file(\"C:\\\\benben.txt\")"));
-        assertFalse(isExistSqlInject("WITH SUB1 AS (SELECT user FROM t1) SELECT * FROM T2 WHERE id > 123 "));
-
-        //存在sql注入
-        assertTrue(isExistSqlInject("or 1= 1 --"));
-        assertTrue(isExistSqlInject("select * from test where sleep(%23)"));
-        assertTrue(isExistSqlInject("select * from test where id=1 and multipoint((select * from(select * from(select user())a)b));"));
-        assertTrue(isExistSqlInject("select * from users;show databases;"));
-        assertTrue(isExistSqlInject("select * from dc_device where id=1 and length((select group_concat(table_name) from information_schema.tables where table_schema=database()))>13"));
-        assertTrue(isExistSqlInject("update user set name = '123'"));
-        assertTrue(isExistSqlInject("SELECT * FROM users WHERE username = 'admin' AND password = '123456' OR 1=1;--"));
-        assertTrue(isExistSqlInject("select * from users where id=1 and (select count(*) from information_schema.tables where table_schema='数据库名')>4 %23"));
-        assertTrue(isExistSqlInject("select * from dc_device where sleep(5) %23"));
-        assertTrue(isExistSqlInject("select * from dc_device where id in (select id from other)"));
-        assertTrue(isExistSqlInject("select * from dc_device where id in (select id from other)"));
-        assertTrue(isExistSqlInject("select * from dc_device where 2=2.0 or 2 != 4"));
-        assertTrue(isExistSqlInject("select * from dc_device where 1!=2.0"));
-        assertTrue(isExistSqlInject("select * from dc_device where id=floor(2.0)"));
-        assertTrue(isExistSqlInject("select * from dc_device where not true"));
-        assertTrue(isExistSqlInject("select * from dc_device where 1 or id > 0"));
-        assertTrue(isExistSqlInject("select * from dc_device where 'tom' or id > 0"));
-        assertTrue(isExistSqlInject("select * from dc_device where '-2.3' "));
-        assertTrue(isExistSqlInject("select * from dc_device where 2 "));
-        assertTrue(isExistSqlInject("select * from dc_device where (3+2) "));
-        assertTrue(isExistSqlInject("select * from dc_device where  -1 IS TRUE"));
-        assertTrue(isExistSqlInject("select * from dc_device where 'hello' is null "));
-        assertTrue(isExistSqlInject("select * from dc_device where '2022-10-31' and id > 0"));
-        assertTrue(isExistSqlInject("select * from dc_device where id > 0 or 1!=2.0 "));
-        assertTrue(isExistSqlInject("select * from dc_device where id > 0 or 1 in (1,3,4) "));
-        assertTrue(isExistSqlInject("select * from dc_device  UNION select name from other"));
-        assertTrue(isExistSqlInject("(SELECT 6240 FROM (SELECT(SLEEP(5))and 1=2)vidl)"));
-    }
-
-}
-

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForDict.java

@@ -1,50 +0,0 @@
-package org.jeecg.test.sqlinjection;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import org.jeecg.common.util.SqlInjectionUtil;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-
-/**
- * SQL注入攻击检查测试
- * @author: liusq
- * @date: 2023年09月08日
- */
-@Slf4j
-public class TestSqlInjectForDict {
-    /**
-     * 注入测试
-     *
-     * @param sql
-     * @return
-     */
-    private boolean isExistSqlInject(String sql) {
-        try {
-            SqlInjectionUtil.specialFilterContentForDictSql(sql);
-            return false;
-        } catch (Exception e) {
-            log.info("===================================================");
-            return true;
-        }
-    }
-
-
-    @Test
-    public void test() throws JSQLParserException {
-        //不存在sql注入
-        assertFalse(isExistSqlInject("sys_user,realname,id"));
-        assertFalse(isExistSqlInject("oa_officialdoc_organcode,organ_name,id"));
-        assertFalse(isExistSqlInject("onl_cgform_head where table_type!=3 and copy_type=0,table_txt,table_name"));
-        assertFalse(isExistSqlInject("onl_cgform_head where copy_type = 0,table_txt,table_name"));
-
-        //存在sql注入
-        assertTrue(isExistSqlInject("or 1= 1 --"));
-        assertTrue(isExistSqlInject("select * from test where sleep(%23)"));
-    }
-
-}
-

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForOnlineReport.java

@@ -1,60 +0,0 @@
-package org.jeecg.test.sqlinjection;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.JSQLParserException;
-import org.jeecg.common.util.SqlInjectionUtil;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-
-/**
- * SQL注入攻击检查测试
- * @author: liusq
- * @date: 2023年09月08日
- */
-@Slf4j
-public class TestSqlInjectForOnlineReport {
-    /**
-     * 注入测试
-     *
-     * @param sql
-     * @return
-     */
-    private boolean isExistSqlInject(String sql) {
-        try {
-            SqlInjectionUtil.specialFilterContentForOnlineReport(sql);
-            return false;
-        } catch (Exception e) {
-            log.info("===================================================");
-            return true;
-        }
-    }
-
-
-    @Test
-    public void test() throws JSQLParserException {
-        //不存在sql注入
-        assertFalse(isExistSqlInject("select * from fm_time where dept_id=:sqlparamsmap.id and time=:sqlparamsmap.time"));
-        assertFalse(isExistSqlInject("select * from test"));
-        assertFalse(isExistSqlInject("select load_file(\"C:\\\\benben.txt\")"));
-        assertFalse(isExistSqlInject("select * from dc_device where id in (select id from other)"));
-        assertFalse(isExistSqlInject("select * from dc_device  UNION select name from other"));
-
-        //存在sql注入
-        assertTrue(isExistSqlInject("(SELECT 6240 FROM (SELECT(SLEEP(5))and 1=2)vidl)"));
-        assertTrue(isExistSqlInject("or 1= 1 --"));
-        assertTrue(isExistSqlInject("select * from test where sleep(%23)"));
-        assertTrue(isExistSqlInject("select * from test where SLEEP(3)"));
-        assertTrue(isExistSqlInject("select * from test where id=1 and multipoint((select * from(select * from(select user())a)b));"));
-        assertTrue(isExistSqlInject("select * from users;show databases;"));
-        assertTrue(isExistSqlInject("select * from dc_device where id=1 and length((select group_concat(table_name) from information_schema.tables where table_schema=database()))>13"));
-        assertTrue(isExistSqlInject("update user set name = '123'"));
-        assertTrue(isExistSqlInject("SELECT * FROM users WHERE username = 'admin' AND password = '123456' OR 1=1;--"));
-        assertTrue(isExistSqlInject("select * from users where id=1 and (select count(*) from information_schema.tables where table_schema='数据库名')>4 %23"));
-        assertTrue(isExistSqlInject("select * from dc_device where sleep(5) %23"));
-    }
-
-}
-

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjection.java

@@ -1,103 +0,0 @@
-package org.jeecg.test.sqlinjection;
-
-import com.baomidou.mybatisplus.core.toolkit.sql.SqlInjectionUtils;
-import org.jeecg.common.util.SqlInjectionUtil;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * @Description: SQL注入测试类
- * @author: scott
- * @date: 2023年08月14日 9:55
- */
-public class TestSqlInjection {
-
-    
-    /**
-     * 表名带别名，同时有html编码字符
-     */
-    @Test
-    public void testSpecialSQL() {
-        String tableName = "sys_user    t";
-        //解决使用参数tableName=sys_user t&复测，漏洞仍然存在
-        if (tableName.contains(" ")) {
-            tableName = tableName.substring(0, tableName.indexOf(" "));
-        }
-        //【issues/4393】 sys_user , (sys_user), sys_user%20, %60sys_user%60
-        String reg = "\\s+|\\(|\\)|`";
-        tableName = tableName.replaceAll(reg, "");
-        System.out.println(tableName);
-    }
-
-
-    /**
-     * 测试sql是否含sql注入风险
-     * <p>
-     * mybatis plus的方法
-     */
-    @Test
-    public void sqlInjectionCheck() {
-        String sql = "select * from sys_user";
-        System.out.println(SqlInjectionUtils.check(sql));
-    }
-
-
-    /**
-     * 测试sql是否有SLEEP风险
-     * <p>
-     *  mybatisPlus的方法
-     */
-    @Test
-    public void sqlSleepCheck() {
-        SqlInjectionUtil.checkSqlAnnotation("(SELECT 6240 FROM (SELECT(SLEEP(5))and 1=2)vidl)");
-    }
-
-    /**
-     * 测试sql是否含sql注入风险
-     * <p>
-     * 自定义方法
-     */
-    @Test
-    public void sqlInjectionCheck2() {
-        String sql = "select * from sys_user";
-        SqlInjectionUtil.specialFilterContentForOnlineReport(sql);
-    }
-
-    /**
-     * 字段定义只能是是字母 数字 下划线的组合（不允许有空格、转义字符串等）
-     * <p>
-     * 判断字段名是否符合规范
-     */
-    @Test
-    public void testFieldSpecification() {
-        List<String> list = new ArrayList();
-        list.add("Hello World!");
-        list.add("Hello%20World!");
-        list.add("HelloWorld!");
-        list.add("Hello World");
-        list.add("age");
-        list.add("user_name");
-        list.add("user_name%20");
-        list.add("user_name%20 ");
-
-        for (String input : list) {
-            boolean containsSpecialChars = isValidString(input);
-            System.out.println("input:" + input + " ,包含空格和特殊字符: " + containsSpecialChars);
-        }
-    }
-
-    /**
-     * 字段定义只能是是字母 数字 下划线的组合（不允许有空格、转义字符串等）
-     *
-     * @param input
-     * @return
-     */
-    private static boolean isValidString(String input) {
-        Pattern pattern = Pattern.compile("^[a-zA-Z0-9_]+$");
-        return pattern.matcher(input).matches();
-    }
-
-}

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/JSqlParserUtilsTest.java

@@ -1,109 +0,0 @@
-package org.jeecg.test.sqlparse;
-
-import net.sf.jsqlparser.JSQLParserException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.common.util.sqlparse.JSqlParserUtils;
-import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo;
-import org.junit.Test;
-
-import java.util.Map;
-
-/**
- * 针对 JSqlParserUtils 的单元测试
- */
-public class JSqlParserUtilsTest {
-
-    private static final String[] sqlList = new String[]{
-            "select * from sys_user",
-            "select u.* from sys_user u",
-            "select u.*, c.name from sys_user u, demo c",
-            "select u.age, c.name from sys_user u, demo c",
-            "select sex, age, c.name from sys_user, demo c",
-            // 别名测试
-            "select username as realname from sys_user",
-            "select username as realname, u.realname as aaa, u.id bbb from sys_user u",
-            // 不存在真实地查询字段
-            "select count(1) from sys_user",
-            // 函数式字段
-            "select max(sex), id from sys_user",
-            // 复杂嵌套函数式字段
-            "select CONCAT(CONCAT(' _ ', sex), ' - ' , birthday) as info, id from sys_user",
-            // 更复杂的嵌套函数式字段
-            "select CONCAT(CONCAT(101,'_',NULL, DATE(create_time),'_',sex),' - ',birthday) as info, id from sys_user",
-            // 子查询SQL
-            "select u.name1 as name2 from (select username as name1 from sys_user) u",
-            // 多层嵌套子查询SQL
-            "select u2.name2 as name3 from (select u1.name1 as name2 from (select username as name1 from sys_user) u1) u2",
-            // 字段子查询SQL
-            "select id, (select username as name1 from sys_user u2 where u1.id = u2.id) as name2 from sys_user u1",
-            // 带条件的SQL（不解析where条件里的字段，但不影响解析查询字段）
-            "select username as name1 from sys_user where realname LIKE '%张%'",
-            // 多重复杂关联表查询解析，包含的表为：sys_user, sys_depart, sys_dict_item, demo
-            "" +
-                    "SELECT " +
-                    "    u.*, d.age, sd.item_text AS sex, (SELECT count(sd.id) FROM sys_depart sd) AS count " +
-                    "FROM " +
-                    "    (SELECT sd.username AS foo, sd.realname FROM sys_user sd) u, " +
-                    "    demo d " +
-                    "LEFT JOIN sys_dict_item AS sd ON d.sex = sd.item_value " +
-                    "WHERE sd.dict_id = '3d9a351be3436fbefb1307d4cfb49bf2'",
-    };
-
-    @Test
-    public void testParseSelectSql() {
-        System.out.println("-----------------------------------------");
-        for (String sql : sqlList) {
-            System.out.println("待测试的sql：" + sql);
-            try {
-                // 解析所有的表名，key=表名，value=解析后的sql信息
-                Map<String, SelectSqlInfo> parsedMap = JSqlParserUtils.parseAllSelectTable(sql);
-                assert parsedMap != null;
-                for (Map.Entry<String, SelectSqlInfo> entry : parsedMap.entrySet()) {
-                    System.out.println("表名：" + entry.getKey());
-                    this.printSqlInfo(entry.getValue(), 1);
-                }
-            } catch (JSQLParserException e) {
-                System.out.println("SQL解析出现异常：" + e.getMessage());
-            }
-            System.out.println("-----------------------------------------");
-        }
-    }
-
-    private void printSqlInfo(SelectSqlInfo sqlInfo, int level) {
-        String beforeStr = this.getBeforeStr(level);
-        if (sqlInfo.getFromTableName() == null) {
-            // 子查询
-            System.out.println(beforeStr + "子查询：" + sqlInfo.getFromSubSelect().getParsedSql());
-            this.printSqlInfo(sqlInfo.getFromSubSelect(), level + 1);
-        } else {
-            // 非子查询
-            System.out.println(beforeStr + "查询的表名：" + sqlInfo.getFromTableName());
-        }
-        if (oConvertUtils.isNotEmpty(sqlInfo.getFromTableAliasName())) {
-            System.out.println(beforeStr + "查询的表别名：" + sqlInfo.getFromTableAliasName());
-        }
-        if (sqlInfo.isSelectAll()) {
-            System.out.println(beforeStr + "查询的字段：*");
-        } else {
-            System.out.println(beforeStr + "查询的字段：" + sqlInfo.getSelectFields());
-            System.out.println(beforeStr + "真实的字段：" + sqlInfo.getRealSelectFields());
-            if (sqlInfo.getFromTableName() == null) {
-                System.out.println(beforeStr + "所有的字段（包括子查询）：" + sqlInfo.getAllRealSelectFields());
-            }
-        }
-    }
-
-    // 打印前缀，根据层级来打印
-    private String getBeforeStr(int level) {
-        if (level == 0) {
-            return "";
-        }
-        StringBuilder beforeStr = new StringBuilder();
-        for (int i = 0; i < level; i++) {
-            beforeStr.append("  ");
-        }
-        beforeStr.append("- ");
-        return beforeStr.toString();
-    }
-
-}

jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/TestIpUtil.java

@@ -1,17 +1,12 @@
 package org.jeecg.test.sqlparse;
 
-import net.sf.jsqlparser.JSQLParserException;
 import org.jeecg.common.util.IpUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  * @author: scott
  * @date: 2024年04月29日 16:48

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jeecgframework.boot</groupId>
+        <artifactId>jeecg-boot-module</artifactId>
+        <version>3.8.2</version>
+    </parent>
+
+    <artifactId>jeecg-boot-module-airag</artifactId>
+
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <properties>
+        <kotlin.version>1.6.21</kotlin.version>
+        <liteflow.version>2.12.4.1</liteflow.version>
+        <langchain4j.version>0.35.0</langchain4j.version>
+        <apache-tika.version>2.9.1</apache-tika.version>
+    </properties>
+
+    <dependencies>
+        <!-- system单体 api-->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-local-api</artifactId>
+        </dependency>
+        <!-- 微服务starter和system微服务 api
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-cloud</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-cloud-api</artifactId>
+        </dependency>-->
+
+        <!-- aiflow依赖 -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-aiflow</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <!-- beigin 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-scripting-jsr223</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-graaljs</artifactId>
+            <version>${liteflow.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- end 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
+
+        <!-- aiflow 脚本依赖 -->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-groovy</artifactId>
+            <version>${liteflow.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-kotlin</artifactId>
+            <version>${liteflow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-scripting-jsr223</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-aviator</artifactId>
+            <version>${liteflow.version}</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>aviator</artifactId>
+                    <groupId>com.googlecode.aviator</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- aiflow 脚本依赖 -->
+
+        <!-- langChain4j model support -->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-ollama</artifactId>
+            <version>${langchain4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-zhipu-ai</artifactId>
+            <version>${langchain4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>checker-qual</artifactId>
+                    <groupId>org.checkerframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-qianfan</artifactId>
+            <version>${langchain4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-dashscope</artifactId>
+            <version>${langchain4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>okio</artifactId>
+                    <groupId>com.squareup.okio</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- langChain4j vextor support -->
+        <dependency>
+            <groupId>org.jeecgframework</groupId>
+            <artifactId>langchain4j-pgvector</artifactId>
+            <version>0.35.0</version>
+        </dependency>
+        <!-- langChain4j Document Parser -->
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>${apache-tika.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parser-html-module</artifactId>
+            <version>${apache-tika.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parser-pdf-module</artifactId>
+            <version>${apache-tika.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parser-text-module</artifactId>
+            <version>${apache-tika.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/JeecgAiRagApplication.java

@@ -0,0 +1,12 @@
+//package org.jeecg;
+//
+//import org.springframework.boot.SpringApplication;
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//
+//@SpringBootApplication
+//public class JeecgAiRagApplication {
+//
+//    public static void main(String[] args) {
+//        SpringApplication.run(JeecgAiRagApplication.class, args);
+//    }
+//}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/AiAppConsts.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.airag.app.consts;
+
+/**
+ * AI应用常量类
+ *
+ * @author chenrui
+ * @date 2025/2/25 14:52
+ */
+public class AiAppConsts {
+
+    /**
+     * 状态:启用
+     */
+    public static final String STATUS_ENABLE = "enable";
+    /**
+     * 状态:禁用
+     */
+    public static final String STATUS_DISABLE = "disable";
+    /**
+     * 状态:发布
+     */
+    public static final String STATUS_RELEASE = "release";
+
+
+    /**
+     * 默认应用id
+     */
+    public static final String DEFAULT_APP_ID = "default";
+
+
+    /**
+     * 应用类型:简单聊天
+     */
+    public static final String APP_TYPE_CHAT_SIMPLE = "chatSimple";
+
+    /**
+     * 应用类型:聊天流(高级编排)
+     */
+    public static final String APP_TYPE_CHAT_FLOW = "chatFLow";
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/Prompts.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.airag.app.consts;
+
+/**
+ * @Description: 提示词常量
+ * @Author: chenrui
+ * @Date: 2025/3/12 15:03
+ */
+public class Prompts {
+
+    /**
+     * 根据提示生成智能体提示词
+     */
+    public static final String GENERATE_LLM_PROMPT = "# 角色\n" +
+            "你是一位专业且高效的AI提示词工程师，擅长根据用户多样化需求自动生成高质量的结构化提示词模板，具备全面而敏锐的分析能力和出色的创造力。\n" +
+            "## 要求：\n" +
+            "1. \"\"\"只输出提示词，不要输出多余解释\"\"\"\n" +
+            "2. \"\"\"不要在前后增加代码块的md语法.\"\"\"\n" +
+            "2. 贴合用户需求，描述智能助手的定位、能力、知识储备\n" +
+            "3. 提示词应清晰、精确、易于理解，在保持质量的同时，尽可能简洁\n" +
+            "4. 严格按照给定的流程和格式执行任务，确保输出规范准确。\n" +
+            "\n" +
+            "## 流程\n" +
+            "### 1: 需求分析\n" +
+            "1. 当用户描述需求时，严格运用SCQA框架确认核心要素，精准分析和联想：\"当前场景(Situation)是什么？主要矛盾(Complication)有哪些？需要解决的关键问题(Question)是？预期达成什么效果(Answer)？\"\n" +
+            "2. 通过5W1H细致分析和联想细节：\"目标受众(Who)？使用场景(Where/When)？具体要实现什么(What)？为什么需要这些特征(Why)？如何量化效果(How)？\"\n" +
+            "\n" +
+            "### 2: 框架选择\n" +
+            "根据需求从给定模板库中匹配最佳提示词类型：\n" +
+            "* 角色扮演型：\n" +
+            "```\n" +
+            "你将扮演一个人物角色<角色名称>，以下是关于这个角色的详细设定，请根据这些信息来构建你的回答。 \n" +
+            "\n" +
+            "**人物基本信息：**\n" +
+            "- 你是：<角色的名称、身份等基本介绍>\n" +
+            "- 人称：第一人称\n" +
+            "- 出身背景与上下文：<交代角色背景信息和上下文>\n" +
+            "**性格特点：**\n" +
+            "- <性格特点描述>\n" +
+            "**语言风格：**\n" +
+            "- <语言风格描述> \n" +
+            "**人际关系：**\n" +
+            "- <人际关系描述>\n" +
+            "**过往经历：**\n" +
+            "- <过往经历描述>\n" +
+            "**经典台词或口头禅：**\n" +
+            "补充信息: 即你可以将动作、神情语气、心理活动、故事背景放在（）中来表示，为对话提供补充信息。\n" +
+            "- 台词1：<角色台词示例1> \n" +
+            "- 台词2：<角色台词示例2>\n" +
+            "- ...\n" +
+            "\n" +
+            "要求： \n" +
+            "- 要求1\n" +
+            "- 要求2\n" +
+            "- ... \n" +
+            "```\n" +
+            "* 多步骤型：\n" +
+            "```\n" +
+            "# 角色 \n" +
+            "你是<角色设定(比如:xx领域的专家)>\n" +
+            "你的目标是<希望模型执行什么任务，达成什么目标>\n" +
+            "\n" +
+            "{#以下可以采用先总括，再展开详细说明的方式，描述你希望智能体在每一个步骤如何进行工作，具体的工作步骤数量可以根据实际需求增删#}\n" +
+            "## 工作步骤 \n" +
+            "1. <工作流程1的一句话概括> \n" +
+            "2. <工作流程2的一句话概括> \n" +
+            "3. <工作流程3的一句话概括>\n" +
+            "\n" +
+            "### 第一步 <工作流程1标题> \n" +
+            "<工作流程步骤1的具体工作要求和举例说明，可以分点列出希望在本步骤做哪些事情，需要完成什么阶段性的工作目标>\n" +
+            "### 第二步 <工作流程2标题> \n" +
+            "<工作流程步骤2的具体工作要求和举例说明，可以分点列出希望在本步骤做哪些事情，需要完成什么阶段性的工作目标>\n" +
+            "### 第三步 <工作流程3标题>\n" +
+            "<工作流程步骤3的具体工作要求和举例说明，可以分点列出希望在本步骤做哪些事情，需要完成什么阶段性的工作目标>\n" +
+            "```\n" +
+            "* 限制性模板：\n" +
+            "```\n" +
+            "# 角色：<角色名称>\n" +
+            "<角色概述和主要职责的一句话描述>\n" +
+            "\n" +
+            "## 目标：\n" +
+            "<角色的工作目标，如果有多目标可以分点列出，但建议更聚焦1-2个目标>\n" +
+            "\n" +
+            "## 技能：\n" +
+            "1.  <为了实现目标，角色需要具备的技能1>\n" +
+            "2. <为了实现目标，角色需要具备的技能2>\n" +
+            "3. <为了实现目标，角色需要具备的技能3>\n" +
+            "\n" +
+            "## 工作流：\n" +
+            "1. <描述角色工作流程的第一步>\n" +
+            "2. <描述角色工作流程的第二步>\n" +
+            "3. <描述角色工作流程的第三步>\n" +
+            "\n" +
+            "## 输出格式：\n" +
+            "<如果对角色的输出格式有特定要求，可以在这里强调并举例说明想要的输出格式>\n" +
+            "\n" +
+            "## 限制：\n" +
+            "- <描述角色在互动过程中需要遵循的限制条件1>\n" +
+            "- <描述角色在互动过程中需要遵循的限制条件2>\n" +
+            "- <描述角色在互动过程中需要遵循的限制条件3>\n" +
+            "```\n" +
+            "\n" +
+            "### 3: 生成优化\n" +
+            "1. 输出时自动添加三重保障机制：\n" +
+            "    - 反幻觉校验：\"所有数据需标注来源，不确定信息用[需核实]标记\"\n" +
+            "    - 风格校准器：\"对比[目标风格]与生成内容的余弦相似度，低于0.7时启动重写\"\n" +
+            "    - 伦理审查模块：\"自动过滤涉及隐私/偏见/违法内容，替换为[合规表达]\"";
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragAppController.java

@@ -0,0 +1,181 @@
+package org.jeecg.modules.airag.app.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.AssertUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.config.shiro.IgnoreAuth;
+import org.jeecg.modules.airag.app.consts.AiAppConsts;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+import org.jeecg.modules.airag.app.service.IAiragAppService;
+import org.jeecg.modules.airag.app.service.IAiragChatService;
+import org.jeecg.modules.airag.app.vo.AppDebugParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: AI应用
+ * @Author: jeecg-boot
+ * @Date: 2025-02-26
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/airag/app")
+@Slf4j
+public class AiragAppController extends JeecgController<AiragApp, IAiragAppService> {
+    @Autowired
+    private IAiragAppService airagAppService;
+
+    @Autowired
+    private IAiragChatService airagChatService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param airagApp
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/list")
+    public Result<IPage<AiragApp>> queryPageList(AiragApp airagApp,
+                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest req) {
+        QueryWrapper<AiragApp> queryWrapper = QueryGenerator.initQueryWrapper(airagApp, req.getParameterMap());
+        Page<AiragApp> page = new Page<AiragApp>(pageNo, pageSize);
+        IPage<AiragApp> pageList = airagAppService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 新增或编辑
+     *
+     * @param airagApp
+     * @return
+     */
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequiresPermissions("airag:app:edit")
+    public Result<String> edit(@RequestBody AiragApp airagApp) {
+        AssertUtils.assertNotEmpty("参数异常", airagApp);
+        AssertUtils.assertNotEmpty("请输入应用名称", airagApp.getName());
+        AssertUtils.assertNotEmpty("请选择应用类型", airagApp.getType());
+        airagApp.setStatus(AiAppConsts.STATUS_ENABLE);
+        airagAppService.saveOrUpdate(airagApp);
+        return Result.OK("保存完成!", airagApp.getId());
+    }
+
+    /**
+     * 发布应用
+     *
+     * @return
+     */
+    @RequestMapping(value = "/release", method = RequestMethod.POST)
+    public Result<String> release(@RequestParam(name = "id") String id, @RequestParam(name = "release") Boolean release) {
+        AssertUtils.assertNotEmpty("id必须填写", id);
+        if (release == null) {
+            release = true;
+        }
+        AiragApp airagApp = new AiragApp();
+        airagApp.setId(id);
+        if (release) {
+            airagApp.setStatus(AiAppConsts.STATUS_RELEASE);
+        } else {
+            airagApp.setStatus(AiAppConsts.STATUS_ENABLE);
+        }
+        airagAppService.updateById(airagApp);
+        return Result.OK(release ? "发布成功" : "取消发布成功");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/delete")
+    @RequiresPermissions("airag:app:delete")
+    public Result<String> delete(HttpServletRequest request,@RequestParam(name = "id", required = true) String id) {
+        //update-begin---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
+        if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+            AiragApp app = airagAppService.getById(id);
+            //获取当前租户
+            String currentTenantId = TokenUtils.getTenantIdByRequest(request);
+            if (null == app || !app.getTenantId().equals(currentTenantId)) {
+                return Result.error("删除AI应用失败，不能删除其他租户的AI应用！");
+            }
+        }
+        //update-end---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        airagAppService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/queryById")
+    public Result<AiragApp> queryById(@RequestParam(name = "id", required = true) String id) {
+        AiragApp airagApp = airagAppService.getById(id);
+        if (airagApp == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(airagApp);
+    }
+
+
+    /**
+     * 调试应用
+     *
+     * @param appDebugParams
+     * @return
+     * @author chenrui
+     * @date 2025/2/28 10:49
+     */
+    @PostMapping(value = "/debug")
+    public SseEmitter debugApp(@RequestBody AppDebugParams appDebugParams) {
+        return airagChatService.debugApp(appDebugParams);
+    }
+
+    /**
+     * 根据需求生成提示词
+     *
+     * @param prompt
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 15:30
+     */
+    @GetMapping(value = "/prompt/generate")
+    public Result<?> generatePrompt(@RequestParam(name = "prompt", required = true) String prompt) {
+        return (Result<?>) airagAppService.generatePrompt(prompt,true);
+    }
+
+    /**
+     * 根据需求生成提示词
+     *
+     * @param prompt
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 15:30
+     */
+    @PostMapping(value = "/prompt/generate")
+    public SseEmitter generatePromptSse(@RequestParam(name = "prompt", required = true) String prompt) {
+        return (SseEmitter) airagAppService.generatePrompt(prompt,false);
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragChatController.java

@@ -0,0 +1,206 @@
+package org.jeecg.modules.airag.app.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.CommonUtils;
+import org.jeecg.config.shiro.IgnoreAuth;
+import org.jeecg.modules.airag.app.service.IAiragChatService;
+import org.jeecg.modules.airag.app.vo.ChatConversation;
+import org.jeecg.modules.airag.app.vo.ChatSendParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * airag应用-chat
+ *
+ * @Author: chenrui
+ * @Date: 2025-02-25 11:40
+ */
+@Slf4j
+@RestController
+@RequestMapping("/airag/chat")
+public class AiragChatController {
+
+    @Autowired
+    IAiragChatService chatService;
+
+    @Value(value = "${jeecg.path.upload}")
+    private String uploadpath;
+
+    /**
+     * 本地：local minio：minio 阿里：alioss
+     */
+    @Value(value="${jeecg.uploadType}")
+    private String uploadType;
+
+
+    /**
+     * 发送消息
+     *
+     * @return 返回一个Result对象，表示发送消息的结果
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @PostMapping(value = "/send")
+    public SseEmitter send(@RequestBody ChatSendParams chatSendParams) {
+        return chatService.send(chatSendParams);
+    }
+
+    /**
+     * 发送消息 <br/>
+     * 兼容旧版浏览器
+     * @param content
+     * @param conversationId
+     * @param topicId
+     * @param appId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 18:13
+     */
+    @GetMapping(value = "/send")
+    public SseEmitter sendByGet(@RequestParam("content") String content,
+                                @RequestParam(value = "conversationId", required = false) String conversationId,
+                                @RequestParam(value = "topicId", required = false) String topicId,
+                                @RequestParam(value = "appId", required = false) String appId) {
+        ChatSendParams chatSendParams = new ChatSendParams(content, conversationId, topicId, appId);
+        return chatService.send(chatSendParams);
+    }
+
+    /**
+     * 获取所有对话
+     *
+     * @return 返回一个Result对象，包含所有对话的信息
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/init")
+    public Result<?> initChat(@RequestParam(name = "id", required = true) String id) {
+        return chatService.initChat(id);
+    }
+
+    /**
+     * 获取所有对话
+     *
+     * @return 返回一个Result对象，包含所有对话的信息
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/conversations")
+    public Result<?> getConversations(@RequestParam(value = "appId", required = false) String appId) {
+        return chatService.getConversations(appId);
+    }
+
+    /**
+     * 删除会话
+     *
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/3/3 16:55
+     */
+    @IgnoreAuth
+    @DeleteMapping(value = "/conversation/{id}")
+    public Result<?> deleteConversation(@PathVariable("id") String id) {
+        return chatService.deleteConversation(id);
+    }
+
+    /**
+     * 更新会话标题
+     *
+     * @param updateTitleParams
+     * @return
+     * @author chenrui
+     * @date 2025/3/3 16:55
+     */
+    @IgnoreAuth
+    @PutMapping(value = "/conversation/update/title")
+    public Result<?> updateConversationTitle(@RequestBody ChatConversation updateTitleParams) {
+        return chatService.updateConversationTitle(updateTitleParams);
+    }
+
+    /**
+     * 获取消息
+     *
+     * @return 返回一个Result对象，包含消息的信息
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/messages")
+    public Result<?> getMessages(@RequestParam(value = "conversationId", required = true) String conversationId) {
+        return chatService.getMessages(conversationId);
+    }
+
+    /**
+     * 清空消息
+     *
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/messages/clear/{conversationId}")
+    public Result<?> clearMessage(@PathVariable(value = "conversationId") String conversationId) {
+        return chatService.clearMessage(conversationId);
+    }
+
+
+    /**
+     * 根据请求ID停止某个请求的处理
+     *
+     * @param requestId 请求的唯一标识符，用于识别和停止特定的请求
+     * @return 返回一个Result对象，表示停止请求的结果
+     * @author chenrui
+     * @date 2025/2/25 11:42
+     */
+    @IgnoreAuth
+    @GetMapping(value = "/stop/{requestId}")
+    public Result<?> stop(@PathVariable(name = "requestId", required = true) String requestId) {
+        return chatService.stop(requestId);
+    }
+
+
+    /**
+     * 上传文件
+     * for [QQYUN-12135]AI聊天，上传图片提示非法token
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     * @author chenrui
+     * @date 2025/4/25 11:04
+     */
+    @IgnoreAuth
+    @PostMapping(value = "/upload")
+    public Result<?> upload(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        String bizPath = "airag";
+
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        // 获取上传文件对象
+        MultipartFile file = multipartRequest.getFile("file");
+        String savePath;
+        if (CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)) {
+            savePath = CommonUtils.uploadLocal(file, bizPath, uploadpath);
+        } else {
+            savePath = CommonUtils.upload(file, bizPath, uploadType);
+        }
+        Result<?> result = new Result<>();
+        result.setMessage(savePath);
+        result.setSuccess(true);
+        return result;
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/entity/AiragApp.java

@@ -0,0 +1,191 @@
+package org.jeecg.modules.airag.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: AI应用
+ * @Author: jeecg-boot
+ * @Date: 2025-02-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("airag_app")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="AI应用")
+public class AiragApp implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
+    private java.lang.String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**
+     * 租户id
+     */
+    @Excel(name = "租户id", width = 15)
+    @Schema(description = "租户id")
+    private java.lang.String tenantId;
+    /**
+     * 应用名称
+     */
+    @Excel(name = "应用名称", width = 15)
+    @Schema(description = "应用名称")
+    private java.lang.String name;
+    /**
+     * 应用描述
+     */
+    @Excel(name = "应用描述", width = 15)
+    @Schema(description = "应用描述")
+    private java.lang.String descr;
+    /**
+     * 应用图标
+     */
+    @Excel(name = "应用图标", width = 15)
+    @Schema(description = "应用图标")
+    private java.lang.String icon;
+    /**
+     * 应用类型
+     */
+    @Excel(name = "应用类型", width = 15, dicCode = "ai_app_type")
+    @Dict(dicCode = "ai_app_type")
+    @Schema(description = "应用类型")
+    private java.lang.String type;
+    /**
+     * 开场白
+     */
+    @Excel(name = "开场白", width = 15)
+    @Schema(description = "开场白")
+    private java.lang.String prologue;
+    /**
+     * 预设问题
+     */
+    @Excel(name = "预设问题", width = 15)
+    @Schema(description = "预设问题")
+    private java.lang.String presetQuestion;
+    /**
+     * 提示词
+     */
+    @Excel(name = "提示词", width = 15)
+    @Schema(description = "提示词")
+    private java.lang.String prompt;
+    /**
+     * 模型配置
+     */
+    @Excel(name = "模型配置", width = 15, dictTable = "airag_model where model_type = 'LLM' ", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "airag_model where model_type = 'LLM' ", dicText = "name", dicCode = "id")
+    @Schema(description = "模型配置")
+    private java.lang.String modelId;
+    /**
+     * 历史消息数
+     */
+    @Excel(name = "历史消息数", width = 15)
+    @Schema(description = "历史消息数")
+    private java.lang.Integer msgNum;
+    /**
+     * 知识库
+     */
+    @Excel(name = "知识库", width = 15, dictTable = "airag_knowledge where status = 'enable'", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "airag_knowledge where status = 'enable'", dicText = "name", dicCode = "id")
+    @Schema(description = "知识库")
+    private java.lang.String knowledgeIds;
+    /**
+     * 流程
+     */
+    @Excel(name = "流程", width = 15, dictTable = "airag_flow where status = 'enable' ", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "airag_flow where status = 'enable' ", dicText = "name", dicCode = "id")
+    @Schema(description = "流程")
+    private java.lang.String flowId;
+    /**
+     * 快捷指令
+     */
+    @Excel(name = "快捷指令", width = 15)
+    @Schema(description = "快捷指令")
+    private java.lang.String quickCommand;
+    /**
+     * 状态（enable=启用、disable=禁用、release=发布）
+     */
+    @Excel(name = "状态", width = 15)
+    @Schema(description = "状态")
+    private java.lang.String status;
+
+
+    /**
+     * 元数据
+     */
+    @Excel(name = "元数据", width = 15)
+    @Schema(description = "元数据")
+    private java.lang.String metadata;
+
+    /**
+     * 知识库ids
+     */
+    @TableField(exist = false)
+    private List<String> knowIds;
+
+    /**
+     * 获取知识库id
+     *
+     * @return
+     * @author chenrui
+     * @date 2025/2/28 11:45
+     */
+    public List<String> getKnowIds() {
+        if (oConvertUtils.isNotEmpty(knowledgeIds)) {
+            String[] knowIds = knowledgeIds.split(",");
+            return Arrays.asList(knowIds);
+        } else {
+            return new ArrayList<>(0);
+        }
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/AiragAppMapper.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.airag.app.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+
+/**
+ * @Description: AI应用
+ * @Author: jeecg-boot
+ * @Date:   2025-02-26
+ * @Version: V1.0
+ */
+public interface AiragAppMapper extends BaseMapper<AiragApp> {
+
+    /**
+     * 根据ID查询app信息(忽略租户)
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/4/21 16:03
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    AiragApp getByIdIgnoreTenant(String id);
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/xml/AiragAppMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.airag.app.mapper.AiragAppMapper">
+
+    <select id="getByIdIgnoreTenant" resultType="org.jeecg.modules.airag.app.entity.AiragApp">
+        SELECT * FROM airag_app WHERE id = #{id}
+    </select>
+
+</mapper>

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragAppService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.airag.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+
+/**
+ * @Description: AI应用
+ * @Author: jeecg-boot
+ * @Date:   2025-02-26
+ * @Version: V1.0
+ */
+public interface IAiragAppService extends IService<AiragApp> {
+
+    /**
+     * 生成提示词
+     * @param prompt
+     * @return blocking 是否阻塞
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 14:45
+     */
+    Object generatePrompt(String prompt,boolean blocking);
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragChatService.java

@@ -0,0 +1,105 @@
+package org.jeecg.modules.airag.app.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.airag.app.vo.AppDebugParams;
+import org.jeecg.modules.airag.app.vo.ChatConversation;
+import org.jeecg.modules.airag.app.vo.ChatSendParams;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+/**
+ * ai聊天
+ *
+ * @author chenrui
+ * @date 2025/2/25 13:36
+ */
+public interface IAiragChatService {
+
+    /**
+     * 发送消息
+     *
+     * @param chatSendParams
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 13:39
+     */
+    SseEmitter send(ChatSendParams chatSendParams);
+
+
+    /**
+     * 调试应用
+     *
+     * @param appDebugParams
+     * @return
+     * @author chenrui
+     * @date 2025/2/28 10:49
+     */
+    SseEmitter debugApp(AppDebugParams appDebugParams);
+
+    /**
+     * 停止响应
+     *
+     * @param requestId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 17:17
+     */
+    Result<?> stop(String requestId);
+
+    /**
+     * 获取所有对话
+     *
+     * @param appId
+     * @return
+     * @author chenrui
+     * @date 2025/2/26 14:48
+     */
+    Result<?> getConversations(String appId);
+
+    /**
+     * 获取对话聊天记录
+     *
+     * @param conversationId
+     * @return
+     * @author chenrui
+     * @date 2025/2/26 15:16
+     */
+    Result<?> getMessages(String conversationId);
+
+    /**
+     * 删除会话
+     *
+     * @param conversationId
+     * @return
+     * @author chenrui
+     * @date 2025/3/3 16:55
+     */
+    Result<?> deleteConversation(String conversationId);
+
+    /**
+     * 更新会话标题
+     * @param updateTitleParams
+     * @return
+     * @author chenrui
+     * @date 2025/3/3 17:02
+     */
+    Result<?> updateConversationTitle(ChatConversation updateTitleParams);
+
+    /**
+     * 清空消息
+     * @param conversationId
+     * @return
+     * @author chenrui
+     * @date 2025/3/3 19:49
+     */
+    Result<?> clearMessage(String conversationId);
+
+    /**
+     * 初始化聊天(忽略租户)
+     * [QQYUN-12113]分享之后的聊天，应用、模型、知识库不根据租户查询
+     * @param appId
+     * @return
+     * @author chenrui
+     * @date 2025/4/21 14:17
+     */
+    Result<?> initChat(String appId);
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragAppServiceImpl.java

@@ -0,0 +1,157 @@
+package org.jeecg.modules.airag.app.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.SystemMessage;
+import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.model.output.FinishReason;
+import dev.langchain4j.service.TokenStream;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.AssertUtils;
+import org.jeecg.common.util.UUIDGenerator;
+import org.jeecg.modules.airag.app.consts.Prompts;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+import org.jeecg.modules.airag.app.mapper.AiragAppMapper;
+import org.jeecg.modules.airag.app.service.IAiragAppService;
+import org.jeecg.modules.airag.common.consts.AiragConsts;
+import org.jeecg.modules.airag.common.handler.AIChatParams;
+import org.jeecg.modules.airag.common.handler.IAIChatHandler;
+import org.jeecg.modules.airag.common.utils.AiragLocalCache;
+import org.jeecg.modules.airag.common.vo.event.EventData;
+import org.jeecg.modules.airag.common.vo.event.EventFlowData;
+import org.jeecg.modules.airag.common.vo.event.EventMessageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * @Description: AI应用
+ * @Author: jeecg-boot
+ * @Date: 2025-02-26
+ * @Version: V1.0
+ */
+@Slf4j
+@Service
+public class AiragAppServiceImpl extends ServiceImpl<AiragAppMapper, AiragApp> implements IAiragAppService {
+
+    @Autowired
+    IAIChatHandler aiChatHandler;
+
+    @Override
+    public Object generatePrompt(String prompt, boolean blocking) {
+        AssertUtils.assertNotEmpty("请输入提示词", prompt);
+        List<ChatMessage> messages = Arrays.asList(new SystemMessage(Prompts.GENERATE_LLM_PROMPT), new UserMessage(prompt));
+
+        AIChatParams params = new AIChatParams();
+        params.setTemperature(0.8);
+        params.setTopP(0.9);
+        params.setPresencePenalty(0.1);
+        params.setFrequencyPenalty(0.1);
+        if(blocking){
+            String promptValue = aiChatHandler.completionsByDefaultModel(messages, params);
+            if (promptValue == null || promptValue.isEmpty()) {
+                return Result.error("生成失败");
+            }
+            return Result.OK("success", promptValue);
+        }else{
+            SseEmitter emitter = new SseEmitter(-0L);
+            // 异步运行(流式)
+            TokenStream tokenStream = aiChatHandler.chatByDefaultModel(messages, params);
+            /**
+             * 是否正在思考
+             */
+            AtomicBoolean isThinking = new AtomicBoolean(false);
+            String requestId = UUIDGenerator.generate();
+            // ai聊天响应逻辑
+            tokenStream.onNext((String resMessage) -> {
+                        // 兼容推理模型
+                        if ("<think>".equals(resMessage)) {
+                            isThinking.set(true);
+                            resMessage = "> ";
+                        }
+                        if ("</think>".equals(resMessage)) {
+                            isThinking.set(false);
+                            resMessage = "\n\n";
+                        }
+                        if (isThinking.get()) {
+                            if (null != resMessage && resMessage.contains("\n")) {
+                                resMessage = "\n> ";
+                            }
+                        }
+                        EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE);
+                        EventMessageData messageEventData = EventMessageData.builder()
+                                .message(resMessage)
+                                .build();
+                        eventData.setData(messageEventData);
+                        try {
+                            String eventStr = JSONObject.toJSONString(eventData);
+                            log.debug("[AI应用]接收LLM返回消息:{}", eventStr);
+                            emitter.send(SseEmitter.event().data(eventStr));
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    })
+                    .onComplete((responseMessage) -> {
+                        // 记录ai的回复
+                        AiMessage aiMessage = responseMessage.content();
+                        FinishReason finishReason = responseMessage.finishReason();
+                        String respText = aiMessage.text();
+                        if (FinishReason.STOP.equals(finishReason) || null == finishReason) {
+                            // 正常结束
+                            EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE_END);
+                            try {
+                                log.debug("[AI应用]接收LLM返回消息完成:{}", respText);
+                                emitter.send(SseEmitter.event().data(eventData));
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            closeSSE(emitter, eventData);
+                        } else if (FinishReason.TOOL_EXECUTION.equals(finishReason)) {
+                            // 需要执行工具
+                            // TODO author: chenrui for: date:2025/3/7
+                        } else {
+                            // 异常结束
+                            log.error("调用模型异常:" + respText);
+                            if (respText.contains("insufficient Balance")) {
+                                respText = "大预言模型账号余额不足!";
+                            }
+                            EventData eventData = new EventData(requestId, null, EventData.EVENT_FLOW_ERROR);
+                            eventData.setData(EventFlowData.builder().success(false).message(respText).build());
+                            closeSSE(emitter, eventData);
+                        }
+                    })
+                    .onError((Throwable error) -> {
+                        // sse
+                        String errMsg = "调用大模型接口失败:" + error.getMessage();
+                        log.error(errMsg, error);
+                        EventData eventData = new EventData(requestId, null, EventData.EVENT_FLOW_ERROR);
+                        eventData.setData(EventFlowData.builder().success(false).message(errMsg).build());
+                        closeSSE(emitter, eventData);
+                    })
+                    .start();
+            return emitter;
+        }
+    }
+
+    private static void closeSSE(SseEmitter emitter, EventData eventData) {
+        try {
+            // 发送完成事件
+            emitter.send(SseEmitter.event().data(eventData));
+        } catch (IOException e) {
+            log.error("终止会话时发生错误", e);
+        } finally {
+            // 从缓存中移除emitter
+            AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE, eventData.getRequestId());
+            // 关闭emitter
+            emitter.complete();
+        }
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java

@@ -0,0 +1,979 @@
+package org.jeecg.modules.airag.app.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import dev.langchain4j.data.image.Image;
+import dev.langchain4j.data.message.*;
+import dev.langchain4j.model.output.FinishReason;
+import dev.langchain4j.service.TokenStream;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootBizTipException;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.*;
+import org.jeecg.modules.airag.app.consts.AiAppConsts;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+import org.jeecg.modules.airag.app.mapper.AiragAppMapper;
+import org.jeecg.modules.airag.app.service.IAiragAppService;
+import org.jeecg.modules.airag.app.service.IAiragChatService;
+import org.jeecg.modules.airag.app.vo.AppDebugParams;
+import org.jeecg.modules.airag.app.vo.ChatConversation;
+import org.jeecg.modules.airag.app.vo.ChatSendParams;
+import org.jeecg.modules.airag.common.consts.AiragConsts;
+import org.jeecg.modules.airag.common.handler.AIChatParams;
+import org.jeecg.modules.airag.common.handler.IAIChatHandler;
+import org.jeecg.modules.airag.common.utils.AiragLocalCache;
+import org.jeecg.modules.airag.common.vo.MessageHistory;
+import org.jeecg.modules.airag.common.vo.event.EventData;
+import org.jeecg.modules.airag.common.vo.event.EventFlowData;
+import org.jeecg.modules.airag.common.vo.event.EventMessageData;
+import org.jeecg.modules.airag.flow.consts.FlowConsts;
+import org.jeecg.modules.airag.flow.service.IAiragFlowService;
+import org.jeecg.modules.airag.flow.vo.api.FlowRunParams;
+import org.jeecg.modules.airag.llm.entity.AiragModel;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+
+/**
+ * AI助手聊天Service
+ *
+ * @author chenrui
+ * @date 2024/1/26 20:07
+ */
+@Service
+@Slf4j
+public class AiragChatServiceImpl implements IAiragChatService {
+
+    @Autowired
+    IAIChatHandler aiChatHandler;
+
+    @Autowired
+    RedisTemplate redisTemplate;
+
+    @Autowired
+    AiragAppMapper airagAppMapper;
+
+    @Autowired
+    IAiragFlowService airagFlowService;
+
+    @Autowired
+    private ISysBaseAPI sysBaseApi;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Override
+    public SseEmitter send(ChatSendParams chatSendParams) {
+        AssertUtils.assertNotEmpty("参数异常", chatSendParams);
+        String userMessage = chatSendParams.getContent();
+        AssertUtils.assertNotEmpty("至少发送一条消息", userMessage);
+
+        // 获取会话信息
+        String conversationId = chatSendParams.getConversationId();
+        String topicId = oConvertUtils.getString(chatSendParams.getTopicId(), UUIDGenerator.generate());
+        // 获取app信息
+        AiragApp app = null;
+        if (oConvertUtils.isNotEmpty(chatSendParams.getAppId())) {
+            app = airagAppMapper.getByIdIgnoreTenant(chatSendParams.getAppId());
+        }
+        ChatConversation chatConversation = getOrCreateChatConversation(app, conversationId);
+        // 更新标题
+        if (oConvertUtils.isEmpty(chatConversation.getTitle())) {
+            chatConversation.setTitle(userMessage.length() > 5 ? userMessage.substring(0, 5) : userMessage);
+        }
+        // 发送消息
+        return doChat(chatConversation, topicId, chatSendParams);
+    }
+
+    @Override
+    public SseEmitter debugApp(AppDebugParams appDebugParams) {
+        AssertUtils.assertNotEmpty("参数异常", appDebugParams);
+        String userMessage = appDebugParams.getContent();
+        AssertUtils.assertNotEmpty("至少发送一条消息", userMessage);
+        AssertUtils.assertNotEmpty("应用信息不能为空", appDebugParams.getApp());
+        // 获取会话信息
+        String topicId = oConvertUtils.getString(appDebugParams.getTopicId(), UUIDGenerator.generate());
+        AiragApp app = appDebugParams.getApp();
+        app.setId("__DEBUG_APP");
+        ChatConversation chatConversation = getOrCreateChatConversation(app, topicId);
+        // 发送消息
+        SseEmitter emitter = doChat(chatConversation, topicId, appDebugParams);
+        //保存会话
+        saveChatConversation(chatConversation, true, null);
+        return emitter;
+    }
+
+
+    @Override
+    public Result<?> stop(String requestId) {
+        AssertUtils.assertNotEmpty("requestId不能为空", requestId);
+        // 从缓存中获取对应的SseEmitter
+        SseEmitter emitter = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE, requestId);
+        if (emitter != null) {
+            closeSSE(emitter, new EventData(requestId, null, EventData.EVENT_MESSAGE_END));
+            return Result.ok("会话已成功终止");
+        } else {
+            return Result.error("未找到对应的会话");
+        }
+    }
+
+    /**
+     * 关闭sse
+     *
+     * @param emitter
+     * @param eventData
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/2/27 15:56
+     */
+    private static void closeSSE(SseEmitter emitter, EventData eventData) {
+        AssertUtils.assertNotEmpty("请求id不能为空", eventData);
+        if (null == emitter) {
+            log.warn("会话已关闭");
+            return;
+        }
+        try {
+            // 发送完成事件
+            emitter.send(SseEmitter.event().data(eventData));
+        } catch (Exception e) {
+            log.error("终止会话时发生错误", e);
+            try {
+                // 防止异常冒泡
+                emitter.completeWithError(e);
+            } catch (Exception ignore) {}
+        } finally {
+            // 从缓存中移除emitter
+            AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE, eventData.getRequestId());
+            // 关闭emitter
+            try {
+                emitter.complete();
+            } catch (Exception ignore) {}
+        }
+    }
+
+    @Override
+    public Result<?> getConversations(String appId) {
+        if (oConvertUtils.isEmpty(appId)) {
+            appId = AiAppConsts.DEFAULT_APP_ID;
+        }
+        String key = getConversationDirCacheKey(null);
+        key = key + ":*";
+        List<String> keys = redisUtil.scan(key);
+        // 如果键集合为空，返回空列表
+        if (keys.isEmpty()) {
+            return Result.ok(Collections.emptyList());
+        }
+
+        // 遍历键集合，获取对应的 ChatConversation 对象
+        List<ChatConversation> conversations = new ArrayList<>();
+        for (Object k : keys) {
+            ChatConversation conversation = (ChatConversation) redisTemplate.boundValueOps(k).get();
+
+            if (conversation != null) {
+                AiragApp app = conversation.getApp();
+                if (null == app) {
+                    continue;
+                }
+                String conversationAppId = app.getId();
+                if (appId.equals(conversationAppId)) {
+                    conversation.setApp(null);
+                    conversation.setMessages(null);
+                    conversations.add(conversation);
+                }
+            }
+        }
+
+        // 对会话列表按创建时间降序排序
+        conversations.sort((o1, o2) -> {
+            Date date1 = o1.getCreateTime();
+            Date date2 = o2.getCreateTime();
+            if (date1 == null && date2 == null) {
+                return 0;
+            }
+            if (date1 == null) {
+                return 1;
+            }
+            if (date2 == null) {
+                return -1;
+            }
+            return date2.compareTo(date1);
+        });
+
+        // 返回结果
+        return Result.ok(conversations);
+    }
+
+    @Override
+    public Result<?> getMessages(String conversationId) {
+        AssertUtils.assertNotEmpty("请先选择会话", conversationId);
+        String key = getConversationCacheKey(conversationId, null);
+        if (oConvertUtils.isEmpty(key)) {
+            return Result.ok(Collections.emptyList());
+        }
+        ChatConversation chatConversation = (ChatConversation) redisTemplate.boundValueOps(key).get();
+        if (oConvertUtils.isObjectEmpty(chatConversation)) {
+            return Result.ok(Collections.emptyList());
+        }
+        return Result.ok(chatConversation.getMessages());
+    }
+
+    @Override
+    public Result<?> clearMessage(String conversationId) {
+        AssertUtils.assertNotEmpty("请先选择会话", conversationId);
+        String key = getConversationCacheKey(conversationId, null);
+        if (oConvertUtils.isEmpty(key)) {
+            return Result.ok(Collections.emptyList());
+        }
+        ChatConversation chatConversation = (ChatConversation) redisTemplate.boundValueOps(key).get();
+        if (null != chatConversation && oConvertUtils.isObjectNotEmpty(chatConversation.getMessages())) {
+            chatConversation.getMessages().clear();
+            saveChatConversation(chatConversation);
+        }
+        return Result.ok();
+    }
+
+    @Override
+    public Result<?> initChat(String appId) {
+        AiragApp app = airagAppMapper.getByIdIgnoreTenant(appId);
+        return Result.ok(app);
+    }
+
+    @Override
+    public Result<?> deleteConversation(String conversationId) {
+        AssertUtils.assertNotEmpty("请选择要删除的会话", conversationId);
+        String key = getConversationCacheKey(conversationId, null);
+        if (oConvertUtils.isNotEmpty(key)) {
+            Boolean delete = redisTemplate.delete(key);
+            if (delete) {
+                return Result.ok();
+            } else {
+                return Result.error("删除会话失败");
+            }
+        }
+        log.warn("[ai-chat]删除会话:未找到会话:{}", conversationId);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<?> updateConversationTitle(ChatConversation updateTitleParams) {
+        AssertUtils.assertNotEmpty("请先选择会话", updateTitleParams);
+        AssertUtils.assertNotEmpty("请先选择会话", updateTitleParams.getId());
+        AssertUtils.assertNotEmpty("请输入会话标题", updateTitleParams.getTitle());
+        String key = getConversationCacheKey(updateTitleParams.getId(), null);
+        if (oConvertUtils.isEmpty(key)) {
+            log.warn("[ai-chat]删除会话:未找到会话:{}", updateTitleParams.getId());
+            return Result.ok();
+        }
+        ChatConversation chatConversation = (ChatConversation) redisTemplate.boundValueOps(key).get();
+        chatConversation.setTitle(updateTitleParams.getTitle());
+        saveChatConversation(chatConversation);
+        return Result.ok();
+    }
+
+    /**
+     * 获取会话缓存key
+     *
+     * @param conversationId
+     * @param httpRequest
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 19:27
+     */
+    private String getConversationCacheKey(String conversationId, HttpServletRequest httpRequest) {
+        if (oConvertUtils.isEmpty(conversationId)) {
+            return null;
+        }
+        String key = getConversationDirCacheKey(httpRequest);
+        key = key + ":" + conversationId;
+        return key;
+    }
+
+    /**
+     * 获取当前用户会话的缓存目录
+     *
+     * @param httpRequest
+     * @return
+     * @author chenrui
+     * @date 2025/2/26 15:09
+     */
+    private String getConversationDirCacheKey(HttpServletRequest httpRequest) {
+        String username = getUsername(httpRequest);
+        // 如果用户不存在,获取当前请求的sessionid
+        if (oConvertUtils.isEmpty(username)) {
+            try {
+                if (null == httpRequest) {
+                    httpRequest = SpringContextUtils.getHttpServletRequest();
+                }
+                username = httpRequest.getSession().getId();
+            } catch (Exception e) {
+                log.error("获取当前请求的sessionid失败", e);
+            }
+        }
+        AssertUtils.assertNotEmpty("请先登录", username);
+        return "airag:chat:" + username;
+    }
+
+    /**
+     * 获取会话
+     *
+     * @param app
+     * @param conversationId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 19:19
+     */
+    @NotNull
+    private ChatConversation getOrCreateChatConversation(AiragApp app, String conversationId) {
+        if (oConvertUtils.isObjectEmpty(app)) {
+            app = new AiragApp();
+            app.setId(AiAppConsts.DEFAULT_APP_ID);
+        }
+        ChatConversation chatConversation = null;
+        String key = getConversationCacheKey(conversationId, null);
+        if (oConvertUtils.isNotEmpty(key)) {
+            chatConversation = (ChatConversation) redisTemplate.boundValueOps(key).get();
+        }
+        if (null == chatConversation) {
+            chatConversation = createConversation(conversationId);
+        }
+        chatConversation.setApp(app);
+        return chatConversation;
+    }
+
+    /**
+     * 创建新的会话
+     *
+     * @param conversationId
+     * @return
+     * @author chenrui
+     * @date 2025/2/26 15:53
+     */
+    @NotNull
+    private ChatConversation createConversation(String conversationId) {
+        // 新会话
+        conversationId = oConvertUtils.getString(conversationId, UUIDGenerator.generate());
+        ChatConversation chatConversation = new ChatConversation();
+        chatConversation.setId(conversationId);
+        chatConversation.setCreateTime(new Date());
+        return chatConversation;
+    }
+
+    /**
+     * 保存会话
+     *
+     * @param chatConversation
+     * @author chenrui
+     * @date 2025/2/25 19:27
+     */
+    private void saveChatConversation(ChatConversation chatConversation) {
+        saveChatConversation(chatConversation, false, null);
+    }
+
+    /**
+     * 保存会话
+     *
+     * @param chatConversation
+     * @param temp             是否临时会话
+     * @author chenrui
+     * @date 2025/2/25 19:27
+     */
+    private void saveChatConversation(ChatConversation chatConversation, boolean temp, HttpServletRequest httpRequest) {
+        if (null == chatConversation) {
+            return;
+        }
+        String key = getConversationCacheKey(chatConversation.getId(), httpRequest);
+        if (oConvertUtils.isEmpty(key)) {
+            return;
+        }
+        BoundValueOperations chatRedisCacheOp = redisTemplate.boundValueOps(key);
+        chatRedisCacheOp.set(chatConversation);
+        if (temp) {
+            chatRedisCacheOp.expire(3, TimeUnit.HOURS);
+        }
+    }
+
+    /**
+     * 构造消息
+     *
+     * @param conversation
+     * @param topicId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 15:26
+     */
+    private List<ChatMessage> collateMessage(ChatConversation conversation, String topicId) {
+        List<MessageHistory> messagesHistory = conversation.getMessages();
+        if (oConvertUtils.isObjectEmpty(messagesHistory)) {
+            return new LinkedList<>();
+        }
+        LinkedList<ChatMessage> chatMessages = new LinkedList<>();
+        for (int i = messagesHistory.size() - 1; i >= 0; i--) {
+            MessageHistory history = messagesHistory.get(i);
+            if (topicId.equals(history.getTopicId())) {
+                ChatMessage chatMessage = null;
+                switch (history.getRole()) {
+                    case AiragConsts.MESSAGE_ROLE_USER:
+                        List<Content> contents = new ArrayList<>();
+                        List<MessageHistory.ImageHistory> images = history.getImages();
+                        if (oConvertUtils.isObjectNotEmpty(images) && !images.isEmpty()) {
+                            contents.addAll(images.stream().map(imageHistory -> {
+                                if (oConvertUtils.isNotEmpty(imageHistory.getUrl())) {
+                                    return ImageContent.from(imageHistory.getUrl());
+                                } else {
+                                    return ImageContent.from(imageHistory.getBase64Data(), imageHistory.getMimeType());
+                                }
+                            }).collect(Collectors.toList()));
+                        }
+                        contents.add(TextContent.from(history.getContent()));
+                        chatMessage = UserMessage.from(contents);
+                        break;
+                    case AiragConsts.MESSAGE_ROLE_AI:
+                        chatMessage = new AiMessage(history.getContent());
+                        break;
+                }
+                if (null == chatMessage) {
+                    continue;
+                }
+                chatMessages.addFirst(chatMessage);
+            }
+        }
+        return chatMessages;
+    }
+
+
+    /**
+     * 追加消息
+     *
+     * @param messages
+     * @param message
+     * @param chatConversation
+     * @param topicId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 19:05
+     */
+    private void appendMessage(List<ChatMessage> messages, ChatMessage message, ChatConversation chatConversation, String topicId) {
+
+        if (message.type().equals(ChatMessageType.SYSTEM)) {
+            // 系统消息,放到消息列表最前面,并且不记录历史
+            messages.add(0, message);
+            return;
+        } else {
+            messages.add(message);
+        }
+        List<MessageHistory> histories = chatConversation.getMessages();
+        if (oConvertUtils.isObjectEmpty(histories)) {
+            histories = new ArrayList<>();
+        }
+        // 消息记录
+        MessageHistory historyMessage = MessageHistory.builder().conversationId(chatConversation.getId()).topicId(topicId).datetime(DateUtils.now()).build();
+        if (message.type().equals(ChatMessageType.USER)) {
+            historyMessage.setRole(AiragConsts.MESSAGE_ROLE_USER);
+            StringBuilder textContent = new StringBuilder();
+            List<MessageHistory.ImageHistory> images = new ArrayList<>();
+            List<Content> contents = ((UserMessage) message).contents();
+            contents.forEach(content -> {
+                if (content.type().equals(ContentType.IMAGE)) {
+                    ImageContent imageContent = (ImageContent) content;
+                    Image image = imageContent.image();
+                    MessageHistory.ImageHistory imageMessage = MessageHistory.ImageHistory.from(image.url(), image.base64Data(), image.mimeType());
+                    images.add(imageMessage);
+                } else if (content.type().equals(ContentType.TEXT)) {
+                    textContent.append(((TextContent) content).text()).append("\n");
+                }
+            });
+            historyMessage.setContent(textContent.toString());
+            historyMessage.setImages(images);
+        } else if (message.type().equals(ChatMessageType.AI)) {
+            historyMessage.setRole(AiragConsts.MESSAGE_ROLE_AI);
+            historyMessage.setContent(((AiMessage) message).text());
+        }
+        histories.add(historyMessage);
+        chatConversation.setMessages(histories);
+    }
+
+    /**
+     * 发送聊天消息
+     *
+     * @param chatConversation
+     * @param topicId
+     * @param sendParams
+     * @return
+     * @author chenrui
+     * @date 2025/2/28 11:04
+     */
+    @NotNull
+    private SseEmitter doChat(ChatConversation chatConversation, String topicId, ChatSendParams sendParams) {
+        // 从历史消息中组装本次的消息列表
+        List<ChatMessage> messages = collateMessage(chatConversation, topicId);
+
+        AiragApp aiApp = chatConversation.getApp();
+        // 每次会话都生成一个新的,用来缓存emitter
+        String requestId = UUIDGenerator.generate();
+        SseEmitter emitter = new SseEmitter(-0L);
+        emitter.onError(throwable -> {
+            log.warn("SEE向客户端发送消息失败: {}", throwable.getMessage());
+            AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE, requestId);
+            try {
+                emitter.complete();
+            } catch (Exception ignore) {}
+        });
+        EventData eventRequestId = new EventData(requestId, null, EventData.EVENT_INIT_REQUEST_ID, chatConversation.getId(), topicId);
+        eventRequestId.setData(EventMessageData.builder().message("").build());
+        sendMessage2Client(emitter, eventRequestId);
+        // 缓存emitter
+        AiragLocalCache.put(AiragConsts.CACHE_TYPE_SSE, requestId, emitter);
+        // 缓存开始发送时间
+        log.info("[AI-CHAT]开始发送消息,requestId:{}", requestId);
+        AiragLocalCache.put(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId, System.currentTimeMillis());
+        try {
+            // 组装用户消息
+            UserMessage userMessage = aiChatHandler.buildUserMessage(sendParams.getContent(), sendParams.getImages());
+            // 追加消息
+            appendMessage(messages, userMessage, chatConversation, topicId);
+            /* 这里应该是有几种情况:
+             * 1. 非ai应用:获取默认模型->开始聊天
+             * 2. AI应用-聊天助手(ChatAssistant):从应用信息组装模型和提示词->开始聊天
+             * 3. AI应用-聊天流程(ChatFlow):从应用信息获取模型,流程,组装入参->调用工作流
+             */
+            if (null != aiApp && !AiAppConsts.DEFAULT_APP_ID.equals(aiApp.getId())) {
+                // ai应用:查询应用信息(ChatAssistant,chatflow),模型信息,组装模型-提示词,知识库等
+                if (AiAppConsts.APP_TYPE_CHAT_FLOW.equals(aiApp.getType())) {
+                    // ai应用:聊天流程(ChatFlow)
+                    sendWithFlow(requestId, aiApp.getFlowId(), chatConversation, topicId, messages, sendParams);
+                } else {
+                    // AI应用-聊天助手(ChatAssistant):从应用信息组装模型和提示词
+                    sendWithAppChat(requestId, messages, chatConversation, topicId);
+                }
+            } else {
+                // 发消息
+                sendWithDefault(requestId, chatConversation, topicId, null, messages, null);
+            }
+        } catch (Throwable e) {
+            log.error(e.getMessage(), e);
+            EventData eventData = new EventData(requestId, null, EventData.EVENT_FLOW_ERROR, chatConversation.getId(), topicId);
+            eventData.setData(EventFlowData.builder().success(false).message(e.getMessage()).build());
+            closeSSE(emitter, eventData);
+        }
+        return emitter;
+    }
+
+    /**
+     * 运行流程
+     *
+     * @param requestId
+     * @param flowId
+     * @param chatConversation
+     * @param topicId
+     * @param messages
+     * @param sendParams
+     * @author chenrui
+     * @date 2025/2/27 14:55
+     */
+    private void sendWithFlow(String requestId, String flowId, ChatConversation chatConversation, String topicId, List<ChatMessage> messages, ChatSendParams sendParams) {
+        FlowRunParams flowRunParams = new FlowRunParams();
+        flowRunParams.setRequestId(requestId);
+        flowRunParams.setFlowId(flowId);
+        flowRunParams.setConversationId(chatConversation.getId());
+        flowRunParams.setTopicId(topicId);
+        // 支持流式
+        flowRunParams.setResponseMode(FlowConsts.FLOW_RESPONSE_MODE_STREAMING);
+        Map<String, Object> flowInputParams = new HashMap<>();
+        List<MessageHistory> histories = new ArrayList<>();
+        if (oConvertUtils.isObjectNotEmpty(chatConversation.getMessages())) {
+            // 创建历史消息的副本(不直接操作原来的list)
+            histories.addAll(chatConversation.getMessages());
+            // 移除最后一条历史消息(最后一条是当前发出去的这一条消息)
+            histories.remove(histories.size() - 1);
+        }
+        flowInputParams.put(FlowConsts.FLOW_INPUT_PARAM_HISTORY, histories);
+        flowInputParams.put(FlowConsts.FLOW_INPUT_PARAM_QUESTION, sendParams.getContent());
+        flowInputParams.put(FlowConsts.FLOW_INPUT_PARAM_IMAGES, sendParams.getImages());
+        flowRunParams.setInputParams(flowInputParams);
+        HttpServletRequest httpRequest = SpringContextUtils.getHttpServletRequest();
+        flowRunParams.setHttpRequest(httpRequest);
+        // 流程结束后,记录ai返回并保存会话
+        // sse
+        SseEmitter emitter = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE, requestId);
+        flowRunParams.setEventCallback(eventData -> {
+            if (EventData.EVENT_FLOW_FINISHED.equals(eventData.getEvent())) {
+                // 打印耗时日志
+                printChatDuration(requestId, "流程执行完毕");
+                // 已经执行完了,删除时间缓存
+                AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId);
+                EventFlowData data = (EventFlowData) eventData.getData();
+                if(data.isSuccess()) {
+                    Object outputs = data.getOutputs();
+                    if (oConvertUtils.isObjectNotEmpty(outputs)) {
+                        AiMessage aiMessage;
+                        if (outputs instanceof String) {
+                            // 兼容推理模型
+                            String messageText = String.valueOf(outputs);
+                            messageText = messageText.replaceAll("<think>([\\s\\S]*?)</think>", "> $1");
+                            aiMessage = new AiMessage(messageText);
+                        } else {
+                            aiMessage = new AiMessage(JSONObject.toJSONString(outputs));
+                        }
+                        EventData msgEventData = new EventData(requestId, null, EventData.EVENT_MESSAGE, chatConversation.getId(), topicId);
+                        EventMessageData messageEventData = EventMessageData.builder().message(aiMessage.text()).build();
+                        msgEventData.setData(messageEventData);
+                        msgEventData.setRequestId(requestId);
+                        sendMessage2Client(emitter, msgEventData);
+                        appendMessage(messages, aiMessage, chatConversation, topicId);
+                        // 保存会话
+                        saveChatConversation(chatConversation, false, httpRequest);
+                    }
+                }else{
+                    //update-begin---author:chenrui ---date:20250425  for：[QQYUN-12203]AI 聊天，超时或者服务器报错，给个友好提示------------
+                    // 失败
+                    String message = data.getMessage();
+                    if (message != null && message.contains(FlowConsts.FLOW_ERROR_MSG_LLM_TIMEOUT)) {
+                        message = "当前用户较多，排队中，请稍后再试！";
+                        EventData errEventData = new EventData(requestId, null, EventData.EVENT_MESSAGE, chatConversation.getId(), topicId);
+                        errEventData.setData(EventMessageData.builder().message("\n" + message).build());
+                        sendMessage2Client(emitter, errEventData);
+                        errEventData = new EventData(requestId, null, EventData.EVENT_MESSAGE_END, chatConversation.getId(), topicId);
+                        // 如果是超时,主动关闭SSE,防止流程切面中返回异常消息导致前端不能正常展示上面的{普通消息}.
+                        closeSSE(emitter, errEventData);
+                    }
+                    //update-end---author:chenrui ---date:20250425  for：[QQYUN-12203]AI 聊天，超时或者服务器报错，给个友好提示------------
+                }
+            }
+        });
+        // 打印流程耗时日志
+        printChatDuration(requestId, "开始执行流程");
+        airagFlowService.runFlow(flowRunParams);
+    }
+
+
+    /**
+     * 发送app聊天
+     *
+     * @param requestId
+     * @param messages
+     * @param chatConversation
+     * @param topicId
+     * @return
+     * @author chenrui
+     * @date 2025/2/28 10:41
+     */
+    private void sendWithAppChat(String requestId, List<ChatMessage> messages, ChatConversation chatConversation, String topicId) {
+        AiragApp aiApp = chatConversation.getApp();
+        String modelId = aiApp.getModelId();
+        AssertUtils.assertNotEmpty("请先选择模型", modelId);
+        // AI应用提示词
+        String prompt = aiApp.getPrompt();
+        if (oConvertUtils.isNotEmpty(prompt)) {
+            appendMessage(messages, new SystemMessage(prompt), chatConversation, topicId);
+        }
+
+        AIChatParams aiChatParams = new AIChatParams();
+        // AI应用自定义的模型参数
+        String metadataStr = aiApp.getMetadata();
+        if (oConvertUtils.isNotEmpty(metadataStr)) {
+            JSONObject metadata = JSONObject.parseObject(metadataStr);
+            if (oConvertUtils.isNotEmpty(metadata)) {
+                if (metadata.containsKey("temperature")) {
+                    aiChatParams.setTemperature(metadata.getDouble("temperature"));
+                }
+                if (metadata.containsKey("topP")) {
+                    aiChatParams.setTopP(metadata.getDouble("topP"));
+                }
+                if (metadata.containsKey("presencePenalty")) {
+                    aiChatParams.setPresencePenalty(metadata.getDouble("presencePenalty"));
+                }
+                if (metadata.containsKey("frequencyPenalty")) {
+                    aiChatParams.setFrequencyPenalty(metadata.getDouble("frequencyPenalty"));
+                }
+                if (metadata.containsKey("maxTokens")) {
+                    aiChatParams.setMaxTokens(metadata.getInteger("maxTokens"));
+                }
+            }
+        }
+        // 打印流程耗时日志
+        printChatDuration(requestId, "构造应用自定义参数完成");
+        // 发消息
+        sendWithDefault(requestId, chatConversation, topicId, modelId, messages, aiChatParams);
+    }
+
+    /**
+     * 处理聊天
+     * 向大模型发送消息并接受响应
+     *
+     * @param chatConversation
+     * @param topicId
+     * @param modelId
+     * @param messages
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 19:24
+     */
+    private void sendWithDefault(String requestId, ChatConversation chatConversation, String topicId, String modelId, List<ChatMessage> messages, AIChatParams aiChatParams) {
+        // 调用ai聊天
+        if (null == aiChatParams) {
+            aiChatParams = new AIChatParams();
+        }
+        aiChatParams.setKnowIds(chatConversation.getApp().getKnowIds());
+        aiChatParams.setMaxMsgNumber(oConvertUtils.getInt(chatConversation.getApp().getMsgNum(), 5));
+        HttpServletRequest httpRequest = SpringContextUtils.getHttpServletRequest();
+        TokenStream chatStream;
+        try {
+            // 打印流程耗时日志
+            printChatDuration(requestId, "开始向LLM发送消息");
+            if (oConvertUtils.isNotEmpty(modelId)) {
+                chatStream = aiChatHandler.chat(modelId, messages, aiChatParams);
+            } else {
+                chatStream = aiChatHandler.chatByDefaultModel(messages, aiChatParams);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new JeecgBootBizTipException("调用大模型接口失败:" + e.getMessage());
+        }
+        /**
+         * 是否正在思考
+         */
+        AtomicBoolean isThinking = new AtomicBoolean(false);
+        // ai聊天响应逻辑
+        chatStream.onNext((String resMessage) -> {
+            // 兼容推理模型
+            if ("<think>".equals(resMessage)) {
+                isThinking.set(true);
+                resMessage = "> ";
+            }
+            if ("</think>".equals(resMessage)) {
+                isThinking.set(false);
+                resMessage = "\n\n";
+            }
+            if (isThinking.get()) {
+                if (null != resMessage && resMessage.contains("\n")) {
+                    resMessage = "\n> ";
+                }
+            }
+            EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE, chatConversation.getId(), topicId);
+            EventMessageData messageEventData = EventMessageData.builder().message(resMessage).build();
+            eventData.setData(messageEventData);
+            eventData.setRequestId(requestId);
+            // sse
+            SseEmitter emitter = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE, requestId);
+            if (null == emitter) {
+                log.warn("[AI应用]接收LLM返回会话已关闭");
+                return;
+            }
+            sendMessage2Client(emitter, eventData);
+        }).onComplete((responseMessage) -> {
+            // 打印流程耗时日志
+            printChatDuration(requestId, "LLM输出消息完成");
+            AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId);
+            // 记录ai的回复
+            AiMessage aiMessage = responseMessage.content();
+            FinishReason finishReason = responseMessage.finishReason();
+            String respText = aiMessage.text();
+            // sse
+            SseEmitter emitter = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE, requestId);
+            if (null == emitter) {
+                log.warn("[AI应用]接收LLM返回会话已关闭");
+                return;
+            }
+            if (FinishReason.STOP.equals(finishReason) || null == finishReason) {
+                // 正常结束
+                EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE_END, chatConversation.getId(), topicId);
+                appendMessage(messages, aiMessage, chatConversation, topicId);
+                // 保存会话
+                saveChatConversation(chatConversation, false, httpRequest);
+                closeSSE(emitter, eventData);
+            } else if (FinishReason.TOOL_EXECUTION.equals(finishReason)) {
+                // 需要执行工具
+                // TODO author: chenrui for: date:2025/3/7
+            } else if (FinishReason.LENGTH.equals(finishReason)) {
+                // 上下文长度超过限制
+                log.error("调用模型异常:上下文长度超过限制:{}", responseMessage.tokenUsage());
+                EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE, chatConversation.getId(), topicId);
+                eventData.setData(EventMessageData.builder().message("\n上下文长度超过限制，请调整模型最大Tokens").build());
+                sendMessage2Client(emitter, eventData);
+                eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE_END, chatConversation.getId(), topicId);
+                closeSSE(emitter, eventData);
+            } else {
+                // 异常结束
+                log.error("调用模型异常:" + respText);
+                if (respText.contains("insufficient Balance")) {
+                    respText = "大预言模型账号余额不足!";
+                }
+                EventData eventData = new EventData(requestId, null, EventData.EVENT_FLOW_ERROR, chatConversation.getId(), topicId);
+                eventData.setData(EventFlowData.builder().success(false).message(respText).build());
+                closeSSE(emitter, eventData);
+            }
+        }).onError((Throwable error) -> {
+            // 打印流程耗时日志
+            printChatDuration(requestId, "LLM输出消息异常");
+            AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId);
+            // sse
+            SseEmitter emitter = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE, requestId);
+            if (null == emitter) {
+                log.warn("[AI应用]接收LLM返回会话已关闭{}", requestId);
+                return;
+            }
+            log.error(error.getMessage(), error);
+            String errMsg = error.getMessage();
+            if (errMsg != null && errMsg.contains("timeout")) {
+                //update-begin---author:chenrui ---date:20250425  for：[QQYUN-12203]AI 聊天，超时或者服务器报错，给个友好提示------------
+                errMsg = "当前用户较多，排队中，请稍后再试！";
+                EventData eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE, chatConversation.getId(), topicId);
+                eventData.setData(EventMessageData.builder().message("\n" + errMsg).build());
+                sendMessage2Client(emitter, eventData);
+                eventData = new EventData(requestId, null, EventData.EVENT_MESSAGE_END, chatConversation.getId(), topicId);
+                closeSSE(emitter, eventData);
+                //update-end---author:chenrui ---date:20250425  for：[QQYUN-12203]AI 聊天，超时或者服务器报错，给个友好提示------------
+            } else {
+                errMsg = "调用大模型接口失败，详情请查看后台日志。";
+                EventData eventData = new EventData(requestId, null, EventData.EVENT_FLOW_ERROR, chatConversation.getId(), topicId);
+                eventData.setData(EventFlowData.builder().success(false).message(errMsg).build());
+                closeSSE(emitter, eventData);
+            }
+        }).start();
+    }
+
+    /**
+     * 发送消息到客户端
+     *
+     * @param emitter
+     * @param eventData
+     * @author chenrui
+     * @date 2025/4/22 19:58
+     */
+    private static void sendMessage2Client(SseEmitter emitter, EventData eventData) {
+        try {
+            log.info("发送消息:{}", eventData.getRequestId());
+            String eventStr = JSONObject.toJSONString(eventData);
+            log.debug("[AI应用]接收LLM返回消息:{}", eventStr);
+            emitter.send(SseEmitter.event().data(eventStr));
+        } catch (IOException e) {
+            log.error("发送消息失败", e);
+        }
+    }
+
+    /**
+     * 发送聊天返回结果
+     *
+     * @author chenrui
+     * @date 2025/2/28 11:05
+     */
+    private static class ChatResult {
+        public final SseEmitter emitter;
+        public final AiragModel chatModel;
+
+        public ChatResult(SseEmitter emitter, AiragModel chatModel) {
+            this.emitter = emitter;
+            this.chatModel = chatModel;
+        }
+    }
+
+
+    /**
+     * 总结会话标题
+     * 几个问题: <br/>
+     * 1. 如果在发消息时同步总结会话标题,会导致接口很慢甚至超时.
+     * 2. 但如果异步更新会话标题会导致消息记录丢失(不全)或者标题丢失,需要写很多逻辑去保证最终一致
+     * so 暂时先不用AI更新会话标题. 后期如果需要单独再增加一个接口,由前端调用或者在第一次消息接收完成后再异步更新
+     *
+     * @param chatConversation
+     * @param question
+     * @param modelId
+     * @return
+     * @author chenrui
+     * @date 2025/2/25 17:12
+     */
+    protected void summaryConversationTitle(ChatConversation chatConversation, String question, String modelId) {
+        if (oConvertUtils.isEmpty(chatConversation.getId())) {
+            return;
+        }
+        String key = getConversationCacheKey(chatConversation.getId(), null);
+        if (oConvertUtils.isEmpty(key)) {
+            return;
+        }
+        CompletableFuture.runAsync(() -> {
+            List<ChatMessage> messages = new LinkedList<>();
+            String systemMsgStr = "根据用户的问题,总结会话标题.\n" + "要求如下:\n" + "1. 使用中文回答.\n" + "2. 标题长度控制在5个汉字10个英文字符以内\n" + "3. 直接回复会话标题,不要有其他任何无关描述\n" + "4. 如果无法总结,回复不知道\n";
+            messages.add(new SystemMessage(systemMsgStr));
+            messages.add(new UserMessage(question));
+            String summaryTitle;
+            try {
+                summaryTitle = aiChatHandler.completions(modelId, messages, null);
+                log.info("总结会话完成{}", summaryTitle);
+                if (summaryTitle.equalsIgnoreCase("不知道")) {
+                    summaryTitle = "";
+                }
+            } catch (Exception e) {
+                log.warn("AI总结会话失败" + e.getMessage(), e);
+                summaryTitle = "";
+            }
+            // 更新会话标题
+            ChatConversation cachedConversation = (ChatConversation) redisTemplate.boundValueOps(key).get();
+            if (null == cachedConversation) {
+                cachedConversation = chatConversation;
+            }
+            if (oConvertUtils.isEmpty(chatConversation.getTitle())) {
+                // 再次判断标题是否为空,只有标题为空才更新
+                if (oConvertUtils.isNotEmpty(summaryTitle)) {
+                    cachedConversation.setTitle(summaryTitle);
+                } else {
+                    cachedConversation.setTitle(question.length() > 5 ? question.substring(0, 5) : question);
+                }
+                //保存会话
+                saveChatConversation(cachedConversation);
+            }
+        });
+    }
+
+    /**
+     * 获取用户名
+     *
+     * @param httpRequest
+     * @return
+     * @author chenrui
+     * @date 2025/3/27 15:05
+     */
+    private String getUsername(HttpServletRequest httpRequest) {
+        try {
+            TokenUtils.getTokenByRequest();
+            String token;
+            if (null != httpRequest) {
+                token = TokenUtils.getTokenByRequest(httpRequest);
+            } else {
+                token = TokenUtils.getTokenByRequest();
+            }
+            if (TokenUtils.verifyToken(token, sysBaseApi, redisUtil)) {
+                return JwtUtil.getUsername(token);
+            }
+        } catch (Exception e) {
+            return null;
+        }
+        return null;
+    }
+
+
+    /**
+     * 打印耗时
+     * @param requestId
+     * @param message
+     * @author chenrui
+     * @date 2025/4/28 15:15
+     */
+    private static void printChatDuration(String requestId,String message) {
+        Long beginTime = AiragLocalCache.get(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId);
+        if (null != beginTime) {
+            log.info("[AI-CHAT]{},requestId:{},耗时:{}s", message, requestId, (System.currentTimeMillis() - beginTime) / 1000);
+        }
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/AppDebugParams.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.airag.app.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+
+/**
+ * @Description: 应用调试入参
+ * @Author: chenrui
+ * @Date: 2025/2/25 11:47
+ */
+@Data
+public class AppDebugParams extends ChatSendParams {
+
+    /**
+     * 应用信息
+     */
+    AiragApp app;
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatConversation.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.airag.app.vo;
+
+import lombok.Data;
+import org.jeecg.modules.airag.app.entity.AiragApp;
+import org.jeecg.modules.airag.common.vo.MessageHistory;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 聊天会话
+ * @Author: chenrui
+ * @Date: 2025/2/25 14:56
+ */
+@Data
+public class ChatConversation {
+
+    /**
+     * 会话id
+     */
+    private String id;
+
+    /**
+     * 会话标题
+     */
+    private String title;
+
+    /**
+     * 消息记录
+     */
+    private List<MessageHistory> messages;
+
+    /**
+     * app
+     */
+    private AiragApp app;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatSendParams.java

@@ -0,0 +1,49 @@
+package org.jeecg.modules.airag.app.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description: 发送消息的入参
+ * @Author: chenrui
+ * @Date: 2025/2/25 11:47
+ */
+@NoArgsConstructor
+@Data
+public class ChatSendParams {
+
+    public ChatSendParams(String content, String conversationId, String topicId, String appId) {
+        this.content = content;
+        this.conversationId = conversationId;
+        this.topicId = topicId;
+        this.appId = appId;
+    }
+
+    /**
+     * 用户输入的聊天内容
+     */
+    private String content;
+
+    /**
+     * 对话会话ID
+     */
+    private String conversationId;
+
+    /**
+     * 对话主题ID（用于关联历史记录）
+     */
+    private String topicId;
+
+    /**
+     * 应用id
+     */
+    private String appId;
+
+    /**
+     * 图片列表
+     */
+    private List<String> images;
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/JimuDataReader.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.airag.demo;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.exception.JeecgBootBizTipException;
+import org.jeecg.modules.airag.flow.component.enhance.IAiRagEnhanceJava;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Java增强Demo: Excel数据读取器
+ * for [QQYUN-11718]【AI】积木报表对接AI流程编排接口展示报表
+ * @Author: chenrui
+ * @Date: 2025/4/29 16:51
+ */
+@Component("jimuDataReader")
+@Slf4j
+public class JimuDataReader implements IAiRagEnhanceJava {
+
+
+    @Override
+    public Map<String, Object> process(Map<String, Object> inputParams) {
+        // inputParams: {"bizData":"/xxxx/xxxx/xxxx/xxxx.xls"}
+        try {
+            String filePath = (String) inputParams.get("bizData");
+            if (filePath == null || filePath.isEmpty()) {
+                throw new IllegalArgumentException("File path is empty");
+            }
+
+            File excelFile = new File(filePath);
+            if (!excelFile.exists() || !excelFile.isFile()) {
+                throw new IllegalArgumentException("File not found: " + filePath);
+            }
+
+            // Since we don't know the target entity class, we'll read the Excel generically
+            return readExcelData(excelFile);
+        } catch (Exception e) {
+            log.error("Error processing Excel file", e);
+            throw new JeecgBootBizTipException("调用java增强失败", e);
+        }
+    }
+
+    /**
+     * Excel导入工具方法，基于ExcelImportUtil
+     *
+     * @param file Excel文件
+     * @return Excel读取结果，包含字段和数据
+     * @throws Exception 导入过程中的异常
+     */
+    public static Map<String, Object> readExcelData(File file) throws Exception {
+        Map<String, Object> result = new HashMap<>();
+
+        // 设置导入参数
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0); // 没有标题
+        params.setHeadRows(1);  // 第一行是表头
+
+        // 读取Excel数据
+        List<Map<String, Object>> dataList = ExcelImportUtil.importExcel(file, Map.class, params);
+
+        // 如果没有数据，返回空结果
+        if (dataList == null || dataList.isEmpty()) {
+            result.put("fields", new ArrayList<>());
+            result.put("datas", new ArrayList<>());
+            return result;
+        }
+
+        // 从第一行数据中获取字段名
+        List<String> fieldNames = new ArrayList<>(dataList.get(0).keySet());
+
+        result.put("fields", fieldNames);
+        result.put("datas", dataList);
+
+        return result;
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/TestAiragEnhance.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.airag.demo;
+
+import org.jeecg.modules.airag.flow.component.enhance.IAiRagEnhanceJava;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * @Description: Java增强节点示例类
+ * @Author: chenrui
+ * @Date: 2025/3/6 11:42
+ */
+@Component("testAiragEnhance")
+public class TestAiragEnhance implements IAiRagEnhanceJava {
+    @Override
+    public Map<String, Object> process(Map<String, Object> inputParams) {
+        Object arg1 = inputParams.get("arg1");
+        Object arg2 = inputParams.get("arg2");
+        return Collections.singletonMap("result",arg1.toString()+"java拼接"+arg2.toString());
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/EmbedStoreConfigBean.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.airag.llm.config;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 向量存储库配置
+ *
+ * @Author: chenrui
+ * @Date: 2025/2/18 14:24
+ */
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = EmbedStoreConfigBean.PREFIX)
+public class EmbedStoreConfigBean {
+    public static final String PREFIX = "jeecg.airag.embed-store";
+
+    /**
+     * host
+     */
+    private String host = "127.0.0.1";
+    /**
+     * 端口
+     */
+    private int port = 5432;
+    /**
+     * 数据库
+     */
+    private String database = "postgres";
+    /**
+     * 用户名
+     */
+    private String user = "postgres";
+    /**
+     * 密码
+     */
+    private String password = "postgres";
+
+    /**
+     * 存储向量的表
+     */
+    private String table = "embeddings";
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/KnowConfigBean.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.airag.llm.config;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 知识库配置
+ *
+ * @Author: chenrui
+ * @Date: 2025-04-01 14:19
+ */
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = KnowConfigBean.PREFIX)
+public class KnowConfigBean {
+    public static final String PREFIX = "jeecg.airag.know";
+
+    /**
+     * 开启MinerU解析
+     */
+    private boolean enableMinerU = false;
+
+    /**
+     * conda的环境(默认不使用conda)
+     */
+    private String condaEnv = null;
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/consts/LLMConsts.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.airag.llm.consts;
+
+import java.util.regex.Pattern;
+
+/**
+ * @Description: airag模型常量类
+ * @Author: chenrui
+ * @Date: 2025/2/12 17:35
+ */
+public class LLMConsts {
+
+
+    /**
+     * 正则表达式:是否是网页
+     */
+    public static final Pattern WEB_PATTERN = Pattern.compile("^(http|https)://.*");
+
+    /**
+     * 状态:启用
+     */
+    public static final String STATUS_ENABLE = "enable";
+    /**
+     * 状态:禁用
+     */
+    public static final String STATUS_DISABLE = "disable";
+
+
+    /**
+     * 模型类型:向量
+     */
+    public static final String MODEL_TYPE_EMBED = "EMBED";
+
+    /**
+     * 模型类型:聊天
+     */
+    public static final String MODEL_TYPE_LLM = "LLM";
+
+    /**
+     * 向量模型：默认维度
+     */
+    public static final Integer EMBED_MODEL_DEFAULT_DIMENSION = 1536;
+
+    /**
+     * 知识库:文档状态:草稿
+     */
+    public static final String KNOWLEDGE_DOC_STATUS_DRAFT = "draft";
+    /**
+     * 知识库:文档状态:构建中
+     */
+    public static final String KNOWLEDGE_DOC_STATUS_BUILDING = "building";
+    /**
+     * 知识库:文档状态:构建完成
+     */
+    public static final String KNOWLEDGE_DOC_STATUS_COMPLETE = "complete";
+    /**
+     * 知识库:文档状态:构建失败
+     */
+    public static final String KNOWLEDGE_DOC_STATUS_FAILED = "failed";
+
+    /**
+     * 知识库:文档类型:文本
+     */
+    public static final String KNOWLEDGE_DOC_TYPE_TEXT = "text";
+    /**
+     * 知识库:文档类型:文件
+     */
+    public static final String KNOWLEDGE_DOC_TYPE_FILE = "file";
+    /**
+     * 知识库:文档类型:网页
+     */
+    public static final String KNOWLEDGE_DOC_TYPE_WEB = "web";
+
+    /**
+     * 知识库:文档元数据:文件路径
+     */
+    public static final String KNOWLEDGE_DOC_METADATA_FILEPATH = "filePath";
+
+    /**
+     * 知识库:文档元数据:资源路径
+     */
+    public static final String KNOWLEDGE_DOC_METADATA_SOURCES_PATH = "sourcesPath";
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragKnowledgeController.java

@@ -0,0 +1,361 @@
+package org.jeecg.modules.airag.llm.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.AssertUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.modules.airag.common.vo.knowledge.KnowledgeSearchResult;
+import org.jeecg.modules.airag.llm.consts.LLMConsts;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledge;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc;
+import org.jeecg.modules.airag.llm.handler.EmbeddingHandler;
+import org.jeecg.modules.airag.llm.service.IAiragKnowledgeDocService;
+import org.jeecg.modules.airag.llm.service.IAiragKnowledgeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: AIRag知识库
+ * @Author: jeecg-boot
+ * @Date: 2025-02-18
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/airag/knowledge")
+@Slf4j
+public class AiragKnowledgeController {
+    @Autowired
+    private IAiragKnowledgeService airagKnowledgeService;
+
+    @Autowired
+    private IAiragKnowledgeDocService airagKnowledgeDocService;
+
+    @Autowired
+    EmbeddingHandler embeddingHandler;
+
+    /**
+     * 分页列表查询知识库
+     *
+     * @param airagKnowledge
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/list")
+    public Result<IPage<AiragKnowledge>> queryPageList(AiragKnowledge airagKnowledge,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
+        QueryWrapper<AiragKnowledge> queryWrapper = QueryGenerator.initQueryWrapper(airagKnowledge, req.getParameterMap());
+        Page<AiragKnowledge> page = new Page<AiragKnowledge>(pageNo, pageSize);
+        IPage<AiragKnowledge> pageList = airagKnowledgeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加知识库
+     *
+     * @param airagKnowledge 知识库
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @PostMapping(value = "/add")
+    @RequiresPermissions("airag:knowledge:add")
+    public Result<String> add(@RequestBody AiragKnowledge airagKnowledge) {
+        airagKnowledge.setStatus(LLMConsts.STATUS_ENABLE);
+        airagKnowledgeService.save(airagKnowledge);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑知识库
+     *
+     * @param airagKnowledge 知识库
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequiresPermissions("airag:knowledge:edit")
+    public Result<String> edit(@RequestBody AiragKnowledge airagKnowledge) {
+        AiragKnowledge airagKnowledgeEntity = airagKnowledgeService.getById(airagKnowledge.getId());
+        if (airagKnowledgeEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+        String oldEmbedId = airagKnowledgeEntity.getEmbedId();
+        airagKnowledgeService.updateById(airagKnowledge);
+        if (!oldEmbedId.equalsIgnoreCase(airagKnowledge.getEmbedId())) {
+            // 更新了模型,重建文档
+            airagKnowledgeDocService.rebuildDocumentByKnowId(airagKnowledge.getId());
+        }
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 重建知识库
+     *
+     * @param knowIds
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 17:05
+     */
+    @PutMapping(value = "/rebuild")
+    @RequiresPermissions("airag:knowledge:rebuild")
+    public Result<?> rebuild(@RequestParam("knowIds") String knowIds) {
+        String[] knowIdArr = knowIds.split(",");
+        for (String knowId : knowIdArr) {
+            airagKnowledgeDocService.rebuildDocumentByKnowId(knowId);
+        }
+        return Result.OK("");
+    }
+
+    /**
+     * 通过id删除知识库
+     *
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @DeleteMapping(value = "/delete")
+    @RequiresPermissions("airag:knowledge:delete")
+    public Result<String> delete(HttpServletRequest request, @RequestParam(name = "id", required = true) String id) {
+        //update-begin---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
+        if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+            AiragKnowledge know = airagKnowledgeService.getById(id);
+            //获取当前租户
+            String currentTenantId = TokenUtils.getTenantIdByRequest(request);
+            if (null == know || !know.getTenantId().equals(currentTenantId)) {
+                return Result.error("删除AI知识库失败，不能删除其他租户的AI知识库！");
+            }
+        }
+        //update-end---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        airagKnowledgeDocService.removeByKnowIds(Collections.singletonList(id));
+        airagKnowledgeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 通过id查询知识库
+     *
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @GetMapping(value = "/queryById")
+    public Result<AiragKnowledge> queryById(@RequestParam(name = "id", required = true) String id) {
+        AiragKnowledge airagKnowledge = airagKnowledgeService.getById(id);
+        if (airagKnowledge == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(airagKnowledge);
+    }
+
+    /**
+     * 文档分页查询
+     *
+     * @param airagKnowledgeDoc
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 18:37
+     */
+    @GetMapping(value = "/doc/list")
+    public Result<IPage<AiragKnowledgeDoc>> queryDocumentPageList(AiragKnowledgeDoc airagKnowledgeDoc,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        AssertUtils.assertNotEmpty("请先选择知识库", airagKnowledgeDoc.getKnowledgeId());
+        QueryWrapper<AiragKnowledgeDoc> queryWrapper = QueryGenerator.initQueryWrapper(airagKnowledgeDoc, req.getParameterMap());
+        Page<AiragKnowledgeDoc> page = new Page<>(pageNo, pageSize);
+        IPage<AiragKnowledgeDoc> pageList = airagKnowledgeDocService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 新增或编辑文档
+     *
+     * @param airagKnowledgeDoc 知识库文档
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 15:47
+     */
+    @PostMapping(value = "/doc/edit")
+    @RequiresPermissions("airag:knowledge:doc:edit")
+    public Result<?> addDocument(@RequestBody AiragKnowledgeDoc airagKnowledgeDoc) {
+        return airagKnowledgeDocService.editDocument(airagKnowledgeDoc);
+    }
+
+
+    /**
+     * 从压缩包导入文档
+     * @return
+     * @author chenrui
+     * @date 2025/3/20 11:29
+     */
+    @PostMapping(value = "/doc/import/zip")
+    @RequiresPermissions("airag:knowledge:doc:zip")
+    public Result<?> importDocumentFromZip(@RequestParam(name = "knowId", required = true) String knowId,
+                                           @RequestParam(name = "file", required = true) MultipartFile file) {
+        return airagKnowledgeDocService.importDocumentFromZip(knowId,file);
+    }
+
+    /**
+     * 通过文档库查询导入任务列表
+     * @param knowId
+     * @return
+     * @author chenrui
+     * @date 2025/3/20 11:37
+     */
+    @GetMapping(value = "/doc/import/task/list")
+    public Result<?> importDocumentTaskList(@RequestParam(name = "knowId", required = true) String knowId) {
+        return Result.OK(Collections.emptyList());
+    }
+
+    /**
+     * 重新向量化文档
+     *
+     * @param docIds 文档id集合
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 15:47
+     */
+    @PutMapping(value = "/doc/rebuild")
+    @RequiresPermissions("airag:knowledge:doc:rebuild")
+    public Result<?> rebuildDocument(@RequestParam("docIds") String docIds) {
+        return airagKnowledgeDocService.rebuildDocument(docIds);
+    }
+
+    /**
+     * 批量删除文档
+     *
+     * @param ids
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @DeleteMapping(value = "/doc/deleteBatch")
+    @RequiresPermissions("airag:knowledge:doc:deleteBatch")
+    public Result<String> deleteDocumentBatch(HttpServletRequest request, @RequestParam(name = "ids", required = true) String ids) {
+        List<String> idsList = Arrays.asList(ids.split(","));
+        //update-begin---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
+        if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+            List<AiragKnowledgeDoc> docList = airagKnowledgeDocService.listByIds(idsList);
+            //获取当前租户
+            String currentTenantId = TokenUtils.getTenantIdByRequest(request);
+            docList.forEach(airagKnowledgeDoc -> {
+                if (null == airagKnowledgeDoc || !airagKnowledgeDoc.getTenantId().equals(currentTenantId)) {
+                    throw new IllegalArgumentException("删除AI知识库文档失败，不能删除其他租户的AI知识库文档！");
+                }
+            });
+        }
+        //update-end---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        airagKnowledgeDocService.removeDocByIds(idsList);
+        return Result.OK("批量删除成功！");
+    }
+
+    /**
+     * 清空知识库文档
+     *
+     * @param
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @DeleteMapping(value = "/doc/deleteAll")
+    @RequiresPermissions("airag:knowledge:doc:deleteAll")
+    public Result<?> deleteDocumentAll(HttpServletRequest request, @RequestParam(name = "knowId") String knowId) {
+        //update-begin---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
+        if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+            AiragKnowledge know = airagKnowledgeService.getById(knowId);
+            //获取当前租户
+            String currentTenantId = TokenUtils.getTenantIdByRequest(request);
+            if (null == know || !know.getTenantId().equals(currentTenantId)) {
+                return Result.error("删除AI知识库失败，不能删除其他租户的AI知识库！");
+            }
+        }
+        //update-end---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        return airagKnowledgeDocService.deleteAllByKnowId(knowId);
+    }
+
+    /**
+     * 命中测试
+     *
+     * @param knowId     知识库id
+     * @param queryText  查询内容
+     * @param topNumber  最多返回条数
+     * @param similarity 最小分数
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @GetMapping(value = "/embedding/hitTest/{knowId}")
+    public Result<?> hitTest(@PathVariable("knowId") String knowId,
+                             @RequestParam(name = "queryText") String queryText,
+                             @RequestParam(name = "topNumber") Integer topNumber,
+                             @RequestParam(name = "similarity") Double similarity) {
+        List<Map<String, Object>> searchResp = embeddingHandler.searchEmbedding(knowId, queryText, topNumber, similarity);
+        return Result.ok(searchResp);
+    }
+
+    /**
+     * 向量查询
+     *
+     * @param knowIds    知识库ids
+     * @param queryText  查询内容
+     * @param topNumber  最多返回条数
+     * @param similarity 最小分数
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 17:09
+     */
+    @GetMapping(value = "/embedding/search")
+    public Result<?> embeddingSearch(@RequestParam("knowIds") List<String> knowIds,
+                                     @RequestParam(name = "queryText") String queryText,
+                                     @RequestParam(name = "topNumber", required = false) Integer topNumber,
+                                     @RequestParam(name = "similarity", required = false) Double similarity) {
+        KnowledgeSearchResult searchResp = embeddingHandler.embeddingSearch(knowIds, queryText, topNumber, similarity);
+        return Result.ok(searchResp);
+    }
+
+    /**
+     * 通过ids批量查询知识库
+     *
+     * @param ids
+     * @return
+     * @author chenrui
+     * @date 2025/2/27 16:44
+     */
+    @GetMapping(value = "/query/batch/byId")
+    public Result<?> queryBatchByIds(@RequestParam(name = "ids", required = true) String ids) {
+        List<String> idList = Arrays.asList(ids.split(","));
+        List<AiragKnowledge> airagKnowledges = airagKnowledgeService.listByIds(idList);
+        return Result.OK(airagKnowledges);
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java

@@ -0,0 +1,180 @@
+package org.jeecg.modules.airag.llm.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.ai.factory.AiModelFactory;
+import org.jeecg.ai.factory.AiModelOptions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.AssertUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.modules.airag.llm.consts.LLMConsts;
+import org.jeecg.modules.airag.llm.entity.AiragModel;
+import org.jeecg.modules.airag.llm.handler.AIChatHandler;
+import org.jeecg.modules.airag.llm.handler.EmbeddingHandler;
+import org.jeecg.modules.airag.llm.service.IAiragModelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Collections;
+
+/**
+ * @Description: AiRag模型配置
+ * @Author: jeecg-boot
+ * @Date: 2025-02-14
+ * @Version: V1.0
+ */
+@Tag(name = "AiRag模型配置")
+@RestController
+@RequestMapping("/airag/airagModel")
+@Slf4j
+public class AiragModelController extends JeecgController<AiragModel, IAiragModelService> {
+    @Autowired
+    private IAiragModelService airagModelService;
+
+    @Autowired
+    AIChatHandler aiChatHandler;
+
+    /**
+     * 分页列表查询
+     *
+     * @param airagModel
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/list")
+    public Result<IPage<AiragModel>> queryPageList(AiragModel airagModel, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AiragModel> queryWrapper = QueryGenerator.initQueryWrapper(airagModel, req.getParameterMap());
+        Page<AiragModel> page = new Page<AiragModel>(pageNo, pageSize);
+        IPage<AiragModel> pageList = airagModelService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param airagModel
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @RequiresPermissions("airag:model:add")
+    public Result<String> add(@RequestBody AiragModel airagModel) {
+        // 验证 模型名称/模型类型/基础模型
+        AssertUtils.assertNotEmpty("模型名称不能为空", airagModel.getName());
+        AssertUtils.assertNotEmpty("模型类型不能为空", airagModel.getModelType());
+        AssertUtils.assertNotEmpty("基础模型不能为空", airagModel.getModelName());
+        airagModelService.save(airagModel);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param airagModel
+     * @return
+     */
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequiresPermissions("airag:model:edit")
+    public Result<String> edit(@RequestBody AiragModel airagModel) {
+        airagModelService.updateById(airagModel);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/delete")
+    @RequiresPermissions("airag:model:delete")
+    public Result<String> delete(HttpServletRequest request, @RequestParam(name = "id", required = true) String id) {
+        //update-begin---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
+        if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+            AiragModel model = airagModelService.getById(id);
+            //获取当前租户
+            String currentTenantId = TokenUtils.getTenantIdByRequest(request);
+            if (null == model || !model.getTenantId().equals(currentTenantId)) {
+                return Result.error("删除AI模型失败，不能删除其他租户的AI模型！");
+            }
+        }
+        //update-end---author:chenrui ---date:20250606  for：[issues/8337]关于ai工作列表的数据权限问题 #8337------------
+        airagModelService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/queryById")
+    public Result<AiragModel> queryById(@RequestParam(name = "id", required = true) String id) {
+        AiragModel airagModel = airagModelService.getById(id);
+        if (airagModel == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(airagModel);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param airagModel
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AiragModel airagModel) {
+        return super.exportXls(request, airagModel, AiragModel.class, "AiRag模型配置");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AiragModel.class);
+    }
+
+    @PostMapping(value = "/test")
+    public Result<?> test(@RequestBody AiragModel airagModel) {
+        // 验证 模型名称/模型类型/基础模型
+        AssertUtils.assertNotEmpty("模型名称不能为空", airagModel.getName());
+        AssertUtils.assertNotEmpty("模型类型不能为空", airagModel.getModelType());
+        AssertUtils.assertNotEmpty("基础模型不能为空", airagModel.getModelName());
+        try {
+            if(LLMConsts.MODEL_TYPE_LLM.equals(airagModel.getModelType())){
+                aiChatHandler.completions(airagModel, Collections.singletonList(UserMessage.from("test connection")), null);
+            }else{
+                AiModelOptions aiModelOptions = EmbeddingHandler.buildModelOptions(airagModel);
+                EmbeddingModel embeddingModel = AiModelFactory.createEmbeddingModel(aiModelOptions);
+                embeddingModel.embed("test text");
+            }
+        }catch (Exception e){
+            log.error("测试模型连接失败", e);
+            return Result.error("测试模型连接失败" + e.getMessage());
+        }
+        return Result.OK("测试模型连接成功");
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/document/TikaDocumentParser.java

@@ -0,0 +1,274 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.airag.llm.document;
+
+import dev.langchain4j.data.document.BlankDocumentException;
+import dev.langchain4j.data.document.Document;
+import dev.langchain4j.internal.Utils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xslf.usermodel.XMLSlideShow;
+import org.apache.poi.xslf.usermodel.XSLFSlide;
+import org.apache.poi.xslf.usermodel.XSLFTextShape;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.tika.Tika;
+import org.apache.tika.exception.ZeroByteFileException;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.jeecg.common.util.AssertUtils;
+import org.xml.sax.ContentHandler;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * tika文档解析器,重写langchain4j的TikaDocumentParser <br/>
+ * jeecgboot目前不支持poi5.x,所以langchain4j同的方法不能用,自己实现
+ * @author chenrui
+ * @date 2025/3/5 16:19
+ */
+public class TikaDocumentParser {
+    private static final Tika tika = new Tika();
+    private static final int NO_WRITE_LIMIT = -1;
+    public static final Supplier<Parser> DEFAULT_PARSER_SUPPLIER = AutoDetectParser::new;
+    public static final Supplier<Metadata> DEFAULT_METADATA_SUPPLIER = Metadata::new;
+    public static final Supplier<ParseContext> DEFAULT_PARSE_CONTEXT_SUPPLIER = ParseContext::new;
+    public static final Supplier<ContentHandler> DEFAULT_CONTENT_HANDLER_SUPPLIER = () -> new BodyContentHandler(-1);
+    private final Supplier<Parser> parserSupplier;
+    private final Supplier<ContentHandler> contentHandlerSupplier;
+    private final Supplier<Metadata> metadataSupplier;
+    private final Supplier<ParseContext> parseContextSupplier;
+
+    public TikaDocumentParser() {
+        this((Supplier) ((Supplier) null), (Supplier) null, (Supplier) null, (Supplier) null);
+    }
+
+
+    public TikaDocumentParser(Supplier<Parser> parserSupplier, Supplier<ContentHandler> contentHandlerSupplier, Supplier<Metadata> metadataSupplier, Supplier<ParseContext> parseContextSupplier) {
+        this.parserSupplier = (Supplier) Utils.getOrDefault(parserSupplier, () -> DEFAULT_PARSER_SUPPLIER);
+        this.contentHandlerSupplier = (Supplier) Utils.getOrDefault(contentHandlerSupplier, () -> DEFAULT_CONTENT_HANDLER_SUPPLIER);
+        this.metadataSupplier = (Supplier) Utils.getOrDefault(metadataSupplier, () -> DEFAULT_METADATA_SUPPLIER);
+        this.parseContextSupplier = (Supplier) Utils.getOrDefault(parseContextSupplier, () -> DEFAULT_PARSE_CONTEXT_SUPPLIER);
+    }
+
+    public Document parse(File file) {
+        AssertUtils.assertNotEmpty("请选择文件", file);
+        try {
+            // 用于解析
+            InputStream isForParsing = Files.newInputStream(file.toPath());
+            // 使用 Tika 自动检测 MIME 类型
+            String fileName = file.getName().toLowerCase();
+            if (fileName.endsWith(".txt")
+                    || fileName.endsWith(".md")
+                    || fileName.endsWith(".pdf")) {
+                return extractByTika(isForParsing);
+            } else if (fileName.endsWith(".docx")) {
+                return extractTextFromDocx(isForParsing);
+            } else if (fileName.endsWith(".doc")) {
+                return extractTextFromDoc(isForParsing);
+            } else if (fileName.endsWith(".xlsx")) {
+                return extractTextFromExcel(isForParsing);
+            } else if (fileName.endsWith(".xls")) {
+                return extractTextFromExcel(isForParsing);
+            } else if (fileName.endsWith(".pptx")) {
+                return extractTextFromPptx(isForParsing);
+            } else if (fileName.endsWith(".ppt")) {
+                return extractTextFromPpt(isForParsing);
+            } else {
+                throw new IllegalArgumentException("不支持的文件格式: " + FilenameUtils.getExtension(fileName));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Document tryExtractDocOrDocx(InputStream inputStream) throws IOException {
+        try {
+            // 先尝试 DOCX（基于 OPC XML 格式）
+            return extractTextFromDocx(inputStream);
+        } catch (Exception e1) {
+            try {
+                // 如果 DOCX 解析失败，则尝试 DOC（基于二进制格式）
+                return extractTextFromDoc(inputStream);
+            } catch (Exception e2) {
+                throw new IOException("无法解析 DOC 或 DOCX 文件", e2);
+            }
+        }
+    }
+
+    /**
+     * 使用tika提取文件内容 <br/>
+     * pdf/text/md等文件使用tika提取
+     *
+     * @param inputStream
+     * @return
+     * @author chenrui
+     * @date 2025/3/5 14:41
+     */
+    private Document extractByTika(InputStream inputStream) {
+        try {
+            Parser parser = (Parser) this.parserSupplier.get();
+            ContentHandler contentHandler = (ContentHandler) this.contentHandlerSupplier.get();
+            Metadata metadata = (Metadata) this.metadataSupplier.get();
+            ParseContext parseContext = (ParseContext) this.parseContextSupplier.get();
+            parser.parse(inputStream, contentHandler, metadata, parseContext);
+            String text = contentHandler.toString();
+            if (Utils.isNullOrBlank(text)) {
+                throw new BlankDocumentException();
+            } else {
+                return Document.from(text);
+            }
+        } catch (BlankDocumentException e) {
+            throw e;
+        } catch (ZeroByteFileException var8) {
+            throw new BlankDocumentException();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 提取docx文件内容
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/3/5 14:42
+     * @deprecated 因为jeecg主项目目前不支持poi5.x, 自己实现提取功能.
+     */
+    @Deprecated
+    private static Document extractTextFromDocx(InputStream inputStream) throws IOException {
+        try (XWPFDocument document = new XWPFDocument(inputStream)) {
+            StringBuilder text = new StringBuilder();
+            for (XWPFParagraph para : document.getParagraphs()) {
+                text.append(para.getText()).append("\n");
+            }
+            return Document.from(text.toString());
+        }
+    }
+
+    /**
+     * 提取doc文件内容
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/3/5 14:42
+     * @deprecated 因为jeecg主项目目前不支持poi5.x, 自己实现提取功能.
+     */
+    @Deprecated
+    private static Document extractTextFromDoc(InputStream inputStream) throws IOException {
+        try (HWPFDocument document = new HWPFDocument(inputStream);
+             WordExtractor extractor = new WordExtractor(document)) {
+            return Document.from(extractor.getText());
+        }
+    }
+
+    /**
+     * 提取excel文件内容
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/3/5 14:43
+     * @deprecated 因为jeecg主项目目前不支持poi5.x, 自己实现提取功能.
+     */
+    @Deprecated
+    private static Document extractTextFromExcel(InputStream inputStream) throws IOException {
+        try (Workbook workbook = WorkbookFactory.create(inputStream)) {
+            StringBuilder text = new StringBuilder();
+            for (Sheet sheet : workbook) {
+                text.append("Sheet: ").append(sheet.getSheetName()).append("\n");
+                for (Row row : sheet) {
+                    for (Cell cell : row) {
+                        text.append(cell.toString()).append("\t");
+                    }
+                    text.append("\n");
+                }
+                text.append("\n");
+            }
+            return Document.from(text.toString());
+        }
+    }
+
+    /**
+     * 提取pptx文件内容
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/3/5 14:43
+     * @deprecated 因为jeecg主项目目前不支持poi5.x, 自己实现提取功能.
+     */
+    @Deprecated
+    private static Document extractTextFromPptx(InputStream inputStream) throws IOException {
+        try (XMLSlideShow ppt = new XMLSlideShow(inputStream)) {
+            StringBuilder text = new StringBuilder();
+            for (XSLFSlide slide : ppt.getSlides()) {
+                text.append("Slide ").append(slide.getSlideNumber()).append(":\n");
+                List<XSLFTextShape> shapes = slide.getShapes().stream()
+                        .filter(s -> s instanceof XSLFTextShape)
+                        .map(s -> (XSLFTextShape) s)
+                        .collect(Collectors.toList());
+                for (XSLFTextShape shape : shapes) {
+                    text.append(shape.getText()).append("\n");
+                }
+                text.append("\n");
+            }
+            return Document.from(text.toString());
+        }
+    }
+
+    /**
+     * 提取ppt文件内容
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2025/3/5 14:43
+     * @deprecated 因为jeecg主项目目前不支持poi5.x, 自己实现提取功能.
+     */
+    @Deprecated
+    private static Document extractTextFromPpt(InputStream inputStream) throws IOException {
+        try (org.apache.poi.hslf.usermodel.HSLFSlideShow ppt = new org.apache.poi.hslf.usermodel.HSLFSlideShow(inputStream)) {
+            StringBuilder text = new StringBuilder();
+            for (org.apache.poi.hslf.usermodel.HSLFSlide slide : ppt.getSlides()) {
+                text.append("Slide ").append(slide.getSlideNumber()).append(":\n");
+                for (List<HSLFTextParagraph> shapes : slide.getTextParagraphs()) {
+                    text.append(HSLFTextParagraph.getText(shapes)).append("\n");
+                }
+                text.append("\n");
+            }
+            return Document.from(text.toString());
+        }
+    }
+
+    private static byte[] toByteArray(InputStream inputStream) throws IOException {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        byte[] data = new byte[1024];
+        int nRead;
+        while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, nRead);
+        }
+        return buffer.toByteArray();
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledge.java

@@ -0,0 +1,105 @@
+package org.jeecg.modules.airag.llm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description: AIRag知识库
+ * @Author: jeecg-boot
+ * @Date: 2025-02-18
+ * @Version: V1.0
+ */
+@Schema(description="AIRag知识库")
+@Data
+@TableName("airag_knowledge")
+public class AiragKnowledge implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
+    private java.lang.String createBy;
+
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+
+    /**
+     * 租户id
+     */
+    @Excel(name = "租户id", width = 15)
+    @Schema(description = "租户id")
+    private java.lang.String tenantId;
+
+    /**
+     * 知识库名称
+     */
+    @Excel(name = "知识库名称", width = 15)
+    @Schema(description = "知识库名称")
+    private java.lang.String name;
+
+    /**
+     * 向量模型id
+     */
+    @Excel(name = "向量模型id", width = 15, dictTable = "airag_model where model_type = 'EMBED'", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "airag_model where model_type = 'EMBED'", dicText = "name", dicCode = "id")
+    @Schema(description = "向量模型id")
+    private java.lang.String embedId;
+
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    @Schema(description = "描述")
+    private java.lang.String descr;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
+    @Schema(description = "状态")
+    private java.lang.String status;
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledgeDoc.java

@@ -0,0 +1,124 @@
+package org.jeecg.modules.airag.llm.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Description: airag知识库文档
+ * @Author: jeecg-boot
+ * @Date: 2025-02-18
+ * @Version: V1.0
+ */
+@Schema(description="airag知识库文档")
+@Data
+@TableName("airag_knowledge_doc")
+public class AiragKnowledgeDoc implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
+    private String createBy;
+
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private String updateBy;
+
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private Date updateTime;
+
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private String sysOrgCode;
+
+    /**
+     * 租户id
+     */
+    @Excel(name = "租户id", width = 15)
+    @Schema(description = "租户id")
+    private String tenantId;
+
+    /**
+     * 知识库id
+     */
+    @Schema(description = "知识库id")
+    private String knowledgeId;
+
+    /**
+     * 标题
+     */
+    @Excel(name = "标题", width = 15)
+    @Schema(description = "标题")
+    private String title;
+
+    /**
+     * 类型
+     */
+    @Excel(name = "类型", width = 15, dicCode = "know_doc_type")
+    @Schema(description = "类型")
+    private String type;
+
+    /**
+     * 内容
+     */
+    @Excel(name = "内容", width = 15)
+    @Schema(description = "内容")
+    private String content;
+
+    /**
+     * 元数据,存储上传文件的存储目录以及网站站点 <br/>
+     * eg. {"filePath":"https://xxxxxx","website":"http://hellp.jeecg.com"}
+     */
+    @Excel(name = "元数据", width = 15)
+    @Schema(description = "元数据")
+    private String metadata;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
+    @Schema(description = "状态")
+    private String status;
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragModel.java

@@ -0,0 +1,124 @@
+package org.jeecg.modules.airag.llm.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: AiRag模型配置
+ * @Author: jeecg-boot
+ * @Date: 2025-02-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("airag_model")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="AiRag模型配置")
+public class AiragModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 租户id
+     */
+    @Excel(name = "租户id", width = 15)
+    @Schema(description = "租户id")
+    private String tenantId;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @Schema(description = "名称")
+    private String name;
+    /**
+     * 供应者
+     */
+    @Excel(name = "供应者", width = 15, dicCode = "model_provider")
+    @Dict(dicCode = "model_provider")
+    @Schema(description = "供应者")
+    private String provider;
+    /**
+     * 模型类型
+     */
+    @Excel(name = "模型类型", width = 15, dicCode = "model_type")
+    @Dict(dicCode = "model_type")
+    @Schema(description = "模型类型")
+    private String modelType;
+    /**
+     * 模型名称
+     */
+    @Excel(name = "模型名称", width = 15)
+    @Schema(description = "模型名称")
+    private String modelName;
+    /**
+     * API域名
+     */
+    @Excel(name = "API域名", width = 15)
+    @Schema(description = "API域名")
+    private String baseUrl;
+    /**
+     * 凭证信息
+     */
+    @Excel(name = "凭证信息", width = 15)
+    @Schema(description = "凭证信息")
+    private String credential;
+    /**
+     * 模型参数
+     */
+    @Excel(name = "模型参数", width = 15)
+    @Schema(description = "模型参数")
+    private String modelParams;
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java

@@ -0,0 +1,296 @@
+package org.jeecg.modules.airag.llm.handler;
+
+import com.alibaba.fastjson.JSONObject;
+import dev.langchain4j.data.message.*;
+import dev.langchain4j.rag.query.router.QueryRouter;
+import dev.langchain4j.service.TokenStream;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.ai.handler.LLMHandler;
+import org.jeecg.common.util.AssertUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.airag.common.handler.AIChatParams;
+import org.jeecg.modules.airag.common.handler.IAIChatHandler;
+import org.jeecg.modules.airag.llm.consts.LLMConsts;
+import org.jeecg.modules.airag.llm.entity.AiragModel;
+import org.jeecg.modules.airag.llm.mapper.AiragModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.regex.Matcher;
+
+/**
+ * 大模型聊天工具类
+ *
+ * @Author: chenrui
+ * @Date: 2025/2/18 14:31
+ */
+@Slf4j
+@Component
+public class AIChatHandler implements IAIChatHandler {
+
+    @Autowired
+    AiragModelMapper airagModelMapper;
+
+    @Autowired
+    EmbeddingHandler embeddingHandler;
+
+    @Autowired
+    LLMHandler llmHandler;
+
+
+    @Value(value = "${jeecg.path.upload:}")
+    private String uploadpath;
+
+    /**
+     * 问答
+     *
+     * @param modelId
+     * @param messages
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 21:03
+     */
+    @Override
+    public String completions(String modelId, List<ChatMessage> messages) {
+        AssertUtils.assertNotEmpty("至少发送一条消息", messages);
+        AssertUtils.assertNotEmpty("请选择模型", modelId);
+        // 整理消息
+        return completions(modelId, messages, null);
+    }
+
+    /**
+     * 问答
+     *
+     * @param modelId
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 21:03
+     */
+    @Override
+    public String completions(String modelId, List<ChatMessage> messages, AIChatParams params) {
+        AssertUtils.assertNotEmpty("至少发送一条消息", messages);
+        AssertUtils.assertNotEmpty("请选择模型", modelId);
+
+        AiragModel airagModel = airagModelMapper.getByIdIgnoreTenant(modelId);
+        return completions(airagModel, messages, params);
+    }
+
+    /**
+     * 问答
+     *
+     * @param airagModel
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/2/24 17:30
+     */
+    public String completions(AiragModel airagModel, List<ChatMessage> messages, AIChatParams params) {
+        params = mergeParams(airagModel, params);
+        String resp = llmHandler.completions(messages, params);
+        if (resp.contains("</think>")
+                && (null == params.getNoThinking() || params.getNoThinking())) {
+            String[] thinkSplit = resp.split("</think>");
+            resp = thinkSplit[thinkSplit.length - 1];
+        }
+        return resp;
+    }
+
+    /**
+     * 使用默认模型问答
+     *
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 15:13
+     */
+    @Override
+    public String completionsByDefaultModel(List<ChatMessage> messages, AIChatParams params) {
+        return completions(new AiragModel(), messages, params);
+    }
+
+    /**
+     * 聊天(流式)
+     *
+     * @param modelId
+     * @param messages
+     * @return
+     * @author chenrui
+     * @date 2025/2/20 21:06
+     */
+    @Override
+    public TokenStream chat(String modelId, List<ChatMessage> messages) {
+        return chat(modelId, messages, null);
+    }
+
+    /**
+     * 聊天(流式)
+     *
+     * @param modelId
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 21:03
+     */
+    @Override
+    public TokenStream chat(String modelId, List<ChatMessage> messages, AIChatParams params) {
+        AssertUtils.assertNotEmpty("至少发送一条消息", messages);
+        AssertUtils.assertNotEmpty("请选择模型", modelId);
+
+        AiragModel airagModel = airagModelMapper.getByIdIgnoreTenant(modelId);
+        return chat(airagModel, messages, params);
+    }
+
+    /**
+     * 聊天(流式)
+     *
+     * @param airagModel
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/2/24 17:29
+     */
+    private TokenStream chat(AiragModel airagModel, List<ChatMessage> messages, AIChatParams params) {
+        params = mergeParams(airagModel, params);
+        return llmHandler.chat(messages, params);
+    }
+
+    /**
+     * 使用默认模型聊天
+     *
+     * @param messages
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/3/12 15:13
+     */
+    @Override
+    public TokenStream chatByDefaultModel(List<ChatMessage> messages, AIChatParams params) {
+        return chat(new AiragModel(), messages, params);
+    }
+
+    /**
+     * 合并 airagmodel和params,params为准
+     *
+     * @param airagModel
+     * @param params
+     * @return
+     * @author chenrui
+     * @date 2025/3/11 17:45
+     */
+    private AIChatParams mergeParams(AiragModel airagModel, AIChatParams params) {
+        if (null == airagModel) {
+            return params;
+        }
+        if (params == null) {
+            params = new AIChatParams();
+        }
+
+        params.setProvider(airagModel.getProvider());
+        params.setModelName(airagModel.getModelName());
+        params.setBaseUrl(airagModel.getBaseUrl());
+        if (oConvertUtils.isObjectNotEmpty(airagModel.getCredential())) {
+            JSONObject modelCredential = JSONObject.parseObject(airagModel.getCredential());
+            params.setApiKey(oConvertUtils.getString(modelCredential.getString("apiKey"), null));
+            params.setSecretKey(oConvertUtils.getString(modelCredential.getString("secretKey"), null));
+        }
+        if (oConvertUtils.isObjectNotEmpty(airagModel.getModelParams())) {
+            JSONObject modelParams = JSONObject.parseObject(airagModel.getModelParams());
+            if (oConvertUtils.isObjectEmpty(params.getTemperature())) {
+                params.setTemperature(modelParams.getDouble("temperature"));
+            }
+            if (oConvertUtils.isObjectEmpty(params.getTopP())) {
+                params.setTopP(modelParams.getDouble("topP"));
+            }
+            if (oConvertUtils.isObjectEmpty(params.getPresencePenalty())) {
+                params.setPresencePenalty(modelParams.getDouble("presencePenalty"));
+            }
+            if (oConvertUtils.isObjectEmpty(params.getFrequencyPenalty())) {
+                params.setFrequencyPenalty(modelParams.getDouble("frequencyPenalty"));
+            }
+            if (oConvertUtils.isObjectEmpty(params.getMaxTokens())) {
+                params.setMaxTokens(modelParams.getInteger("maxTokens"));
+            }
+            if (oConvertUtils.isObjectEmpty(params.getTimeout())) {
+                params.setTimeout(modelParams.getInteger("timeout"));
+            }
+        }
+
+        // RAG
+        List<String> knowIds = params.getKnowIds();
+        if (oConvertUtils.isObjectNotEmpty(knowIds)) {
+            QueryRouter queryRouter = embeddingHandler.getQueryRouter(knowIds, params.getTopNumber(), params.getSimilarity());
+            params.setQueryRouter(queryRouter);
+        }
+
+        // 设置确保maxTokens值正确
+        if (oConvertUtils.isObjectNotEmpty(params.getMaxTokens()) && params.getMaxTokens() <= 0) {
+            params.setMaxTokens(null);
+        }
+
+        // 默认超时时间
+        if(oConvertUtils.isObjectEmpty(params.getTimeout())){
+            params.setTimeout(60);
+        }
+
+        return params;
+    }
+
+    @Override
+    public UserMessage buildUserMessage(String content, List<String> images) {
+        AssertUtils.assertNotEmpty("请输入消息内容", content);
+        List<Content> contents = new ArrayList<>();
+        contents.add(TextContent.from(content));
+        if (oConvertUtils.isObjectNotEmpty(images)) {
+            // 获取所有图片,将他们转换为ImageContent
+            List<ImageContent> imageContents = buildImageContents(images);
+            contents.addAll(imageContents);
+        }
+        return UserMessage.from(contents);
+    }
+
+    @Override
+    public List<ImageContent> buildImageContents(List<String> images) {
+        List<ImageContent> imageContents = new ArrayList<>();
+        for (String imageUrl : images) {
+            Matcher matcher = LLMConsts.WEB_PATTERN.matcher(imageUrl);
+            if (matcher.matches()) {
+                // 来源于网络
+                imageContents.add(ImageContent.from(imageUrl));
+            } else {
+                // 本地文件
+                String filePath = uploadpath + File.separator + imageUrl;
+                // 读取文件并转换为 base64 编码字符串
+                try {
+                    Path path = Paths.get(filePath);
+                    byte[] fileContent = Files.readAllBytes(path);
+                    String base64Data = Base64.getEncoder().encodeToString(fileContent);
+                    // 获取文件的 MIME 类型
+                    String mimeType = Files.probeContentType(path);
+                    // 构建 ImageContent 对象
+                    imageContents.add(ImageContent.from(base64Data, mimeType));
+                } catch (IOException e) {
+                    log.error("读取文件失败: " + filePath, e);
+                    throw new RuntimeException("发送消息失败,读取文件异常:" + e.getMessage(), e);
+                }
+            }
+        }
+        return imageContents;
+    }
+
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/CommandExecUtil.java

@@ -0,0 +1,139 @@
+package org.jeecg.modules.airag.llm.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ArrayUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 命令行执行工具类
+ * @Author: chenrui
+ * @Date: 2024/4/8 10:11
+ */
+@Slf4j
+public class CommandExecUtil {
+
+
+    /**
+     * 执行命令行
+     *
+     * @param command
+     * @param args
+     * @return
+     * @throws IOException
+     * @author chenrui
+     * @date 2024/4/9 10:59
+     */
+    public static String execCommand(String command, String[] args) throws IOException {
+        if (null == command || command.isEmpty()) {
+            throw new IllegalArgumentException("命令不能为空");
+        }
+        return execCommand(command.split(" "), args);
+    }
+
+    /**
+     * 执行命令行
+     *
+     * @param command 脚本目录
+     * @param args    参数
+     * @author chenrui
+     * @date 2024/4/09 10:30
+     */
+    public static String execCommand(String[] command, String[] args) throws IOException {
+
+        if (null == command || command.length == 0) {
+            throw new IllegalArgumentException("命令不能为空");
+        }
+
+        if (null != args && args.length > 0) {
+            command = (String[]) ArrayUtils.addAll(command, args);
+        }
+
+        // windows系统处理文件夹空格问题
+        if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+            List<String> commandNew = new ArrayList<>(command.length + 2);
+            commandNew.addAll(Arrays.asList("cmd.exe", "/c"));
+            for (String tempCommand : command) {
+                if (tempCommand.contains(" ")) {
+                    tempCommand = "\"" + tempCommand.replaceAll("\"", "'") + "\"";
+                }
+                commandNew.add(tempCommand);
+            }
+            command = commandNew.toArray(new String[0]);
+        }
+
+
+        Process process = null;
+        try {
+            log.debug(" =============================== Runtime command Script ===============================" );
+            log.debug(String.join(" ", command));
+            log.debug(" =============================== Runtime command Script =============================== " );
+            process = Runtime.getRuntime().exec(command);
+            try (ByteArrayOutputStream resultOutStream = new ByteArrayOutputStream();
+                 InputStream processInStream = new BufferedInputStream(process.getInputStream())) {
+                new Thread(new InputStreamRunnable(process.getErrorStream(), "ErrorStream")).start();
+                int num;
+                byte[] bs = new byte[1024];
+                while ((num = processInStream.read(bs)) != -1) {
+                    resultOutStream.write(bs, 0, num);
+                    String stepMsg = new String(bs);
+//                    log.debug("命令行日志:" + stepMsg);
+                    if (stepMsg.contains("input any key to continue...")) {
+                        process.destroy();
+                    }
+                }
+                String result = resultOutStream.toString();
+                log.debug("执行命令完成:" + result);
+                return result;
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            throw e;
+        } finally {
+            if (process != null) {
+                process.destroy();
+            }
+        }
+    }
+
+    /**
+     * exec 控制台输出获取线程类
+     * 使用单独的线程获取控制台输出,防止输入流阻塞
+     *
+     * @author chenrui
+     * @date 2024/4/09 10:30
+     */
+    static class InputStreamRunnable implements Runnable {
+        BufferedReader bReader = null;
+        String type = null;
+
+        public InputStreamRunnable(InputStream is, String _type) {
+            try {
+                bReader = new BufferedReader(new InputStreamReader(new BufferedInputStream(is), StandardCharsets.UTF_8));
+                type = _type;
+            } catch (Exception ex) {
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public void run() {
+            String line;
+            int lineNum = 0;
+
+            try {
+                while ((line = bReader.readLine()) != null) {
+                    lineNum++;
+                    // Thread.sleep(200);
+                }
+                bReader.close();
+            } catch (Exception ignored) {
+            }
+        }
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/EmbeddingHandler.java

@@ -0,0 +1,617 @@
+package org.jeecg.modules.airag.llm.handler;
+
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import dev.langchain4j.data.document.Document;
+import dev.langchain4j.data.document.DocumentSplitter;
+import dev.langchain4j.data.document.Metadata;
+import dev.langchain4j.data.document.splitter.DocumentSplitters;
+import dev.langchain4j.data.embedding.Embedding;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiTokenizer;
+import dev.langchain4j.rag.content.retriever.ContentRetriever;
+import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
+import dev.langchain4j.rag.query.router.DefaultQueryRouter;
+import dev.langchain4j.rag.query.router.QueryRouter;
+import dev.langchain4j.store.embedding.EmbeddingMatch;
+import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
+import dev.langchain4j.store.embedding.EmbeddingStore;
+import dev.langchain4j.store.embedding.EmbeddingStoreIngestor;
+import dev.langchain4j.store.embedding.pgvector.PgVectorEmbeddingStore;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.tika.parser.AutoDetectParser;
+import org.jeecg.ai.factory.AiModelFactory;
+import org.jeecg.ai.factory.AiModelOptions;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.*;
+import org.jeecg.modules.airag.common.handler.IEmbeddingHandler;
+import org.jeecg.modules.airag.common.vo.knowledge.KnowledgeSearchResult;
+import org.jeecg.modules.airag.llm.config.EmbedStoreConfigBean;
+import org.jeecg.modules.airag.llm.config.KnowConfigBean;
+import org.jeecg.modules.airag.llm.consts.LLMConsts;
+import org.jeecg.modules.airag.llm.document.TikaDocumentParser;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledge;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc;
+import org.jeecg.modules.airag.llm.entity.AiragModel;
+import org.jeecg.modules.airag.llm.mapper.AiragKnowledgeMapper;
+import org.jeecg.modules.airag.llm.mapper.AiragModelMapper;
+import org.jeecg.modules.airag.llm.service.IAiragKnowledgeService;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static dev.langchain4j.store.embedding.filter.MetadataFilterBuilder.metadataKey;
+import static org.jeecg.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_FILE;
+import static org.jeecg.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_WEB;
+
+/**
+ * 向量工具类
+ *
+ * @Author: chenrui
+ * @Date: 2025/2/18 14:31
+ */
+@Slf4j
+@Component
+public class EmbeddingHandler implements IEmbeddingHandler {
+
+    @Autowired
+    EmbedStoreConfigBean embedStoreConfigBean;
+
+    @Autowired
+    private AiragModelMapper airagModelMapper;
+
+    @Autowired
+    @Lazy
+    private IAiragKnowledgeService airagKnowledgeService;
+
+    @Autowired
+    private AiragKnowledgeMapper airagKnowledgeMapper;
+
+    @Value(value = "${jeecg.path.upload:}")
+    private String uploadpath;
+
+    @Autowired
+    KnowConfigBean knowConfigBean;
+
+    /**
+     * 默认分段长度
+     */
+    private static final int DEFAULT_SEGMENT_SIZE = 1000;
+
+    /**
+     * 默认分段重叠长度
+     */
+    private static final int DEFAULT_OVERLAP_SIZE = 50;
+
+    /**
+     * 向量存储元数据:knowledgeId
+     */
+    public static final String EMBED_STORE_METADATA_KNOWLEDGEID = "knowledgeId";
+
+    /**
+     * 向量存储元数据:docId
+     */
+    public static final String EMBED_STORE_METADATA_DOCID = "docId";
+
+    /**
+     * 向量存储元数据:docName
+     */
+    public static final String EMBED_STORE_METADATA_DOCNAME = "docName";
+
+    /**
+     * 向量存储缓存
+     */
+    private static final ConcurrentHashMap<String, EmbeddingStore<TextSegment>> EMBED_STORE_CACHE = new ConcurrentHashMap<>();
+
+
+    /**
+     * 正则匹配: md图片
+     * "!\\[(.*?)]\\((.*?)(\\s*=\\d+)?\\)"
+     */
+    private static final Pattern PATTERN_MD_IMAGE = Pattern.compile("!\\[(.*?)]\\((.*?)\\)");
+
+    /**
+     * 向量化文档
+     *
+     * @param knowId
+     * @param doc
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 11:52
+     */
+    public Map<String, Object> embeddingDocument(String knowId, AiragKnowledgeDoc doc) {
+        AiragKnowledge airagKnowledge = airagKnowledgeService.getById(knowId);
+        AssertUtils.assertNotEmpty("知识库不存在", airagKnowledge);
+        AssertUtils.assertNotEmpty("请先为知识库配置向量模型库", airagKnowledge.getEmbedId());
+        AssertUtils.assertNotEmpty("文档不能为空", doc);
+        // 读取文档
+        String content = doc.getContent();
+        // 向量化并存储
+        if (oConvertUtils.isEmpty(content)) {
+            switch (doc.getType()) {
+                case KNOWLEDGE_DOC_TYPE_FILE:
+                    //解析文件
+                    if (knowConfigBean.isEnableMinerU()) {
+                        parseFileByMinerU(doc);
+                    }
+                    content = parseFile(doc);
+                    break;
+                case KNOWLEDGE_DOC_TYPE_WEB:
+                    // TODO author: chenrui for:读取网站内容 date:2025/2/18
+                    break;
+            }
+        }
+        //update-begin---author:chenrui ---date:20250307  for：[QQYUN-11443]【AI】是不是应该把标题也生成到向量库里，标题一般是有意义的------------
+        if (oConvertUtils.isNotEmpty(doc.getTitle())) {
+            content = doc.getTitle() + "\n\n" + content;
+        }
+        //update-end---author:chenrui ---date:20250307  for：[QQYUN-11443]【AI】是不是应该把标题也生成到向量库里，标题一般是有意义的------------
+
+        // 向量化 date:2025/2/18
+        AiragModel model = getEmbedModelData(airagKnowledge.getEmbedId());
+        AiModelOptions modelOp = buildModelOptions(model);
+        EmbeddingModel embeddingModel = AiModelFactory.createEmbeddingModel(modelOp);
+        EmbeddingStore<TextSegment> embeddingStore = getEmbedStore(model);
+        // 删除旧数据
+        embeddingStore.removeAll(metadataKey(EMBED_STORE_METADATA_DOCID).isEqualTo(doc.getId()));
+        // 分段器
+        DocumentSplitter splitter = DocumentSplitters.recursive(DEFAULT_SEGMENT_SIZE, DEFAULT_OVERLAP_SIZE, new OpenAiTokenizer());
+        // 分段并存储
+        EmbeddingStoreIngestor ingestor = EmbeddingStoreIngestor.builder()
+                .documentSplitter(splitter)
+                .embeddingModel(embeddingModel)
+                .embeddingStore(embeddingStore)
+                .build();
+        Metadata metadata = Metadata.metadata(EMBED_STORE_METADATA_DOCID, doc.getId())
+                .put(EMBED_STORE_METADATA_KNOWLEDGEID, doc.getKnowledgeId())
+                .put(EMBED_STORE_METADATA_DOCNAME, FilenameUtils.getName(doc.getTitle()));
+        Document from = Document.from(content, metadata);
+        ingestor.ingest(from);
+        return metadata.toMap();
+    }
+
+    /**
+     * 向量查询(多知识库)
+     *
+     * @param knowIds
+     * @param queryText
+     * @param topNumber
+     * @param similarity
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 16:52
+     */
+    @Override
+    public KnowledgeSearchResult embeddingSearch(List<String> knowIds, String queryText, Integer topNumber, Double similarity) {
+        AssertUtils.assertNotEmpty("请选择知识库", knowIds);
+        AssertUtils.assertNotEmpty("请填写查询内容", queryText);
+
+        topNumber = oConvertUtils.getInteger(topNumber, 5);
+
+        //命中的文档列表
+        List<Map<String, Object>> documents = new ArrayList<>(16);
+        for (String knowId : knowIds) {
+            List<Map<String, Object>> searchResp = searchEmbedding(knowId, queryText, topNumber, similarity);
+            if (oConvertUtils.isObjectNotEmpty(searchResp)) {
+                documents.addAll(searchResp);
+            }
+        }
+
+        //命中的文档内容
+        StringBuilder data = new StringBuilder();
+        // 对documents按score降序排序并取前topNumber个
+        List<Map<String, Object>> sortedDocuments = documents.stream()
+                .sorted(Comparator.comparingDouble((Map<String, Object> doc) -> (Double) doc.get("score")).reversed())
+                .limit(topNumber)
+                .peek(doc -> data.append(doc.get("content")).append("\n"))
+                .collect(Collectors.toList());
+
+        return new KnowledgeSearchResult(data.toString(), sortedDocuments);
+    }
+
+    /**
+     * 向量查询
+     *
+     * @param knowId
+     * @param queryText
+     * @param topNumber
+     * @param similarity
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 16:52
+     */
+    public List<Map<String, Object>> searchEmbedding(String knowId, String queryText, Integer topNumber, Double similarity) {
+        AssertUtils.assertNotEmpty("请选择知识库", knowId);
+        AiragKnowledge knowledge = airagKnowledgeMapper.getByIdIgnoreTenant(knowId);
+        AssertUtils.assertNotEmpty("知识库不存在", knowledge);
+        AssertUtils.assertNotEmpty("请填写查询内容", queryText);
+        AiragModel model = getEmbedModelData(knowledge.getEmbedId());
+
+        AiModelOptions modelOp = buildModelOptions(model);
+        EmbeddingModel embeddingModel = AiModelFactory.createEmbeddingModel(modelOp);
+        Embedding queryEmbedding = embeddingModel.embed(queryText).content();
+
+        topNumber = oConvertUtils.getInteger(topNumber, modelOp.getTopNumber());
+        similarity = oConvertUtils.getDou(similarity, modelOp.getSimilarity());
+        EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest.builder()
+                .queryEmbedding(queryEmbedding)
+                .maxResults(topNumber)
+                .minScore(similarity)
+                .filter(metadataKey(EMBED_STORE_METADATA_KNOWLEDGEID).isEqualTo(knowId))
+                .build();
+
+        EmbeddingStore<TextSegment> embeddingStore = getEmbedStore(model);
+        List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.search(embeddingSearchRequest).matches();
+        List<Map<String, Object>> result = new ArrayList<>();
+        if (oConvertUtils.isObjectNotEmpty(relevant)) {
+            result = relevant.stream().map(matchRes -> {
+                Map<String, Object> data = new HashMap<>();
+                data.put("score", matchRes.score());
+                data.put("content", matchRes.embedded().text());
+                Metadata metadata = matchRes.embedded().metadata();
+                data.put("chunk", metadata.getInteger("index"));
+                data.put(EMBED_STORE_METADATA_DOCNAME, metadata.getString(EMBED_STORE_METADATA_DOCNAME));
+                return data;
+            }).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    /**
+     * 获取向量查询路由
+     *
+     * @param knowIds
+     * @param topNumber
+     * @param similarity
+     * @return
+     * @author chenrui
+     * @date 2025/2/20 21:03
+     */
+    @Override
+    public QueryRouter getQueryRouter(List<String> knowIds, Integer topNumber, Double similarity) {
+        AssertUtils.assertNotEmpty("请选择知识库", knowIds);
+        List<ContentRetriever> retrievers = Lists.newArrayList();
+        for (String knowId : knowIds) {
+            if (oConvertUtils.isEmpty(knowId)) {
+                continue;
+            }
+            AiragKnowledge knowledge = airagKnowledgeMapper.getByIdIgnoreTenant(knowId);
+            AssertUtils.assertNotEmpty("知识库不存在", knowledge);
+            AiragModel model = getEmbedModelData(knowledge.getEmbedId());
+            AiModelOptions modelOptions = buildModelOptions(model);
+            EmbeddingModel embeddingModel = AiModelFactory.createEmbeddingModel(modelOptions);
+
+            EmbeddingStore<TextSegment> embeddingStore = getEmbedStore(model);
+            topNumber = oConvertUtils.getInteger(topNumber, 5);
+            similarity = oConvertUtils.getDou(similarity, 0.75);
+            // 构建一个嵌入存储内容检索器，用于从嵌入存储中检索内容
+            EmbeddingStoreContentRetriever contentRetriever = EmbeddingStoreContentRetriever.builder()
+                    .embeddingStore(embeddingStore)
+                    .embeddingModel(embeddingModel)
+                    .maxResults(topNumber)
+                    .minScore(similarity)
+                    .filter(metadataKey(EMBED_STORE_METADATA_KNOWLEDGEID).isEqualTo(knowId))
+                    .build();
+            retrievers.add(contentRetriever);
+        }
+        if (retrievers.isEmpty()) {
+            return null;
+        } else {
+            return new DefaultQueryRouter(retrievers);
+        }
+    }
+
+    /**
+     * 删除向量化文档
+     *
+     * @param knowId
+     * @param modelId
+     * @author chenrui
+     * @date 2025/2/18 19:07
+     */
+    public void deleteEmbedDocsByKnowId(String knowId, String modelId) {
+        AssertUtils.assertNotEmpty("选择知识库", knowId);
+        AiragModel model = getEmbedModelData(modelId);
+
+        EmbeddingStore<TextSegment> embeddingStore = getEmbedStore(model);
+        // 删除数据
+        embeddingStore.removeAll(metadataKey(EMBED_STORE_METADATA_KNOWLEDGEID).isEqualTo(knowId));
+    }
+
+    /**
+     * 删除向量化文档
+     *
+     * @param docIds
+     * @param modelId
+     * @author chenrui
+     * @date 2025/2/18 19:07
+     */
+    public void deleteEmbedDocsByDocIds(List<String> docIds, String modelId) {
+        AssertUtils.assertNotEmpty("选择文档", docIds);
+        AiragModel model = getEmbedModelData(modelId);
+
+        EmbeddingStore<TextSegment> embeddingStore = getEmbedStore(model);
+        // 删除数据
+        embeddingStore.removeAll(metadataKey(EMBED_STORE_METADATA_DOCID).isIn(docIds));
+    }
+
+    /**
+     * 查询向量模型数据
+     *
+     * @param modelId
+     * @return
+     * @author chenrui
+     * @date 2025/2/20 20:08
+     */
+    private AiragModel getEmbedModelData(String modelId) {
+        AssertUtils.assertNotEmpty("向量模型不能为空", modelId);
+        AiragModel model = airagModelMapper.getByIdIgnoreTenant(modelId);
+        AssertUtils.assertNotEmpty("向量模型不存在", model);
+        AssertUtils.assertEquals("仅支持向量模型", LLMConsts.MODEL_TYPE_EMBED, model.getModelType());
+        return model;
+    }
+
+    /**
+     * 获取向量存储
+     *
+     * @param model
+     * @return
+     * @author chenrui
+     * @date 2025/2/18 14:56
+     */
+    private EmbeddingStore<TextSegment> getEmbedStore(AiragModel model) {
+        AssertUtils.assertNotEmpty("未配置模型", model);
+        String modelId = model.getId();
+        String connectionInfo = embedStoreConfigBean.getHost() + embedStoreConfigBean.getPort() + embedStoreConfigBean.getDatabase();
+        String key = modelId + connectionInfo;
+        if (EMBED_STORE_CACHE.containsKey(key)) {
+            return EMBED_STORE_CACHE.get(key);
+        }
+
+
+        AiModelOptions modelOp = buildModelOptions(model);
+        EmbeddingModel embeddingModel = AiModelFactory.createEmbeddingModel(modelOp);
+
+        String tableName = embedStoreConfigBean.getTable();
+
+        // update-begin---author:sunjianlei ---date:20250509  for：【QQYUN-12345】向量模型维度不一致问题
+        // 如果该模型不是默认的向量维度
+        int dimension = embeddingModel.dimension();
+        if (!LLMConsts.EMBED_MODEL_DEFAULT_DIMENSION.equals(dimension)) {
+            // 就加上维度后缀，防止因维度不一致导致保存失败
+            tableName += ("_" + dimension);
+        }
+        // update-end-----author:sunjianlei ---date:20250509  for：【QQYUN-12345】向量模型维度不一致问题
+
+        EmbeddingStore<TextSegment> embeddingStore = PgVectorEmbeddingStore.builder()
+                // Connection and table parameters
+                .host(embedStoreConfigBean.getHost())
+                .port(embedStoreConfigBean.getPort())
+                .database(embedStoreConfigBean.getDatabase())
+                .user(embedStoreConfigBean.getUser())
+                .password(embedStoreConfigBean.getPassword())
+                .table(tableName)
+                // Embedding dimension
+                // Required: Must match the embedding model’s output dimension
+                .dimension(embeddingModel.dimension())
+                // Indexing and performance options
+                // Enable IVFFlat index
+                .useIndex(true)
+                // Number of lists
+                // for IVFFlat index
+                .indexListSize(100)
+                // Table creation options
+                // Automatically create the table if it doesn’t exist
+                .createTable(true)
+                //Don’t drop the table first (set to true if you want a fresh start)
+                .dropTableFirst(false)
+                .build();
+        EMBED_STORE_CACHE.put(key, embeddingStore);
+        return embeddingStore;
+    }
+
+    /**
+     * 构造ModelOptions
+     *
+     * @param model
+     * @return
+     * @author chenrui
+     * @date 2025/3/11 17:45
+     */
+    public static AiModelOptions buildModelOptions(AiragModel model) {
+        AiModelOptions.AiModelOptionsBuilder modelOpBuilder = AiModelOptions.builder()
+                .provider(model.getProvider())
+                .modelName(model.getModelName())
+                .baseUrl(model.getBaseUrl());
+        if (oConvertUtils.isObjectNotEmpty(model.getCredential())) {
+            JSONObject modelCredential = JSONObject.parseObject(model.getCredential());
+            modelOpBuilder.apiKey(oConvertUtils.getString(modelCredential.getString("apiKey"), null));
+            modelOpBuilder.secretKey(oConvertUtils.getString(modelCredential.getString("secretKey"), null));
+        }
+        modelOpBuilder.topNumber(5);
+        modelOpBuilder.similarity(0.75);
+        return modelOpBuilder.build();
+    }
+
+    /**
+     * 解析文件
+     *
+     * @param doc
+     * @author chenrui
+     * @date 2025/3/5 11:31
+     */
+    private String parseFile(AiragKnowledgeDoc doc) {
+        String metadata = doc.getMetadata();
+        AssertUtils.assertNotEmpty("请先上传文件", metadata);
+        JSONObject metadataJson = JSONObject.parseObject(metadata);
+        if (!metadataJson.containsKey(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH)) {
+            throw new JeecgBootException("请先上传文件");
+        }
+        String filePath = metadataJson.getString(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH);
+        AssertUtils.assertNotEmpty("请先上传文件", filePath);
+        // 网络资源,先下载到临时目录
+        filePath = ensureFile(filePath);
+        // 提取文档内容
+        File docFile = new File(filePath);
+        if (docFile.exists()) {
+            Document document = new TikaDocumentParser(AutoDetectParser::new, null, null, null).parse(docFile);
+            if (null != document) {
+                String content = document.text();
+                // 判断是否md文档
+                String fileType = FilenameUtils.getExtension(docFile.getName());
+                if ("md".contains(fileType)) {
+                    // 如果是md文件，查找所有图片语法，如果是本地图片，替换成网络图片
+                    String baseUrl = "#{domainURL}/sys/common/static/";
+                    String sourcePath = metadataJson.getString(LLMConsts.KNOWLEDGE_DOC_METADATA_SOURCES_PATH);
+                    if(oConvertUtils.isNotEmpty(sourcePath)) {
+                        String escapedPath = uploadpath;
+                        //update-begin---author:wangshuai---date:2025-06-03---for:【QQYUN-12636】【AI知识库】文档库上传 本地local 文档中的图片不展示---
+                        /*if (File.separator.equals("\\")){
+                            escapedPath = uploadpath.replace("//", "\\\\");
+                        }*/
+                        //update-end---author:wangshuai---date:2025-06-03---for:【QQYUN-12636】【AI知识库】文档库上传 本地local 文档中的图片不展示---
+                        sourcePath = sourcePath.replaceFirst("^" + escapedPath, "").replace("\\", "/");
+                        String docFilePath = metadataJson.getString(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH);
+                        docFilePath = FilenameUtils.getPath(docFilePath);
+                        docFilePath = docFilePath.replace("\\", "/");
+                        StringBuffer sb = replaceImageUrl(content, baseUrl + sourcePath + "/", baseUrl + docFilePath);
+                        content = sb.toString();
+                    }
+                }
+                return content;
+            }
+        }
+        return null;
+    }
+
+    @NotNull
+    private static StringBuffer replaceImageUrl(String content, String abstractBaseUrl, String relativeBaseUrl) {
+        // 正则表达式匹配md文件中的图片语法 ![alt text](image url)
+        Matcher matcher = PATTERN_MD_IMAGE.matcher(content);
+
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            String imageUrl = matcher.group(2);
+            // 检查是否是本地图片路径
+            if (!imageUrl.startsWith("http")) {
+                // 替换成网络图片路径
+                String networkImageUrl = abstractBaseUrl + imageUrl;
+                if(imageUrl.startsWith("/")) {
+                    // 绝对路径
+                    networkImageUrl = abstractBaseUrl + imageUrl;
+                }else{
+                    // 相对路径
+                    networkImageUrl = relativeBaseUrl + imageUrl;
+                }
+                // 修改图片路径中//->/，但保留http://和https://
+                networkImageUrl = networkImageUrl.replaceAll("(?<!http:)(?<!https:)//", "/");
+                matcher.appendReplacement(sb, "![" + matcher.group(1) + "](" + networkImageUrl + ")");
+            } else {
+                matcher.appendReplacement(sb, "![" + matcher.group(1) + "](" + imageUrl + ")");
+            }
+        }
+        matcher.appendTail(sb);
+        return sb;
+    }
+
+    /**
+     * 通过MinerU解析文件
+     *
+     * @param doc
+     * @author chenrui
+     * @date 2025/4/1 17:37
+     */
+    private void parseFileByMinerU(AiragKnowledgeDoc doc) {
+        String metadata = doc.getMetadata();
+        AssertUtils.assertNotEmpty("请先上传文件", metadata);
+        JSONObject metadataJson = JSONObject.parseObject(metadata);
+        if (!metadataJson.containsKey(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH)) {
+            throw new JeecgBootException("请先上传文件");
+        }
+        String filePath = metadataJson.getString(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH);
+        AssertUtils.assertNotEmpty("请先上传文件", filePath);
+        filePath = ensureFile(filePath);
+
+        File docFile = new File(filePath);
+        String fileType = FilenameUtils.getExtension(filePath);
+        if (!docFile.exists()
+                || "txt".equalsIgnoreCase(fileType)
+                || "md".equalsIgnoreCase(fileType)) {
+            return ;
+        }
+
+        String command = "magic-pdf";
+        if (oConvertUtils.isNotEmpty(knowConfigBean.getCondaEnv())) {
+            command = "conda run -n " + knowConfigBean.getCondaEnv() + " " + command;
+        }
+
+        String outputPath = docFile.getParentFile().getAbsolutePath();
+        String[] args = {
+                "-p", docFile.getAbsolutePath(),
+                "-o", outputPath,
+        };
+
+        try {
+            String execLog = CommandExecUtil.execCommand(command, args);
+            log.info("执行命令行:" + command + " args:" + Arrays.toString(args) + "\n log::" + execLog);
+            // 如果成功,替换文件路径和静态资源路径
+            String fileBaseName = FilenameUtils.getBaseName(docFile.getName());
+            String newFileDir = outputPath + File.separator + fileBaseName + File.separator + "auto" + File.separator ;
+            // 先检查文件是否存在,存在才替换
+            File convertedFile = new File(newFileDir + fileBaseName + ".md");
+            if (convertedFile.exists()) {
+                log.info("文件转换成md成功,替换文件路径和静态资源路径");
+                newFileDir = newFileDir.replaceFirst("^" + uploadpath, "");
+                metadataJson.put(LLMConsts.KNOWLEDGE_DOC_METADATA_FILEPATH, newFileDir + fileBaseName + ".md");
+                metadataJson.put(LLMConsts.KNOWLEDGE_DOC_METADATA_SOURCES_PATH, newFileDir);
+                doc.setMetadata(metadataJson.toJSONString());
+            }
+        } catch (IOException e) {
+            log.error("文件转换md失败,使用传统提取方案{}", e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 确保文件存在
+     * @param filePath
+     * @return
+     * @author chenrui
+     * @date 2025/4/1 17:36
+     */
+    @NotNull
+    private String ensureFile(String filePath) {
+        // 网络资源,先下载到临时目录
+        Matcher matcher = LLMConsts.WEB_PATTERN.matcher(filePath);
+        if (matcher.matches()) {
+            log.info("网络资源,下载到临时目录:" + filePath);
+            // 准备文件
+            String tempFilePath = uploadpath + File.separator + "tmp" + File.separator + UUIDGenerator.generate() + File.separator;
+            String fileName = filePath;
+            if (fileName.contains("?")) {
+                fileName = fileName.substring(0, fileName.indexOf("?"));
+            }
+            fileName = FilenameUtils.getName(fileName);
+            tempFilePath = tempFilePath + fileName;
+            FileDownloadUtils.download2DiskFromNet(filePath, tempFilePath);
+            filePath = tempFilePath;
+        } else {
+            //本地文件
+            filePath = uploadpath + File.separator + filePath;
+        }
+        return filePath;
+    }
+
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.airag.llm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc;
+
+/**
+ * @Description: airag知识库文档
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface AiragKnowledgeDocMapper extends BaseMapper<AiragKnowledgeDoc> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeMapper.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.airag.llm.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.airag.llm.entity.AiragKnowledge;
+
+/**
+ * @Description: AIRag知识库
+ * @Author: jeecg-boot
+ * @Date:   2025-02-18
+ * @Version: V1.0
+ */
+public interface AiragKnowledgeMapper extends BaseMapper<AiragKnowledge> {
+
+    /**
+     * 根据ID查询知识库信息(忽略租户)
+     * for [QQYUN-12113]分享之后的聊天，应用、模型、知识库不根据租户查询
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/4/21 15:24
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    AiragKnowledge getByIdIgnoreTenant(String id);
+}

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragModelMapper.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.airag.llm.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.airag.llm.entity.AiragModel;
+
+/**
+ * @Description: AiRag模型配置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-14
+ * @Version: V1.0
+ */
+public interface AiragModelMapper extends BaseMapper<AiragModel> {
+
+    /**
+     * 根据ID查询模型信息(忽略租户)
+     * for [QQYUN-12113]分享之后的聊天，应用、模型、知识库不根据租户查询
+     * @param id
+     * @return
+     * @author chenrui
+     * @date 2025/4/21 15:24
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    AiragModel getByIdIgnoreTenant(String id);
+}