解决积木报表springboot3 找不到类base64utils #3834和SqlServer兼容问题

解决AI脚本节点执行报错问题
ai⼯作流使⽤知识库报错 "白名单校验未通过"
2025-12-08 17:12:28 +08:00 · 2025-06-05 15:51:05 +08:00 · 2025-05-28 11:07:33 +08:00 · 2025-05-27 17:56:46 +08:00 · 2025-05-26 19:14:02 +08:00 · 2025-05-22 11:12:27 +08:00
802 changed files with 8074 additions and 134736 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -9,8 +9,6 @@ assignees: getActivity

 ##### 版本号：

-##### 分支：
-

 ##### 问题描述：

--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -6,9 +6,8 @@ assignees: getActivity

 ---

-##### 版本号：

-##### 分支：
+##### 版本号：


 ##### 问题描述：
--- a/README-AI.md
+++ b/README-AI.md
@ -16,19 +16,6 @@ JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发
 [![](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

@ -57,10 +44,10 @@ JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发



-### 技术文档
+### 安装向量库 pgvector
+
+- https://help.jeecg.com/aigc/config

- [AIGC开发文档](https://help.jeecg.com/aigc)
- [安装向量库 pgvector](https://help.jeecg.com/aigc/config)



@ -86,7 +73,7 @@ JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发
 ## 技术交流

 - 开发文档：https://help.jeecg.com/aigc 
- QQ群：964611995、716488839(满)
+- QQ群：716488839


 ## 功能列表
--- a/README-EN.md
+++ b/README-EN.md
@ -7,12 +7,12 @@
 JEECG BOOT AI Low Code Platform
 ===============

-Current version: 3.8.3 (Release date: 2025-10-09)
+Current version: 3.8.0 (Release date: 2025-04-18)


 [![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.8.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.8.0-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)

@ -69,13 +69,9 @@ Jeecg-Boot AI low code platform can be applied in the development of any J2EE pr
 Starts the project
 -----------------------------------

-> Default account password： admin/123456
+- [IDEA Quick start](https://help.jeecg.com/java/setup/idea/startup)
+- [Docker Quick start](https://help.jeecg.com/java/docker/quick)

- [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
@ -85,7 +81,7 @@ Technical documentation
 - 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)
 - 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 ： 964611995、⑩716488839(满)、⑨808791225(满)
+- QQ group ： ⑩716488839、⑨808791225



--- a/README-Enterprise.md
+++ b/README-Enterprise.md
@ -1,124 +0,0 @@
-
-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)
--- a/README.md
+++ b/README.md
@ -2,14 +2,12 @@
 JeecgBoot AI低代码平台
 ===============

-当前最新版本： 3.8.3（发布日期：2025-10-09） 
+当前最新版本： 3.8.0（发布日期：2025-04-18） 

-> 重要提醒: v3.8.3 是 SpringBoot2 的最终版本，后续将不再维护。建议大家尽快升级至基于 SpringBoot3版本，以获得更好的性能和支持。

 [![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)](https://jeecg.com)
-[![](https://img.shields.io/badge/blog-技术博客-orange.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.8.3-brightgreen.svg)](https://github.com/jeecgboot/JeecgBoot)
+[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://guojusoft.com)
+[![](https://img.shields.io/badge/version-3.8.0-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)

@ -18,173 +16,177 @@ JeecgBoot AI低代码平台
 项目介绍
 -----------------------------------

-<h3 align="center">企业级AI低代码平台</h3>
+<h3 align="center">Java AI Low Code Platform</h3>

-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大模型
+JeecgBoot是一款基于AIGC和低代码引擎的AI低代码平台，旨在帮助开发者快速实现低代码开发和构建、部署个性化的 AI 应用。
+前后端分离架构Ant Design&Vue3，SpringBoot，SpringCloud Alibaba，Mybatis-plus，Shiro，强大的代码生成器让前后端代码一键生成，无需写任何代码！
+成套AI大模型功能: AI模型管理、AI应用、知识库、AI流程编排、AI对话助手等；
+引领AI低代码开发模式: AIGC生成->OnlineCoding-> 代码生成-> 手工MERGE， 帮助Java项目解决80%的重复工作，让开发更多关注业务，快速提高效率 节省成本，同时又不失灵活性！


-`AI赋能低代码:` 提供一套成熟AI应用平台功能：包含AI应用管理、AI模型管理、AI对话助手、AI知识库问答、AI流程编排、AI流程设计器，AI建表等功能; 支持各种AI大模型ChatGPT、DeepSeek、Ollama、智普、千问等.
+JeecgBoot 提供了一系列 `低代码能力`，实现`真正的零代码`在线开发：Online表单开发、Online报表、复杂报表设计、打印设计、在线图表设计、仪表盘设计、大屏设计、移动图表能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）

-`JEECG宗旨是:` 简单功能由OnlineCoding零代码搭建，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`，解决了当前低代码产品普遍不灵活的弊端！
+`AI赋能低代码:` 目前提供了AI应用、AI模型管理、AI流程编排、AI对话助手，AI建表、AI写文章、AI知识库问答、AI字段建议等功能;支持各种AI大模型ChatGPT、DeepSeek、Ollama、智普、千问等.
+
+`JEECG宗旨是:` 简单功能由OnlineCoding配置实现，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`；实现了低代码开发的同时又支持灵活编码，解决了当前低代码产品普遍不灵活的弊端！

 `JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。



+### 视频介绍
+
+[![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/flow_video.png)](https://www.bilibili.com/video/BV1Nk4y1o7Qc)


 适用项目
 -----------------------------------
-JeecgBoot低代码平台，可以应用在任何J2EE项目的开发中，支持信创国产化。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）、AI知识库等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
+JeecgBoot AI低代码平台，可以应用在任何J2EE项目的开发中，支持信创国产化。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
 又是一个全栈式 AI 开发平台，快速帮助企业构建和部署个性化的 AI 应用。

-**信创兼容说明**
+
+信创国产化
+-----------------------------------
+JeecgBoot 是一个开源低代码开发平台，支持全信创环境。它兼容多种国产操作系统和数据库，包括：
+
 - 操作系统：国产麒麟、银河麒麟等国产系统几乎都是基于 Linux 内核，因此它们具有良好的兼容性。
- 数据库：达梦、人大金仓、TiDB
+- 数据库：达梦、人大金仓、TiDB , [转库文档](https://my.oschina.net/jeecg/blog/4905722)
 - 中间件：东方通 TongWeb、TongRDS，宝兰德 AppServer、CacheDB, [信创配置文档](https://help.jeecg.com/java/tongweb-deploy/)

+通过这些适配，JeecgBoot 为使用国产软件和硬件的用户提供了高效的开发解决方案。

-版本说明
+
+
+项目说明
 -----------------------------------

-|下载                                 | 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（SpringBoot微服务架构）        |
+| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite6+ts最新技术栈）  |
+| `JeecgUniapp` | [配套APP框架](https://github.com/jeecgboot/JeecgUniapp) 适配多个终端，支持APP、小程序、H5 |


- `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，制作一个精简版本
-
-
-
-
-
-启动项目
-----------------------------------
-
-> 默认账号密码： 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)
-

 技术文档
 -----------------------------------

 - 官方网站：  [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)
- AI编程：  [JEECG低代码+AI编程Cursor+GitHub Copilot实现高效编程](https://www.bilibili.com/video/BV11XyaBVEoH)
- 技术支持：  [反馈问题](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md)    | [低代码体验一分钟](https://jeecg.blog.csdn.net/article/details/106079007) 
- QQ交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
+- 在线演示 ：  [平台演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex) | [体验低代码](https://jeecg.blog.csdn.net/article/details/106079007) | [体验零代码](https://app.qiaoqiaoyun.com/myapps/index)
+- 开发文档：  [文档中心](https://help.jeecg.com) | [AIGC大模块](https://help.jeecg.com/aigc)
+- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [入门视频](http://jeecg.com/doc/video) | [如何反馈问题](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md)
+- QQ交流群 ： ⑩716488839、⑨808791225(满)、其他(满)


-AI 应用平台介绍
+
+启动项目
 -----------------------------------

-一个全栈式 AI 开发平台，旨在帮助开发者快速构建和部署个性化的 AI 应用。
+- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup)
+- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick)

-JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
-其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。 

- [详细专题介绍，请点击查看](README-AI.md)

- AI视频介绍
+AIGC应用平台介绍
+-----------------------------------
+
+JeecgBoot 平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
+其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。
+
+> JDK说明：AI流程编排引擎暂时不支持jdk21，所以目前只能使用jdk8或者jdk17启动项目。
+
+- [AIGC专题介绍页](README-AI.md)
+- [AIGC开发文档](https://help.jeecg.com/aigc)
+- [配置向量库PGVector](https://help.jeecg.com/aigc/config)
+
+
+##### AI视频介绍

 [![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecg_aivideo.png)](https://www.bilibili.com/video/BV1zmd7YFE4w)


-为什么选择JeecgBoot?
-----------------------------------
- 1.采用最新主流前后分离框架（Spring Boot3 + MyBatis + Shiro//SpringAuthorizationServer + 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.提供丰富的示例代码，涵盖了常用的业务场景，便于学习和参考。
+##### 在线体验
+
+- JeecgBoot演示：  https://boot3.jeecg.com
+- 敲敲云在线搭建AI知识库：https://app.qiaoqiaoyun.com
+
+##### Dify `VS` JEECG AI
+
+> JEECG AI与Dify相比，在多个方面展现出显著的优势，特别是在文档处理、格式和图片保持方面。以下是一些具体的优点：
+> - Markdown文档库导入：
+> JEECG AI允许用户直接导入整个Markdown文档库，这不仅保留markdown格式，还支持图片的导入，确保文档内容的完整性和可视化效果。
+> - 对话回复格式美观：
+> 在对话过程中，JEECG AI能够保持回复内容的原格式，也不丢失图片，使得输出的文章更加美观，不会出现格式错乱的情况，还支持图片的渲染。
+> - PDF文档导入与格式转换：
+> JEECG AI在处理PDF文档时，能够更好地保持原始格式和图片，确保转换后的内容与原始文档一致。这个功能在许多AI产品中表现不佳，而JEECG AI在这方面做出了显著的优化
+
+##### 功能大模块
+
+- AI应用开发平台
+- AI知识库系统
+- AI大模型管理
+- AI流程编排
+- AI对话支持图片
+- AI对话助手(智能问答)
+- AI建表（Online表单）
+- AI写文章（CMS）
+- AI表单字段建议（表单设计器）
+
+##### AI大模型支持
+
+| AI大模型   |  支持   |
+| --- | --- |
+| DeepSeek   |  √   |
+| ChatGTP   |  √   |
+| Qwq 		  | √ |
+| 智库 		  | √ |
+| Ollama本地模型   |  √   |
+| 等等。。 | √ |
+



 技术架构：
 -----------------------------------

-#### 前端
-
- 前端环境要求：Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上
-
-> Vite 不再支持已结束生命周期（EOL）的 Node.js 18。现在需要使用 Node.js 20.19+ 或 22.12+。
-
- 依赖管理：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 默认jdk17(支持jdk8、jdk21)
 - 依赖管理：Maven
- 基础框架：Spring Boot 3.5.5/2.7.18
+- 基础框架：Spring Boot 2.7.18
 - 微服务框架： Spring Cloud Alibaba 2021.0.6.2
 - 持久层框架：MybatisPlus 3.5.3.2
- 报表工具： JimuReport 2.1.3
- 安全框架：Apache Shiro/SpringAuthorizationServer，Jwt 4.5.0
+- 报表工具： JimuReport 1.9.5
+- 安全框架：Apache Shiro 1.13.0，Jwt 4.5.0
 - 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
 - 数据库连接池：阿里巴巴Druid 1.1.24
 - AI大模型：支持 `ChatGPT` `DeepSeek`切换
 - 日志打印：logback
 - 缓存：Redis
 - 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
- 默认提供MySQL5.7+数据库脚本
+- 默认数据库脚本：MySQL5.7+
+- [其他数据库，需要自己转](https://my.oschina.net/jeecg/blog/4905722)

-#### 数据库支持
+
+#### 前端
+
+- 前端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)自己转。

@ -199,12 +201,12 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 |   人大金仓   |  √   |
 |   TiDB     |  √   |
 |   kingbase8   |  √   |
-
-
+  

 
 ## 微服务解决方案

+
 - 1、服务注册和发现 Nacos √
 - 2、统一配置中心 Nacos  √
 - 3、路由网关 gateway(三种加载方式) √
@ -222,23 +224,62 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 - 15、CAS 单点登录   √
 - 16、路由限流   √

+
+#### 微服务方式启动
+
+- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
+- [Docker一键启动微服务前后端](https://help.jeecg.com/java/docker/quickcloud)
+
+
 #### 微服务架构图
 ![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "在这里输入图片标题")



-
-
-开源版与企业版区别?
+为什么选择JeecgBoot?
 -----------------------------------
-
- - JeecgBoot开源版采用 [Apache-2.0 license](LICENSE) 协议附加补充条款：允许商用使用，不会造成侵权行为，允许基于本平台软件开展业务系统开发（但在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件).
- - 商业版与开源版主要区别在于商业版提供了技术支持 和 更多的企业级功能(例如：Online图表、流程监控、流程设计、流程审批、表单设计器、表单视图、积木报表企业版、OA办公、商业APP、零代码应用、Online模块源码等功能). [更多商业功能介绍，点击查看](README-Enterprise.md)
- - JeecgBoot未来发展方向是：零代码平台的建设，也就是团队的另外一款产品 [敲敲云零代码](https://www.qiaoqiaoyun.com) ，无需编码即可通过拖拽快速搭建企业级应用，与JeecgBoot低代码平台形成互补，满足从简单业务到复杂系统的全场景开发需求，目前已经开源，[欢迎下载](https://qiaoqiaoyun.com/downloadCode)
-
-
-
-
+* 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.提供仪表盘设计器，类大屏设计支持移动端，免费的数据可视化设计工具，支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表和门户设计；目前支持多种图表类型：柱形图、折线图、散点图、饼图、环形图、面积图、漏斗图、进度图、仪表盘、雷达图、地图等等；


 ### Jeecg Boot 产品功能蓝图
@ -246,19 +287,47 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类



-####  系统功能架构图

-![](https://oscimg.oschina.net/oscnet/up-1569487b95a07dbc3599fb1349a2e3aaae1.png)
+### 分支说明

+> 主干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
+ 
+ 

-### 开源版功能清单
+### 功能模块
 ```
+├─AI开发
+│  ├─支持AI大模型ChatGPT和DeepSeek
+│  ├─AI对话助手
+│  ├─AI建表
+│  ├─AI写文章
+│  ├─AI流程编排
+│  ├─AI知识库问答系统
+│  ├─AI应用开发平台
+│  ├─AI聊天窗口支持嵌入第三方
+├─Online在线开发(低代码)
+│  ├─Online在线表单
+│  ├─Online代码生成器
+│  ├─Online在线报表
+│  ├─仪表盘设计器
+│  ├─系统编码规则
+│  ├─系统校验规则
+├─积木报表设计器
+│  ├─打印设计器
+│  ├─数据报表设计
+│  ├─图形报表设计（支持echart）
 ├─系统管理
 │  ├─用户管理
 │  ├─角色管理
 │  ├─菜单管理
-│  ├─首页配置
 │  ├─权限设置（支持按钮权限、数据权限）
 │  ├─表单权限（控制字段禁用、隐藏）
 │  ├─部门管理
@ -269,36 +338,7 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 │  └─职务管理
 │  └─通讯录
 │  ├─多数据源管理
-│  ├─白名单管理
-│  ├─第三方配置（对接钉钉和企业微信）
-│  └─多租户管理（租户管理、租户角色、我的租户、租户默认套餐管理）
-├─Online在线开发(低代码)
-│  ├─Online在线表单
-│  ├─Online代码生成器
-│  ├─Online在线报表
-│  ├─仪表盘设计器
-│  ├─系统编码规则
-│  ├─系统校验规则
-│  ├─APP版本管理
-├─AI应用平台
-│  ├─AI知识库问答系统
-│  ├─AI大模型管理
-│  ├─AI流程编排
-│  ├─AI流程设计器
-│  ├─AI对话支持图片
-│  ├─AI对话助手(智能问答)
-│  ├─AI建表（Online表单）
-│  ├─AI聊天窗口支持嵌入第三方
-│  ├─AI聊天窗口支持移动端
-│  ├─支持常见大模型ChatGPT和DeepSeek、ollama等等
-│  ├─AI OCR示例
-├─数据可视化
-│  ├─报表设计器(支持打印设计）
-│  ├─大屏设和仪表盘设计
-├─OpenAPI（基于AK和SK认证鉴权）
-│  ├─接口管理
-│  ├─接口授权
-│  ├─接口文档
+│  └─多租户管理（租户管理、租户角色、我的租户）
 ├─消息中心
 │  ├─消息管理
 │  ├─模板管理
@ -310,12 +350,8 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 │  ├─高级查询器（弹窗自动组合查询条件）
 │  ├─Excel导入导出工具集成（支持单表，一对多 导入导出）
 │  ├─平台移动自适应支持
-│  ├─提供新版uniapp3的代码生成器模板
 ├─系统监控
 │  ├─Gateway路由网关
-│  ├─基于AK和SK认证鉴权OpenAPI功能
-│  ├─定时任务
-│  ├─数据源管理
 │  ├─性能扫描监控
 │  │  ├─监控 Redis
 │  │  ├─Tomcat
@ -323,11 +359,13 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 │  │  ├─服务器信息
 │  │  ├─请求追踪
 │  │  ├─磁盘监控
+│  ├─定时任务
 │  ├─系统日志
 │  ├─消息中心（支持短信、邮件、微信推送等等）
 │  ├─数据日志（记录数据快照，可对比快照，查看数据变更情况）
+│  ├─系统通知
 │  ├─SQL监控
-│  ├─在线用户
+│  ├─swagger-ui(在线接口文档)
 │─报表示例
 │  ├─曲线图
 │  └─饼状图
@ -392,16 +430,46 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 │  ├─提供单点登录CAS集成方案
 │  ├─提供APP发布方案
 │  ├─集成Websocket消息通知机制
-│  ├─支持electron桌面应用打包(支持windows、linux、macOS三大平台)
-│  ├─docker容器支持
-│  ├─提供移动APP框架及源码（Uniapp3版本）支持H5、小程序、APP、鸿蒙Next
-│  ├─提供移动APP低代码设计(Online表单、仪表盘)
+│─更多商业功能
+│  ├─流程设计器
+│  ├─表单设计器
+│  ├─大屏设计器
+│  └─我的任务
+│  └─历史流程
+│  └─历史流程
+│  └─流程实例管理
+│  └─流程监听管理
+│  └─流程表达式
+│  └─我发起的流程
+│  └─我的抄送
+│  └─流程委派、抄送、跳转
+│  └─OA办公组件
+│  └─。。。
+   
 ```



 ### 系统效果

+
+##### 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)

@ -421,22 +489,6 @@ JeecgBoot平台提供了一套完善的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)
-

 #####  仪表盘设计器

@ -503,6 +555,28 @@ 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)
+



@ -513,4 +587,4 @@ AI写文章

 如果觉得还不错，请作者喝杯咖啡吧 ☺

-![](https://static.oschina.net/uploads/img/201903/08155608_0EFX.png)
+![](https://static.oschina.net/uploads/img/201903/08155608_0EFX.png)
--- a/check_jeecgenv.py
+++ b/check_jeecgenv.py
@ -1,216 +0,0 @@
-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按回车键退出...")  # 等待用户输入
--- a/docker-compose-cloud.yml
+++ b/docker-compose-cloud.yml
@ -18,33 +18,20 @@ services:
      --max_allowed_packet=128M
      --default-authentication-plugin=caching_sha2_password
    ports:
-      - 13306:3306
+      - 3306: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:
@ -109,37 +96,31 @@ services:
 #    environment:
 #      RABBITMQ_DEFAULT_USER: guest
 #      RABBITMQ_DEFAULT_PASS: guest
+#  jeecg-boot-sentinel:
+#    restart: on-failure
+#    build:
+#      context: ./jeecg-visual/jeecg-cloud-sentinel
+#    ports:
+#      - 9000:9000
+#    depends_on:
+#      - jeecg-boot-nacos
+#      - jeecg-boot-demo
+#      - jeecg-boot-system
+#      - jeecg-boot-gateway
+#    container_name: jeecg-boot-sentinel
+#    hostname: jeecg-boot-sentinel
+#
+#  jeecg-boot-xxljob:
+#    build:
+#      context: ./jeecg-visual/jeecg-cloud-xxljob
+#    ports:
+#      - 9080:9080
+#    container_name: jeecg-boot-xxljob
+#    hostname: jeecg-boot-xxljob

-  jeecg-boot-sentinel:
-     restart: on-failure
-     build:
-       context: ./jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel
-     ports:
-       - 9000:9000
-     depends_on:
-       - jeecg-boot-nacos
-       - jeecg-boot-demo
-       - jeecg-boot-system
-       - jeecg-boot-gateway
-     container_name: jeecg-boot-sentinel
-     hostname: jeecg-boot-sentinel
-     networks:
-       - jeecg-boot
-  
-  jeecg-boot-xxljob:
-     build:
-       context: ./jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob
-     ports:
-       - 9080:9080
-     container_name: jeecg-boot-xxljob
-     hostname: jeecg-boot-xxljob
-     networks:
-       - jeecg-boot
-  
  jeecg-vue:
    build:
      context: ./jeecgboot-vue3
-      dockerfile: Dockerfile.cloud
    container_name: jeecgboot-vue3-nginx
    image: jeecgboot-vue3
    depends_on:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -18,33 +18,20 @@ services:
      --max_allowed_packet=128M
      --default-authentication-plugin=caching_sha2_password
    ports:
-      - 13306:3306
+      - 3306:3306
    networks:
      - jeecg-boot

  jeecg-boot-redis:
    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
-    # ports:
-    #   - 3792: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-system:
    build:
      context: ./jeecg-boot/jeecg-module-system/jeecg-system-start
--- a/jeecg-boot/README.md
+++ b/jeecg-boot/README.md
@ -2,12 +2,12 @@
 JeecgBoot 低代码开发平台
 ===============

-当前最新版本： 3.8.3（发布日期：2025-09-22） 
+当前最新版本： 3.8.0（发布日期：2025-05-16） 


 [![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.8.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.8.0-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交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
+- QQ交流群 ： ⑩716488839、⑨808791225、其他(满)
 - 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
 > 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 

--- a/jeecg-boot/db/jeecgboot-mysql-5.7.sql
+++ b/jeecg-boot/db/jeecgboot-mysql-5.7.sql
--- a/jeecg-boot/db/tables_nacos.sql
+++ b/jeecg-boot/db/tables_nacos.sql
--- a/jeecg-boot/db/tables_xxl_job.sql
+++ b/jeecg-boot/db/tables_xxl_job.sql
@ -1,5 +1,5 @@
 #
-# XXL-JOB v2.4.0
+# XXL-JOB v2.2.0
 # Copyright (c) 2015-present, xuxueli.

 CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_general_ci;
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.dmp
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.dmp
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.sql
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-postgresql17.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-postgresql17.sql
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-sqlserver2017.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-sqlserver2017.sql
--- a/jeecg-boot/db/其他数据库脚本/oracle11g
+++ b/jeecg-boot/db/其他数据库脚本/oracle11g
@ -1,5 +0,0 @@
-oracle导出编码：  export NLS_LANG=AMERICAN_AMERICA.ZHS16GBK
-
-导出用户：  jeecgbootos
-
-导入命令：  imp scott/tiger@orcl file=jeecgboot-oracle11g.dmp
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.1_2__openapi.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.1_2__openapi.sql
@ -22,22 +22,22 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `open_api`;
 CREATE TABLE `open_api`  (
-                             `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-                             `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口名称',
-                             `request_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '请求方法',
-                             `request_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口地址',
-                             `black_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'IP 黑名单',
-                             `body` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '请求体内容',
-                             `origin_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '原始地址',
-                             `status` int(10) NULL DEFAULT NULL COMMENT '状态',
-                             `del_flag` int(10) NULL DEFAULT NULL COMMENT '删除标识',
-                             `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
-                             `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                             `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '修改人',
-                             `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                             `headers_json` json NULL COMMENT '请求头json',
-                             `params_json` json NULL COMMENT '请求参数json',
-                             PRIMARY KEY (`id`) USING BTREE
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口名称',
+  `request_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '请求方法',
+  `request_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口地址',
+  `black_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'IP 黑名单',
+  `body` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '请求体内容',
+  `origin_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '原始地址',
+  `status` int(10) NULL DEFAULT NULL COMMENT '状态',
+  `del_flag` int(10) NULL DEFAULT NULL COMMENT '删除标识',
+  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `headers_json` json NULL COMMENT '请求头json',
+  `params_json` json NULL COMMENT '请求参数json',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '接口表' ROW_FORMAT = DYNAMIC;

 -- ----------------------------
@ -50,16 +50,16 @@ INSERT INTO `open_api` VALUES ('1922132683346649090', '根据部门查询用户'
 -- ----------------------------
 DROP TABLE IF EXISTS `open_api_auth`;
 CREATE TABLE `open_api_auth`  (
-                                  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-                                  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '授权名称',
-                                  `ak` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'AK',
-                                  `sk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'SK',
-                                  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
-                                  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '修改人',
-                                  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-                                  `system_user_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联系统用户名',
-                                  PRIMARY KEY (`id`) USING BTREE
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '授权名称',
+  `ak` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'AK',
+  `sk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'SK',
+  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `system_user_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联系统用户名',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '权限表' ROW_FORMAT = DYNAMIC;

 -- ----------------------------
@ -72,13 +72,13 @@ INSERT INTO `open_api_auth` VALUES ('1922164194775056386', 'scott', 'ak-pFjyNHWR
 -- ----------------------------
 DROP TABLE IF EXISTS `open_api_log`;
 CREATE TABLE `open_api_log`  (
-                                 `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-                                 `api_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口ID',
-                                 `call_auth_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '调用ID',
-                                 `call_time` datetime NULL DEFAULT NULL COMMENT '调用时间',
-                                 `used_time` bigint(20) NULL DEFAULT NULL COMMENT '耗时',
-                                 `response_time` datetime NULL DEFAULT NULL COMMENT '响应时间',
-                                 PRIMARY KEY (`id`) USING BTREE
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `api_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口ID',
+  `call_auth_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '调用ID',
+  `call_time` datetime NULL DEFAULT NULL COMMENT '调用时间',
+  `used_time` bigint(20) NULL DEFAULT NULL COMMENT '耗时',
+  `response_time` datetime NULL DEFAULT NULL COMMENT '响应时间',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '调用记录表' ROW_FORMAT = DYNAMIC;

 -- ----------------------------
@ -117,14 +117,14 @@ INSERT INTO `open_api_log` VALUES ('1922836856287428610', '1922132683346649090',
 -- ----------------------------
 DROP TABLE IF EXISTS `open_api_permission`;
 CREATE TABLE `open_api_permission`  (
-                                        `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-                                        `api_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口ID',
-                                        `api_auth_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '认证ID',
-                                        `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
-                                        `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                        `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人',
-                                        `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                        PRIMARY KEY (`id`) USING BTREE
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `api_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '接口ID',
+  `api_auth_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '认证ID',
+  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'openapi授权' ROW_FORMAT = DYNAMIC;

 -- ----------------------------
@ -165,4 +165,6 @@ INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, oper
 INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917881149431058436', 'f6817f48af4fb3af11b9e8bf182f618b', '2025050105554940203', null, '2025-05-01 17:57:53', '0:0:0:0:0:0:0:1');
 INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917881149431058437', 'f6817f48af4fb3af11b9e8bf182f618b', '2025050105554940204', null, '2025-05-01 17:57:53', '0:0:0:0:0:0:0:1');
 INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917881149431058438', 'f6817f48af4fb3af11b9e8bf182f618b', '2025050105554940205', null, '2025-05-01 17:57:53', '0:0:0:0:0:0:0:1');
-INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917881149431058439', 'f6817f48af4fb3af11b9e8bf182f618b', '2025050105554940206', null, '2025-05-01 17:57:53', '0:0:0:0:0:0:0:1');
+INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917881149431058439', 'f6817f48af4fb3af11b9e8bf182f618b', '2025050105554940206', null, '2025-05-01 17:57:53', '0:0:0:0:0:0:0:1');
+INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1917957659860963330', 'f6817f48af4fb3af11b9e8bf182f618b', '1917957565728198657', null, '2025-05-01 23:01:55', '0:0:0:0:0:0:0:1');
+INSERT INTO sys_role_permission (id, role_id, permission_id, data_rule_ids, operate_date, operate_ip) VALUES ('1922109760551858178', 'f6817f48af4fb3af11b9e8bf182f618b', '1922109301837606914', null, '2025-05-13 10:00:53', '0:0:0:0:0:0:0:1');
--- a/jeecg-boot/db/版本升级说明.md
+++ b/jeecg-boot/db/版本升级说明.md
@ -3,6 +3,7 @@
 > JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。

 ### 增量升级方案
+
 #### 1.代码合并
 本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；

@ -11,5 +12,12 @@
 - 其他库请手工执行SQL, 目录： `jeecg-module-system\jeecg-system-start\src\main\resources\flyway\sql\mysql`
 > 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。

-#### 3.兼容问题
+#### 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.兼容问题
 每次发版，会针对不兼容地方重点说明。
--- a/jeecg-boot/docker-compose.yml
+++ b/jeecg-boot/docker-compose.yml
@ -18,47 +18,20 @@ services:
      --max_allowed_packet=128M
      --default-authentication-plugin=caching_sha2_password
    ports:
-      - 13306:3306
+      - 3306: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-rabbitmq:
-#    image: rabbitmq:3.7.7-management
-##    ports:
-##      - 5672:5672
-##      - 15672:15672
-#    restart: always
-#    container_name: jeecg-boot-rabbitmq
-#    hostname: jeecg-boot-rabbitmq
-#    environment:
-#      RABBITMQ_DEFAULT_USER: guest
-#      RABBITMQ_DEFAULT_PASS: guest
-#    networks:
-#      - jeecg-boot
-
  jeecg-boot-system:
    build:
      context: ./jeecg-module-system/jeecg-system-start
@ -73,8 +46,6 @@ services:
      - 8080:8080
    networks:
      - jeecg-boot
-    volumes:
-      - ./config:/jeecg-boot/config

 networks:
  jeecg-boot:
--- a/jeecg-boot/jeecg-boot-base-core/pom.xml
+++ b/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.8.3</version>
+		<version>3.8.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-core</artifactId>
@ -43,12 +43,22 @@
 		<!--jeecg-tools-->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-common</artifactId>
+			<artifactId>jeecg-boot-common3</artifactId>
 		</dependency>
 		<!--集成springmvc框架并实现自动配置 -->
 		<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>
@ -98,7 +108,7 @@
 		<!-- mybatis-plus -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
 			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<dependency>
@ -108,21 +118,22 @@
 		</dependency>
 		<!-- minidao -->
 		<dependency>
-			<groupId>org.jeecgframework</groupId>
-			<artifactId>minidao-spring-boot-starter-jsqlparser-4.9</artifactId>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
+			<version>${mybatis-plus.version}</version>
 		</dependency>

 		<!-- druid -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
+			<artifactId>druid-spring-boot-3-starter</artifactId>
 			<version>${druid.version}</version>
 		</dependency>

 		<!-- 动态数据源 -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+			<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
 			<version>${dynamic-datasource-spring-boot-starter.version}</version>
 		</dependency>

@ -137,7 +148,7 @@
 		<!--  sqlserver-->
 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
-			<artifactId>mssql-jdbc</artifactId>
+			<artifactId>sqljdbc4</artifactId>
 			<version>${sqljdbc4.version}</version>
 			<scope>runtime</scope>
 		</dependency>
@ -159,13 +170,13 @@
 		<dependency>
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>kingbase8</artifactId>
-			<version>${kingbase8.version}</version>
+			<version>9.0.0</version>
 			<scope>runtime</scope>
 		</dependency>
 		<!--达梦数据库驱动 版本号1-3-26-2023.07.26-197096-20046-ENT -->
 		<dependency>
 			<groupId>com.dameng</groupId>
-			<artifactId>DmJdbcDriver18</artifactId>
+			<artifactId>Dm8JdbcDriver18</artifactId>
 			<version>${dm8.version}</version>
 		</dependency>
 		<dependency>
@ -191,7 +202,50 @@
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring-boot-starter</artifactId>
+			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-spring</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+			<!-- 排除仍使用了javax.servlet的依赖 -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-web</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- 引入适配jakarta的依赖包 -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-core</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-web</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- shiro-redis -->
 		<dependency>
@ -210,12 +264,23 @@
 			</exclusions>
 		</dependency>

-		<!-- knife4j -->
+	
+	<!--	<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+			<version>${knife4j-spring-boot-starter.version}</version>
+		</dependency>-->
+		<!-- knife4j 升级springboot3.4.5报错 -->
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+			<artifactId>knife4j-openapi3-ui</artifactId>
 			<version>${knife4j-spring-boot-starter.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>

 		<!-- 代码生成器 -->
 		<!-- 如下载失败，请参考此文档  https://help.jeecg.com/java/setup/maven.html -->
@ -237,8 +302,19 @@

 		<!-- AutoPoi Excel工具类-->
 		<dependency>
-			<groupId>org.jeecgframework</groupId>
+			<groupId>org.jeecgframework.boot3</groupId>
 			<artifactId>autopoi-web</artifactId>
+			<version>${autopoi-web.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>xercesImpl</artifactId>
+					<groupId>xerces</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>xerces</groupId>
@ -275,6 +351,16 @@
 		<dependency>
 			<groupId>com.xkcoding.justauth</groupId>
 			<artifactId>justauth-spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-autoconfigure</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-configuration-processor</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
@ -301,7 +387,12 @@
 		<!-- chatgpt -->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-starter-chatgpt</artifactId>
+			<artifactId>jeecg-boot-starter3-chatgpt</artifactId>
+		</dependency>
+		<!-- minidao -->
+		<dependency>
+			<groupId>org.jeecgframework.boot3</groupId>
+			<artifactId>minidao-spring-boot-starter-jsqlparser-4.9</artifactId>
 		</dependency>
 	</dependencies>
-</project>
+</project>
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
@ -1,6 +1,5 @@
 package org.jeecg.common.api;

-import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.system.vo.*;

 import java.util.List;
@ -145,15 +144,4 @@ public interface CommonAPI {
    List<DictModel> translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource);
    //update-end---author:chenrui ---date:20231221  for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------

-    /**
-     * 16 运行AIRag流程
-     * for  [QQYUN-13634]在baseapi里面封装方法，方便其他模块调用
-     *
-     * @param airagFlowDTO
-     * @return 流程执行结果,可能是String或者Map
-     * @author chenrui
-     * @date 2025/9/2 11:43
-     */
-    Object runAiragFlow(AiragFlowDTO airagFlowDTO);
-
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/AiragFlowDTO.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/AiragFlowDTO.java
@ -1,36 +0,0 @@
-package org.jeecg.common.api.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * 调用AI流程入参
- * for [QQYUN-13634]在baseapi里面封装方法，方便其他模块调用
- * @author chenrui
- * @date 2025/9/2 14:11
- */
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-public class AiragFlowDTO implements Serializable {
-
-
-    private static final long serialVersionUID = 7431775881170684867L;
-
-    /**
-     * 流程id
-     */
-    private String flowId;
-
-
-    /**
-     * 输入参数
-     */
-    private Map<String, Object> inputParams;
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
@ -2,7 +2,7 @@ package org.jeecg.common.api.dto;

 import lombok.Data;

-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.Serializable;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
@ -91,12 +91,6 @@ public class MessageDTO implements Serializable {
    private Boolean isTimeJob = false;
    
    //---【邮件相关参数】-------------------------------------------------------------
-
-    /**
-     * 枚举：org.jeecg.common.constant.enums.NoticeTypeEnum
-     * 通知类型(system:系统消息、file:知识库、flow:流程、plan:日程计划、meeting:会议)
-     */
-    private String noticeType;
    
    public MessageDTO(){
    }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
@ -1,7 +1,6 @@
 package org.jeecg.common.api.vo;

 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.jeecg.common.constant.CommonConstant;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
@ -20,14 +20,14 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.IpUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.core.StandardReflectionParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.Date;

@ -143,7 +143,7 @@ public class AutoLogAspect {
            //  https://my.oschina.net/mengzhang6/blog/2395893
            Object[] arguments  = new Object[paramsArray.length];
            for (int i = 0; i < paramsArray.length; i++) {
-                if (paramsArray[i] instanceof BindingResult || paramsArray[i] instanceof ServletRequest || paramsArray[i] instanceof ServletResponse || paramsArray[i] instanceof MultipartFile || paramsArray[i] instanceof MultipartFile[]) {
+                if (paramsArray[i] instanceof BindingResult || paramsArray[i] instanceof ServletRequest || paramsArray[i] instanceof ServletResponse || paramsArray[i] instanceof MultipartFile) {
                    //ServletRequest不能序列化，从入参里排除，否则报异常：java.lang.IllegalStateException: It is illegal to call this method if the current request is not in asynchronous mode (i.e. isAsyncStarted() returns false)
                    //ServletResponse不能序列化 从入参里排除，否则报异常：java.lang.IllegalStateException: getOutputStream() has already been called for this response
                    continue;
@ -172,7 +172,7 @@ public class AutoLogAspect {
            // 请求的方法参数值
            Object[] args = joinPoint.getArgs();
            // 请求的方法参数名称
-            LocalVariableTableParameterNameDiscoverer u = new LocalVariableTableParameterNameDiscoverer();
+            StandardReflectionParameterNameDiscoverer u=new StandardReflectionParameterNameDiscoverer();
            String[] paramNames = u.getParameterNames(method);
            if (args != null && paramNames != null) {
                for (int i = 0; i < args.length; i++) {
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.List;

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
@ -303,11 +303,6 @@ public interface CommonConstant {
     */
    String SYS_USER_ID_MAPPING_CACHE = "sys:cache:user:id_mapping";

-    /**
-     * 系统角色管理员编码
-     */
-    String SYS_ROLE_ADMIN = "admin";
-
    /**
     * 考勤补卡业务状态 （1：同意  2：不同意）
     */
@ -433,11 +428,6 @@ public interface CommonConstant {
    */
   String NOTICE_MSG_BUS_TYPE = "NOTICE_MSG_BUS_TYPE";

-    /**
-     * 通知类型，用于区分来源 file 知识 flow 流程 plan 日程 system 系统消息 
-     */
-    String NOTICE_TYPE = "noticeType";
-
    /**
     * 邮箱消息中地址登录时地址后携带的token,需要替换成真实的token值
     */
@ -639,74 +629,4 @@ public interface CommonConstant {
    * 修改手机号验证码请求次数超出
    */
   Integer PHONE_SMS_FAIL_CODE = 40002;
-
-
-    /**
-     * 自定义首页关联关系(ROLE:表示角色 USER:表示用户 DEFAULT:默认首页)
-     *
-     */
-    String HOME_RELATION_ROLE = "ROLE";
-    String HOME_RELATION_USER = "USER";
-    String HOME_RELATION_DEFAULT = "DEFAULT";
-
-    /**
-     * 是否置顶(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:";
-    /**
-     * 用户代理类型：离职：quit 代理：agent
-     */
-    String USER_AGENT_TYPE_QUIT = "quit";
-    String USER_AGENT_TYPE_AGENT = "agent";
-    /**
-     * 督办流程首节点任务taskKey
-     */
-    String SUPERVISE_FIRST_TASK_KEY = "Task_1bhxpt0";
-
-    /**
-     * wps模板预览数据缓存前缀
-     */
-    String EOA_WPS_TEMPLATE_VIEW_DATA ="eoa:wps:templateViewData:";
-
-    /**
-     * wps模板预览版本号缓存前缀
-     */
-    String EOA_WPS_TEMPLATE_VIEW_VERSION ="eoa:wps:templateViewVersion:";
-    /**
-     * 表单设计器oa新增字段
-     * x_oa_timeout_date:逾期时间
-     * x_oa_archive_status:归档状态
-     */
-    String X_OA_TIMEOUT_DATE ="x_oa_timeout_date";
-    String X_OA_ARCHIVE_STATUS ="x_oa_archive_status";
-    /**
-     * 流程状态
-     * 待提交: 1
-     * 处理中: 2
-     * 已完成: 3
-     * 已作废: 4
-     * 已挂起: 5
-     */
-    String BPM_STATUS_1 ="1";
-    String BPM_STATUS_2 ="2";
-    String BPM_STATUS_3 ="3";
-    String BPM_STATUS_4 ="4";
-    String BPM_STATUS_5 ="5";
-
-    /**
-     * 默认租户产品包
-     */
-    String TENANT_PACK_DEFAULT = "default";
-
-    /**
-     * 部门名称redisKey(全路径)
-     */
-    String DEPART_NAME_REDIS_KEY_PRE = "sys:cache:departPathName:";
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
@ -4,20 +4,6 @@ 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数据库*/
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/PasswordConstant.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/PasswordConstant.java
@ -1,15 +0,0 @@
-package org.jeecg.common.constant;
-
-/**
-* @Description: 密码常量类
-*
-* @author: wangshuai
-* @date: 2025/8/27 20:10
-*/
-public interface PasswordConstant {
-
-    /**
-     * 导入用户默认密码
-     */
-    String DEFAULT_PASSWORD = "123456";
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
@ -121,7 +121,7 @@ public class ProvinceCityArea {

    public void getAreaByCode(String code,List<String> ls){
        for(Area area: areaList){
-            if(null != area && area.getId().equals(code)){
+            if(area.getId().equals(code)){
                String pid = area.getPid();
                ls.add(0,area.getText());
                getAreaByCode(pid,ls);
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DepartCategoryEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DepartCategoryEnum.java
@ -1,97 +0,0 @@
-package org.jeecg.common.constant.enums;
-
-import org.jeecg.common.util.oConvertUtils;
-
-/**
-* @Description: 部门类型枚举类
-*
-* @author: wangshuai
-* @date: 2025/8/19 21:37
-*/
-public enum DepartCategoryEnum {
-    
-    DEPART_CATEGORY_COMPANY("部门类型：公司","公司","1"),
-    DEPART_CATEGORY_DEPART("部门类型：部门","部门","2"),
-    DEPART_CATEGORY_POST("部门类型：岗位","岗位","3"),
-    DEPART_CATEGORY_SUB_COMPANY("部门类型：子公司","子公司","4");
-
-    DepartCategoryEnum(String described, String name, String value) {
-        this.value = value;
-        this.name = name;
-        this.described = described;
-    }
-
-    /**
-     * 描述
-     */
-    private String described;
-    /**
-     * 值
-     */
-    private String value;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    public String getDescribed() {
-        return described;
-    }
-
-    public void setDescribed(String described) {
-        this.described = described;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 根据值获取名称
-     * 
-     * @param value
-     * @return
-     */
-    public static String getNameByValue(String value){
-        if (oConvertUtils.isEmpty(value)) {
-            return null;
-        }
-        for (DepartCategoryEnum val : values()) {
-            if (val.getValue().equals(value)) {
-                return val.getName();
-            }
-        }
-        return value;
-    }
-    
-    /**
-     * 根据名称获取值
-     * 
-     * @param name
-     * @return
-     */
-    public static String getValueByName(String name){
-        if (oConvertUtils.isEmpty(name)) {
-            return null;
-        }
-        for (DepartCategoryEnum val : values()) {
-            if (val.getName().equals(name)) {
-                return val.getValue();
-            }
-        }
-        return name;
-    }
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
@ -9,14 +9,14 @@ 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");
+
 	/**
 	 * 短信模板编码
 	 */
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java
@ -13,10 +13,6 @@ 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"),
    /**
     * 流程新任务
     */
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java
@ -8,30 +8,21 @@ import java.util.List;

 /**
 * 消息类型
- *
 * @author: jeecg-boot
 */
@EnumDict("messageType")
 public enum MessageTypeEnum {

-    /**
-     * 系统消息
-     */
-    XT("system", "系统消息"),
-    /**
-     * 邮件消息
-     */
-    YJ("email", "邮件消息"),
-    /**
-     * 钉钉消息
-     */
+    /** 系统消息 */
+    XT("system",  "系统消息"),
+    /** 邮件消息 */
+    YJ("email",  "邮件消息"),
+    /** 钉钉消息 */
    DD("dingtalk", "钉钉消息"),
-    /**
-     * 企业微信
-     */
+    /** 企业微信 */
    QYWX("wechat_enterprise", "企业微信");

-    MessageTypeEnum(String type, String note) {
+    MessageTypeEnum(String type, String note){
        this.type = type;
        this.note = note;
    }
@ -65,13 +56,12 @@ public enum MessageTypeEnum {

    /**
     * 获取字典数据
-     *
     * @return
     */
-    public static List<DictModel> getDictList() {
+    public static List<DictModel> getDictList(){
        List<DictModel> list = new ArrayList<>();
        DictModel dictModel = null;
-        for (MessageTypeEnum e : MessageTypeEnum.values()) {
+        for(MessageTypeEnum e: MessageTypeEnum.values()){
            dictModel = new DictModel();
            dictModel.setValue(e.getType());
            dictModel.setText(e.getNote());
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/NoticeTypeEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/NoticeTypeEnum.java
@ -1,84 +0,0 @@
-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"),
-    /**
-     * 协同工作
-     * for [JHHB-136]【vue3】协同工作系统消息需要添加一个类型
-     */
-    NOTICE_TYPE_COLLABORATION("协同工作", "collab"),
-    /**
-     * 督办
-     */
-    NOTICE_TYPE_SUPERVISE("督办管理", "supe");
-
-    /**
-     * 文件类型名称
-     */
-    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 "系统消息";
-    }
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/PositionLevelEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/PositionLevelEnum.java
@ -1,180 +0,0 @@
-package org.jeecg.common.constant.enums;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 职级枚举类
- * 
- * 注意：此枚举仅适用于天津临港控股OA项目,职级的名称和等级均为写死（需要与数据库配置一致）
- * @date 2025-08-26
- * @author scott
- */
-public enum PositionLevelEnum {
-
-    // 领导层级（等级1-3）
-    CHAIRMAN("董事长", 1, PositionType.LEADER),
-    GENERAL_MANAGER("总经理", 2, PositionType.LEADER),
-    VICE_GENERAL_MANAGER("副总经理", 3, PositionType.LEADER),
-
-    // 职员层级（等级4-6）
-    MINISTER("部长", 4, PositionType.STAFF),
-    VICE_MINISTER("副部长", 5, PositionType.STAFF),
-    STAFF("职员", 6, PositionType.STAFF);
-
-    private final String name;
-    private final int level;
-    private final PositionType type;
-
-    PositionLevelEnum(String name, int level, PositionType type) {
-        this.name = name;
-        this.level = level;
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public PositionType getType() {
-        return type;
-    }
-
-    /**
-     * 职级类型枚举
-     */
-    public enum PositionType {
-        STAFF("职员层级"),
-        LEADER("领导层级");
-
-        private final String desc;
-
-        PositionType(String desc) {
-            this.desc = desc;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-    }
-
-    /**
-     * 根据职级名称获取枚举
-     * @param name 职级名称
-     * @return 职级枚举
-     */
-    public static PositionLevelEnum getByName(String name) {
-        for (PositionLevelEnum position : values()) {
-            if (position.getName().equals(name)) {
-                return position;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 根据职级等级获取枚举
-     * @param level 职级等级
-     * @return 职级枚举
-     */
-    public static PositionLevelEnum getByLevel(int level) {
-        for (PositionLevelEnum position : values()) {
-            if (position.getLevel() == level) {
-                return position;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 根据职级名称判断是否为职员层级
-     * @param name 职级名称
-     * @return true-职员层级，false-非职员层级
-     */
-    public static boolean isStaffLevel(String name) {
-        PositionLevelEnum position = getByName(name);
-        return position != null && position.getType() == PositionType.STAFF;
-    }
-
-    /**
-     * 根据职级名称判断是否为领导层级
-     * @param name 职级名称
-     * @return true-领导层级，false-非领导层级
-     */
-    public static boolean isLeaderLevel(String name) {
-        PositionLevelEnum position = getByName(name);
-        return position != null && position.getType() == PositionType.LEADER;
-    }
-
-    /**
-     * 比较两个职级的等级高低
-     * @param name1 职级名称1
-     * @param name2 职级名称2
-     * @return 正数表示name1等级更高，负数表示name2等级更高，0表示等级相同
-     */
-    public static int compareLevel(String name1, String name2) {
-        PositionLevelEnum pos1 = getByName(name1);
-        PositionLevelEnum pos2 = getByName(name2);
-
-        if (pos1 == null || pos2 == null) {
-            return 0;
-        }
-
-        // 等级数字越小代表职级越高
-        return pos2.getLevel() - pos1.getLevel();
-    }
-
-    /**
-     * 判断是否为更高等级
-     * @param currentName 当前职级名称
-     * @param targetName 目标职级名称
-     * @return true-目标职级更高，false-目标职级不高于当前职级
-     */
-    public static boolean isHigherLevel(String currentName, String targetName) {
-        return compareLevel(targetName, currentName) > 0;
-    }
-
-    /**
-     * 获取所有职员层级名称
-     * @return 职员层级名称列表
-     */
-    public static List<String> getStaffLevelNames() {
-        return Arrays.asList(MINISTER.getName(), VICE_MINISTER.getName(), STAFF.getName());
-    }
-
-    /**
-     * 获取所有领导层级名称
-     * @return 领导层级名称列表
-     */
-    public static List<String> getLeaderLevelNames() {
-        return Arrays.asList(CHAIRMAN.getName(), GENERAL_MANAGER.getName(), VICE_GENERAL_MANAGER.getName());
-    }
-
-    /**
-     * 获取所有职级名称（按等级排序）
-     * @return 所有职级名称列表
-     */
-    public static List<String> getAllPositionNames() {
-        return Arrays.asList(
-                CHAIRMAN.getName(), GENERAL_MANAGER.getName(), VICE_GENERAL_MANAGER.getName(),
-                MINISTER.getName(), VICE_MINISTER.getName(), STAFF.getName()
-        );
-    }
-
-    /**
-     * 获取指定等级范围的职级
-     * @param minLevel 最小等级
-     * @param maxLevel 最大等级
-     * @return 职级名称列表
-     */
-    public static List<String> getPositionsByLevelRange(int minLevel, int maxLevel) {
-        return Arrays.stream(values())
-                .filter(p -> p.getLevel() >= minLevel && p.getLevel() <= maxLevel)
-                .map(PositionLevelEnum::getName)
-                .collect(java.util.stream.Collectors.toList());
-    }
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java
@ -23,25 +23,7 @@ public enum SysAnnmentTypeEnum {
    /**
     * 邀请用户跳转到个人设置
     */
-    TENANT_INVITE("tenant_invite", "url", "/system/usersetting"),
-    /**
-     * 协同工作-待办通知
-     * for [JHHB-136]【vue3】协同工作系统消息需要添加一个类型
-     */
-    EOA_CO_NOTIFY("eoa_co_notify", "url", "/collaboration/pending"),
-    /**
-     * 协同工作-催办通知
-     * for [JHHB-136]【vue3】协同工作系统消息需要添加一个类型
-     */
-    EOA_CO_REMIND("eoa_co_remind", "url", "/collaboration/pending"),
-    /**
-     * 督办管理-催办
-     */
-    EOA_SUP_REMIND("eoa_sup_remind", "url", "/superivse/list"),
-    /**
-     * 督办管理-通知
-     */
-    EOA_SUP_NOTIFY("eoa_sup_notify", "url", "/superivse/list");
+    TENANT_INVITE("tenant_invite", "url", "/system/usersetting");

    /**
     * 业务类型(email:邮件 bpm:流程)
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
@ -1,6 +1,8 @@
 package org.jeecg.common.exception;

 import cn.hutool.core.util.ObjectUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.shiro.SecurityUtils;
@ -30,11 +32,8 @@ 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;

@ -57,7 +56,7 @@ public class JeecgBootExceptionHandler {
 		addSysLog(e);
 		return Result.error("校验失败！" + e.getBindingResult().getAllErrors().stream().map(ObjectError::getDefaultMessage).collect(Collectors.joining(",")));
 	}
-	
+
 	/**
 	 * 处理自定义异常
 	 */
@ -167,27 +166,6 @@ 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) {
-			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);
@ -243,16 +221,11 @@ public class JeecgBootExceptionHandler {
        } catch (NullPointerException | BeansException ignored) {
        }
        if (null != request) {
-			//update-begin---author:chenrui ---date:20250408  for：[QQYUN-11716]上传大图片失败没有精确提示------------
 			//请求的参数
-			if (!isTooBigException(e)) {
-				// 文件上传过大异常时不能获取参数,否则会报错
-				Map<String, String[]> parameterMap = request.getParameterMap();
-				if(!CollectionUtils.isEmpty(parameterMap)) {
-					log.setMethod(oConvertUtils.mapToString(request.getParameterMap()));
-				}
+			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地址
@ -278,26 +251,4 @@ 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){
-				isTooBigException = true;
-			}
-		}
-		if(e instanceof MaxUploadSizeExceededException){
-			isTooBigException = true;
-		}
-		return isTooBigException;
-	}
-
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java
@ -4,11 +4,6 @@ import java.lang.annotation.*;

 /**
 * 将枚举类转化成字典数据
- * 
- * <<使用说明>>
- * 1. 枚举类需以 `Enum` 结尾，并且在类上添加 `@EnumDict` 注解。
- * 2. 需要手动将枚举类所在包路径** 添加到 `org.jeecg.common.system.util.ResourceUtil.BASE_SCAN_PACKAGES` 配置数组中。
- * 
 * @Author taoYan
 * @Date 2022/7/8 10:34
 **/
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
@ -18,15 +18,14 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecgframework.poi.handler.inter.IExcelExportServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;

@ -128,53 +127,6 @@ public class JeecgController<T, S extends IService<T>> {
        return mv;
    }

-    /**
-     * 大数据导出
-     * @param request
-     * @param object
-     * @param clazz
-     * @param title
-     * @param pageSize 每次查询的数据量
-     * @return
-     * @author chenrui
-     * @date 2025/8/11 16:11
-     */
-    protected ModelAndView exportXlsForBigData(HttpServletRequest request, T object, Class<T> clazz, String title,Integer pageSize) {
-        // 组装查询条件
-        QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        // 计算分页数
-        double total = service.count();
-        int count = (int) Math.ceil(total / pageSize);
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isNotEmpty(selections)) {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            queryWrapper.in("id", selectionList);
-        }
-
-        // 定义IExcelExportServer
-        IExcelExportServer excelExportServer = (queryParams, pageNum) -> {
-            if (pageNum > count) {
-                return null;
-            }
-            Page<T> page = new Page<T>(pageNum, pageSize);
-            IPage<T> pageList = service.page(page, (QueryWrapper<T>) queryParams);
-            return new ArrayList<>(pageList.getRecords());
-        };
-
-        // AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //此处设置的filename无效 ,前端会重更新设置一下
-        mv.addObject(NormalExcelConstants.FILE_NAME, title);
-        mv.addObject(NormalExcelConstants.CLASS, clazz);
-        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title, jeecgBaseConfig.getPath().getUpload());
-        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-        mv.addObject(NormalExcelConstants.EXPORT_SERVER, excelExportServer);
-        mv.addObject(NormalExcelConstants.QUERY_PARAMS, queryWrapper);
-        return mv;
-    }
-

    /**
     * 根据权限导出excel，传入导出字段参数
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
@ -2,6 +2,7 @@ package org.jeecg.common.system.base.entity;

 import java.io.Serializable;

+import io.swagger.v3.oas.annotations.media.Schema;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;

@ -9,10 +10,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 io.swagger.v3.oas.annotations.media.Schema;

 /**
 * @Description: Entity基类
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
@ -11,7 +11,6 @@ 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;
@ -258,69 +257,8 @@ public class QueryGenerator {
 		if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) {
 			order = parameterMap.get(ORDER_TYPE)[0];
 		}
-		
-		if(oConvertUtils.isNotEmpty(column)){
-			log.info("单字段排序规则>> column:" + column + ",排序方式:" + order);
-		}
+        log.debug("排序规则>>列:" + 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 避免用户自定义表无默认字段创建时间，导致排序报错
 		if(DataBaseConstant.CREATE_TIME.equals(column) && !fieldColumnMap.containsKey(DataBaseConstant.CREATE_TIME)){
@ -414,11 +352,9 @@ public class QueryGenerator {
                }
 				// update-begin-author:sunjianlei date:20220119 for: 【JTC-573】 过滤空条件查询，防止 sql 拼接多余的 and
 				List<QueryCondition> filterConditions = conditions.stream().filter(
-						rule -> (oConvertUtils.isNotEmpty(rule.getField())
-													&& oConvertUtils.isNotEmpty(rule.getRule())
-													&& oConvertUtils.isNotEmpty(rule.getVal())
-												 )
-												|| "empty".equals(rule.getRule())
+						rule -> oConvertUtils.isNotEmpty(rule.getField())
+								&& oConvertUtils.isNotEmpty(rule.getRule())
+								&& oConvertUtils.isNotEmpty(rule.getVal())
 				).collect(Collectors.toList());
 				if (filterConditions.size() == 0) {
 					return;
@ -429,12 +365,9 @@ public class QueryGenerator {
                queryWrapper.and(andWrapper -> {
                    for (int i = 0; i < filterConditions.size(); i++) {
                        QueryCondition rule = filterConditions.get(i);
-                        if (
-								(
-								    oConvertUtils.isNotEmpty(rule.getField()) && oConvertUtils.isNotEmpty(rule.getRule()) && oConvertUtils.isNotEmpty(rule.getVal())
-								)
-							    || "empty".equals(rule.getRule())
-						) {
+                        if (oConvertUtils.isNotEmpty(rule.getField())
+                                && oConvertUtils.isNotEmpty(rule.getRule())
+                                && oConvertUtils.isNotEmpty(rule.getVal())) {

                            log.debug("SuperQuery ==> " + rule.toString());

@ -721,11 +654,7 @@ public class QueryGenerator {
 	 * @param value        查询条件值
 	 */
 	public static void addEasyQuery(QueryWrapper<?> queryWrapper, String name, QueryRuleEnum rule, Object value) {
-		if (
-				(
-				   name==null || value == null || rule == null || oConvertUtils.isEmpty(value)
-				) 
-				  && !QueryRuleEnum.EMPTY.equals(rule)) {
+		if (name==null || value == null || rule == null || oConvertUtils.isEmpty(value)) {
 			return;
 		}
 		name = oConvertUtils.camelToUnderline(name);
@ -737,9 +666,6 @@ public class QueryGenerator {
 		case GE:
 			queryWrapper.ge(name, value);
 			break;
-		case EMPTY:
-			queryWrapper.isNull(name);
-			break;
 		case LT:
 			queryWrapper.lt(name, value);
 			break;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
@ -5,7 +5,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.SpringContextUtils;
 import org.springframework.util.StringUtils;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
@ -6,16 +6,18 @@ 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 com.google.common.base.Joiner;

 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 jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@ -49,24 +51,24 @@ public class JwtUtil {
     * @param code
     * @param errorMsg
     */
-	public static void responseError(HttpServletResponse response, Integer code, String errorMsg) {
-		try {
-			Result jsonResult = new Result(code, errorMsg);
-			jsonResult.setSuccess(false);
-			
-			// 设置响应头和内容类型
-			response.setStatus(code);
-			response.setHeader("Content-type", "text/html;charset=UTF-8");
-			response.setContentType("application/json;charset=UTF-8");
-			// 使用 ObjectMapper 序列化为 JSON 字符串
-			ObjectMapper objectMapper = new ObjectMapper();
-			String json = objectMapper.writeValueAsString(jsonResult);
-			response.getWriter().write(json);
-			response.getWriter().flush();
-		} catch (IOException e) {
+    public static void responseError(ServletResponse response, Integer code, String errorMsg) {
+		HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+		// issues/I4YH95浏览器显示乱码问题
+		httpServletResponse.setHeader("Content-type", "text/html;charset=UTF-8");
+        Result jsonResult = new Result(code, errorMsg);
+		jsonResult.setSuccess(false);
+        OutputStream os = null;
+        try {
+            os = httpServletResponse.getOutputStream();
+			httpServletResponse.setCharacterEncoding("UTF-8");
+			httpServletResponse.setStatus(code);
+            os.write(new ObjectMapper().writeValueAsString(jsonResult).getBytes("UTF-8"));
+            os.flush();
+            os.close();
+        } catch (IOException e) {
 			log.error(e.getMessage(), e);
-		}
-	}
+        }
+    }

 	/**
 	 * 校验token是否正确
@ -99,7 +101,7 @@ public class JwtUtil {
 			DecodedJWT jwt = JWT.decode(token);
 			return jwt.getClaim("username").asString();
 		} catch (JWTDecodeException e) {
-			log.error(e.getMessage(), e);
+			log.warn(e.getMessage(), e);
 			return null;
 		}
 	}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
@ -13,33 +13,31 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.util.ClassUtils;
-import java.lang.reflect.Method;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 /**
- * 枚举字典数据 资源加载工具类
- *
+ * 资源加载工具类
 * @Author taoYan
 * @Date 2022/7/8 10:40
 **/
@Slf4j
 public class ResourceUtil {

-    /**
-     * 多个包扫描根路径
-     *
-     * 之所以让用户手工配置扫描路径，是为了避免不必要的类加载开销，提升启动性能。
-     * 请务必将所有枚举类所在包路径添加到此配置中。
-     */
-    private final static String[] BASE_SCAN_PACKAGES = {
-            "org.jeecg.common.constant.enums",
-            "org.jeecg.modules.message.enums"
-    };
-    
+
    /**
     * 枚举字典数据
     */
    private final static Map<String, List<DictModel>> enumDictData = new HashMap<>(5);
+
+    /**
+     * 所有java类
+     */
+    private final static String CLASS_PATTERN="/**/*.class";
+
    /**
     * 所有枚举java类
     */
@ -47,9 +45,9 @@ public class ResourceUtil {
    private final static String CLASS_ENUM_PATTERN="/**/*Enum.class";

    /**
-     * 初始化状态标识
+     * 包路径 org.jeecg
     */
-    private static volatile boolean initialized = false;
+    private final static String BASE_PACKAGE = "org.jeecg";

    /**
     * 枚举类中获取字典数据的方法名
@ -57,135 +55,59 @@ public class ResourceUtil {
    private final static String METHOD_NAME = "getDictList";

    /**
-     * 获取枚举字典数据
     * 获取枚举类对应的字典数据 SysDictServiceImpl#queryAllDictItems()
-     *
-     * @return 枚举字典数据
+     * @return
     */
-    public static Map<String, List<DictModel>> getEnumDictData() {
-        if (!initialized) {
-            synchronized (ResourceUtil.class) {
-                if (!initialized) {
-                    long startTime = System.currentTimeMillis();
-                    log.info("【枚举字典加载】开始初始化枚举字典数据...");
-
-                    initEnumDictData();
-                    initialized = true;
-
-                    long endTime = System.currentTimeMillis();
-                    log.info("【枚举字典加载】枚举字典数据初始化完成，共加载 {} 个字典，总耗时: {}ms", enumDictData.size(), endTime - startTime);
+    public static Map<String, List<DictModel>> getEnumDictData(){
+        if(enumDictData.keySet().size()>0){
+            return enumDictData;
+        }
+        ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
+        String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(BASE_PACKAGE) + CLASS_ENUM_PATTERN;
+        try {
+            Resource[] resources = resourcePatternResolver.getResources(pattern);
+            MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
+            for (Resource resource : resources) {
+                MetadataReader reader = readerFactory.getMetadataReader(resource);
+                String classname = reader.getClassMetadata().getClassName();
+                Class<?> clazz = Class.forName(classname);
+                EnumDict enumDict = clazz.getAnnotation(EnumDict.class);
+                if (enumDict != null) {
+                    EnumDict annotation = clazz.getAnnotation(EnumDict.class);
+                    String key = annotation.value();
+                    if(oConvertUtils.isNotEmpty(key)){
+                        List<DictModel> list = (List<DictModel>) clazz.getDeclaredMethod(METHOD_NAME).invoke(null);
+                        enumDictData.put(key, list);
+                    }
                }
            }
+        }catch (Exception e){
+            log.error("获取枚举类字典数据异常", e.getMessage());
+            // e.printStackTrace();
        }
        return enumDictData;
    }

-    /**
-     * 使用多包路径扫描方式初始化枚举字典数据
-     */
-    private static void initEnumDictData() {
-        ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-
-        long scanStartTime = System.currentTimeMillis();
-        List<Resource> allResources = new ArrayList<>();
-
-        // 扫描多个包路径
-        for (String basePackage : BASE_SCAN_PACKAGES) {
-            String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(basePackage) + CLASS_ENUM_PATTERN;
-
-            try {
-                Resource[] resources = resourcePatternResolver.getResources(pattern);
-                allResources.addAll(Arrays.asList(resources));
-                log.debug("【枚举字典加载】扫描包 {} 找到 {} 个枚举类文件", basePackage, resources.length);
-            } catch (Exception e) {
-                log.warn("【枚举字典加载】扫描包 {} 时出现异常: {}", basePackage, e.getMessage());
-            }
-        }
-
-        long scanEndTime = System.currentTimeMillis();
-        log.info("【枚举字典加载】文件扫描完成，总共找到 {} 个枚举类文件，扫描耗时: {}ms", allResources.size(), scanEndTime - scanStartTime);
-
-        MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
-
-        long processStartTime = System.currentTimeMillis();
-        int processedCount = 0;
-
-        for (Resource resource : allResources) {
-            try {
-                MetadataReader reader = readerFactory.getMetadataReader(resource);
-                String classname = reader.getClassMetadata().getClassName();
-
-                // 提前检查是否有@EnumDict注解，避免不必要的Class.forName
-                if (hasEnumDictAnnotation(reader)) {
-                    processEnumClass(classname);
-                    processedCount++;
-                }
-            } catch (Exception e) {
-                log.debug("处理资源异常: {} - {}", resource.getFilename(), e.getMessage());
-            }
-        }
-
-        long processEndTime = System.currentTimeMillis();
-        log.info("【枚举字典加载】处理完成，实际处理 {} 个带注解的枚举类，处理耗时: {}ms", processedCount, processEndTime - processStartTime);
-    }
-
-    /**
-     * 检查类是否有EnumDict注解（通过元数据，避免类加载）
-     */
-    private static boolean hasEnumDictAnnotation(MetadataReader reader) {
-        try {
-            return reader.getAnnotationMetadata().hasAnnotation(EnumDict.class.getName());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * 处理单个枚举类
-     */
-    private static void processEnumClass(String classname) {
-        try {
-            Class<?> clazz = Class.forName(classname);
-            EnumDict enumDict = clazz.getAnnotation(EnumDict.class);
-
-            if (enumDict != null) {
-                String key = enumDict.value();
-                if (oConvertUtils.isNotEmpty(key)) {
-                    Method method = clazz.getDeclaredMethod(METHOD_NAME);
-                    List<DictModel> list = (List<DictModel>) method.invoke(null);
-                    enumDictData.put(key, list);
-                    log.debug("成功加载枚举字典: {} -> {}", key, classname);
-                }
-            }
-        } catch (Exception e) {
-            log.debug("处理枚举类异常: {} - {}", classname, e.getMessage());
-        }
-    }
-
    /**
     * 用于后端字典翻译 SysDictServiceImpl#queryManyDictByKeys(java.util.List, java.util.List)
-     *
-     * @param dictCodeList 字典编码列表
-     * @param keys         键值列表
-     * @return 字典数据映射
+     * @param dictCodeList
+     * @param keys
+     * @return
     */
-    public static Map<String, List<DictModel>> queryManyDictByKeys(List<String> dictCodeList, List<String> keys) {
-        Map<String, List<DictModel>> enumDict = getEnumDictData();
+    public static Map<String, List<DictModel>> queryManyDictByKeys(List<String> dictCodeList, List<String> keys){
+        if(enumDictData.keySet().size()==0){
+            getEnumDictData();
+        }
        Map<String, List<DictModel>> map = new HashMap<>();
-
-        // 使用更高效的查找方式
-        Set<String> dictCodeSet = new HashSet<>(dictCodeList);
-        Set<String> keySet = new HashSet<>(keys);
-
-        for (String code : enumDict.keySet()) {
-            if (dictCodeSet.contains(code)) {
-                List<DictModel> dictItemList = enumDict.get(code);
-                for (DictModel dm : dictItemList) {
+        for (String code : enumDictData.keySet()) {
+            if(dictCodeList.indexOf(code)>=0){
+                List<DictModel> dictItemList = enumDictData.get(code);
+                for(DictModel dm: dictItemList){
                    String value = dm.getValue();
-                    if (keySet.contains(value)) {
+                    if(keys.indexOf(value)>=0){
                        List<DictModel> list = new ArrayList<>();
                        list.add(new DictModel(value, dm.getText()));
-                        map.put(code, list);
+                        map.put(code,list);
                        break;
                    }
                }
@ -193,5 +115,22 @@ public class ResourceUtil {
        }
        return map;
    }
-    
-}
+
+    /**
+     * 获取实现类
+     * 
+     * @param classPath 
+     */
+    public static Object getImplementationClass(String classPath){
+        try {
+            Class<?> aClass = Class.forName(classPath);
+            return SpringContextUtils.getBean(aClass);
+        } catch (ClassNotFoundException e) {
+            log.error("类没有找到",e);
+            return null;
+        } catch (NoSuchBeanDefinitionException e){
+            log.error(classPath + "没有实现",e);
+            return null;
+        }
+    }
+}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java
@ -1,22 +1,13 @@
 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;

 /**
@ -248,47 +239,5 @@ public class SqlConcatUtil {
    private static String getDbType() {
        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;
-    }
    
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
@ -68,12 +68,6 @@ public class LoginUser {
 	@SensitiveField
 	private String avatar;

-	/**
-	 * 工号
-	 */
-	@SensitiveField
-	private String workNo;
-
 	/**
 	 * 生日
 	 */
@ -144,8 +138,4 @@ public class LoginUser {
 	/**设备id uniapp推送用*/
 	private String clientId;

-	/**
-	 * 主岗位
-	 */
-	private String mainDepPostId;
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 /**
 * 
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
@ -19,13 +19,12 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.sql.DataSource;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
@ -153,9 +152,9 @@ public class CommonUtils {
     */
    public static String uploadLocal(MultipartFile mf,String bizPath,String uploadpath){
        try {
-            // 文件安全校验，防止上传漏洞文件
-            SsrfFileTypeFilter.checkUploadFileType(mf, bizPath);
-            
+            //update-begin-author:liusq date:20210809 for: 过滤上传文件类型
+            SsrfFileTypeFilter.checkUploadFileType(mf);
+            //update-end-author:liusq date:20210809 for: 过滤上传文件类型
            String fileName = null;
            File file = new File(uploadpath + File.separator + bizPath + File.separator );
            if (!file.exists()) {
@ -164,10 +163,6 @@ public class CommonUtils {
            }
            // 获取文件名
            String orgName = mf.getOriginalFilename();
-            // 无中文情况下进行转码
-            if (orgName != null && !CommonUtils.ifContainChinese(orgName)) {
-                orgName = new String(orgName.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
-            }
            orgName = CommonUtils.getFileName(orgName);
            if(orgName.indexOf(SymbolConstant.SPOT)!=-1){
                fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
@ -247,10 +242,6 @@ public class CommonUtils {
        try {
            DataSource dataSource = SpringContextUtils.getApplicationContext().getBean(DataSource.class);
            dbTypeEnum = JdbcUtils.getDbType(dataSource.getConnection().getMetaData().getURL());
-            //【采用SQL_SERVER2005引擎】QQYUN-13298 解决升级mybatisPlus后SqlServer分页使用OFFSET，无排序字段报错问题
-            if (dbTypeEnum == DbType.SQL_SERVER) {
-                dbTypeEnum = DbType.SQL_SERVER2005;
-            }
            return dbTypeEnum;
        } catch (SQLException e) {
            log.warn(e.getMessage(), e);
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
@ -13,8 +13,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@ -816,44 +814,4 @@ public class DateUtils extends PropertyEditorSupport {
        return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
    }

-    /**
-     * 获取两个日期之间的所有日期列表，包含开始和结束日期
-     *
-     * @param begin
-     * @param end
-     * @return
-     */
-    public static List<Date> getDateRangeList(Date begin, Date end) {
-        List<Date> dateList = new ArrayList<>();
-        if (begin == null || end == null) {
-            return dateList;
-        }
-
-        // 清除时间部分，只比较日期
-        Calendar beginCal = Calendar.getInstance();
-        beginCal.setTime(begin);
-        beginCal.set(Calendar.HOUR_OF_DAY, 0);
-        beginCal.set(Calendar.MINUTE, 0);
-        beginCal.set(Calendar.SECOND, 0);
-        beginCal.set(Calendar.MILLISECOND, 0);
-
-        Calendar endCal = Calendar.getInstance();
-        endCal.setTime(end);
-        endCal.set(Calendar.HOUR_OF_DAY, 0);
-        endCal.set(Calendar.MINUTE, 0);
-        endCal.set(Calendar.SECOND, 0);
-        endCal.set(Calendar.MILLISECOND, 0);
-
-        if (endCal.before(beginCal)) {
-            return dateList;
-        }
-
-        dateList.add(beginCal.getTime());
-        while (beginCal.before(endCal)) {
-            beginCal.add(Calendar.DAY_OF_YEAR, 1);
-            dateList.add(beginCal.getTime());
-        }
-        return dateList;
-    }
-
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java
@ -1,22 +1,14 @@
 package org.jeecg.common.util;

-import cn.hutool.core.io.IoUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
-import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.filter.SsrfFileTypeFilter;

-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.zip.ZipEntry;
@ -211,150 +203,4 @@ public class FileDownloadUtils {
            dir.mkdirs();
        }
    }
-
-
-    /**
-     * 下载单个文件到ZIP流
-     * 核心功能：获取文件流，写入ZIP条目
-     * @param fileUrl 文件URL（可以是HTTP URL或本地路径）
-     * @param fileName ZIP内的文件名
-     * @param zous ZIP输出流
-     */
-    public static void downLoadSingleFile(String fileUrl, String fileName, String uploadUrl,ZipArchiveOutputStream zous) {
-        InputStream inputStream = null;
-        try {
-            // 创建ZIP条目：每个文件在ZIP中都是一个独立条目
-            ZipArchiveEntry entry = new ZipArchiveEntry(fileName);
-            zous.putArchiveEntry(entry);
-
-            // 获取文件输入流：区分普通文件和快捷方式
-            if (fileUrl.endsWith(".url")) {
-                // 处理快捷方式：生成.url文件内容
-                inputStream = FileDownloadUtils.createInternetShortcut(fileName, fileUrl, "");
-            } else {
-                // 普通文件下载：从URL或本地路径获取流
-                inputStream = getDownInputStream(fileUrl,uploadUrl);
-            }
-
-            if (inputStream != null) {
-                // 将文件流写入ZIP
-                IOUtils.copy(inputStream, zous);
-            }
-            // 关闭当前ZIP条目
-            zous.closeArchiveEntry();
-        } catch (IOException e) {
-            log.error("文件下载失败: {}",  e);
-        } finally {
-            // 确保输入流关闭
-            IoUtil.close(inputStream);
-        }
-    }
-
-    /**
-     * 获取下载文件输入流
-     * 功能：根据URL类型（HTTP或本地）获取文件流
-     * @param fileUrl 文件URL（支持HTTP和本地路径）
-     * @return 文件输入流，失败返回null
-     */
-    public static InputStream getDownInputStream(String fileUrl, String uploadUrl) {
-        try {
-            // 处理HTTP URL：通过网络下载
-            if (oConvertUtils.isNotEmpty(fileUrl) && fileUrl.startsWith(CommonConstant.STR_HTTP)) {
-                URL url = new URL(fileUrl);
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                connection.setConnectTimeout(5000); // 连接超时5秒
-                connection.setReadTimeout(30000);  // 读取超时30秒
-                return connection.getInputStream();
-            } else {
-                // 处理本地文件：直接读取文件系统
-                String downloadFilePath = uploadUrl + File.separator + fileUrl;
-                // 安全检查：防止下载危险文件类型
-                SsrfFileTypeFilter.checkDownloadFileType(downloadFilePath);
-                return new BufferedInputStream(new FileInputStream(downloadFilePath));
-            }
-        } catch (IOException e) {
-            // 异常时返回null，上层会处理空流情况
-            return null;
-        }
-    }
-
-    /**
-     * 获取文件扩展名
-     * 功能：从文件名中提取扩展名
-     * @param fileName 文件名
-     * @return 文件扩展名（不含点），如"txt"、"png"
-     */
-    public static String getFileExtension(String fileName) {
-        int dotIndex = fileName.lastIndexOf('.');
-        return (dotIndex == -1) ? "" : fileName.substring(dotIndex + 1);
-    }
-
-    /**
-     * 创建快捷方式（.url文件内容）
-     * 功能：生成Internet快捷方式文件内容
-     * @param name 快捷方式名称
-     * @param url 目标URL地址
-     * @param icon 图标路径（可选）
-     * @return 包含.url文件内容的输入流
-     */
-    public static InputStream createInternetShortcut(String name, String url, String icon) {
-        StringWriter sw = new StringWriter();
-        try {
-            // 按照Windows快捷方式格式写入内容
-            sw.write("[InternetShortcut]\n");
-            sw.write("URL=" + url + "\n");
-            if (oConvertUtils.isNotEmpty(icon)) {
-                sw.write("IconFile=" + icon + "\n");
-            }
-            // 将字符串内容转换为输入流
-            return new ByteArrayInputStream(sw.toString().getBytes(StandardCharsets.UTF_8));
-        } finally {
-            IoUtil.close(sw);
-        }
-    }
-    /**
-     * 从URL中提取文件名
-     * 功能：从HTTP URL或本地路径中提取纯文件名
-     * @param fileUrl 文件URL
-     * @return 文件名（不含路径）
-     */
-    public static String getFileNameFromUrl(String fileUrl) {
-        try {
-            // 处理HTTP URL：从路径部分提取文件名
-            if (fileUrl.startsWith(CommonConstant.STR_HTTP)) {
-                URL url = new URL(fileUrl);
-                String path = url.getPath();
-                return path.substring(path.lastIndexOf('/') + 1);
-            }
-
-            // 处理本地文件路径：从文件路径提取文件名
-            return fileUrl.substring(fileUrl.lastIndexOf(File.separator) + 1);
-        } catch (Exception e) {
-            // 如果解析失败，使用时间戳作为文件名
-            return "file_" + System.currentTimeMillis();
-        }
-    }
-    /**
-     * 生成ZIP中的文件名
-     * 功能：避免文件名冲突，为多个文件添加序号
-     * @param fileUrl 文件URL（用于提取原始文件名）
-     * @param index 文件序号（从0开始）
-     * @param total 文件总数
-     * @return 处理后的文件名（带序号）
-     */
-    public static String generateFileName(String fileUrl, int index, int total) {
-        // 从URL中提取原始文件名
-        String originalFileName = getFileNameFromUrl(fileUrl);
-
-        // 如果只有一个文件，直接使用原始文件名
-        if (total == 1) {
-            return originalFileName;
-        }
-
-        // 多个文件时，使用序号+原始文件名
-        String extension = getFileExtension(originalFileName);
-        String nameWithoutExtension = originalFileName.replace("." + extension, "");
-
-        return String.format("%s_%d.%s", nameWithoutExtension, index + 1, extension);
-    }
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.SymbolConstant;
 import org.jeecg.common.handler.IFillRuleHandler;
 import org.jeecg.common.system.query.QueryGenerator;

-import javax.servlet.http.HttpServletRequest;


 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
@ -1,6 +1,6 @@
 package org.jeecg.common.util;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.CommonConstant;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
@ -55,11 +55,13 @@ public class MinioUtil {
     */
    public static String upload(MultipartFile file, String bizPath, String customBucket) throws Exception {
        String fileUrl = "";
-        // 业务路径过滤，防止攻击
+        //update-begin-author:wangshuai date:20201012 for: 过滤上传文件夹名特殊字符，防止攻击
        bizPath = StrAttackFilter.filter(bizPath);
+        //update-end-author:wangshuai date:20201012 for: 过滤上传文件夹名特殊字符，防止攻击

-        // 文件安全校验，防止上传漏洞文件
-        SsrfFileTypeFilter.checkUploadFileType(file, bizPath);
+        //update-begin-author:liusq date:20210809 for: 过滤上传文件类型
+        SsrfFileTypeFilter.checkUploadFileType(file);
+        //update-end-author:liusq date:20210809 for: 过滤上传文件类型

        String newBucket = bucketName;
        if(oConvertUtils.isNotEmpty(customBucket)){
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java
@ -2,7 +2,6 @@ package org.jeecg.common.util;

 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

 import java.io.BufferedWriter;
@ -17,7 +16,6 @@ import java.util.List;
 */
@Slf4j
@Component
-@Lazy(false)
 public class PmsUtil {


--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
@ -221,63 +221,6 @@ public class RestUtil {
        return RT.exchange(url, method, request, responseType);
    }

-    /**
-     * 发送请求（支持自定义超时时间）
-     *
-     * @param url          请求地址
-     * @param method       请求方式
-     * @param headers      请求头  可空
-     * @param variables    请求url参数 可空
-     * @param params       请求body参数 可空
-     * @param responseType 返回类型
-     * @param timeout      超时时间（毫秒），如果为0或负数则使用默认超时
-     * @return ResponseEntity<responseType>
-     */
-    public static <T> ResponseEntity<T> request(String url, HttpMethod method, HttpHeaders headers,
-                                                JSONObject variables, Object params, Class<T> responseType, int timeout) {
-        log.info(" RestUtil  --- request ---  url = "+ url + ", timeout = " + timeout);
-
-        if (StringUtils.isEmpty(url)) {
-            throw new RuntimeException("url 不能为空");
-        }
-        if (method == null) {
-            throw new RuntimeException("method 不能为空");
-        }
-        if (headers == null) {
-            headers = new HttpHeaders();
-        }
-
-        // 创建自定义RestTemplate（如果需要设置超时）
-        RestTemplate restTemplate = RT;
-        if (timeout > 0) {
-            SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-            requestFactory.setConnectTimeout(timeout);
-            requestFactory.setReadTimeout(timeout);
-            restTemplate = new RestTemplate(requestFactory);
-            // 解决乱码问题
-            restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
-        }
-
-        // 请求体
-        String body = "";
-        if (params != null) {
-            if (params instanceof JSONObject) {
-                body = ((JSONObject) params).toJSONString();
-            } else {
-                body = params.toString();
-            }
-        }
-
-        // 拼接 url 参数
-        if (variables != null && !variables.isEmpty()) {
-            url += ("?" + asUrlVariables(variables));
-        }
-
-        // 发送请求
-        HttpEntity<String> request = new HttpEntity<>(body, headers);
-        return restTemplate.exchange(url, method, request, responseType);
-    }
-    
    /**
     * 获取JSON请求头
     */
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShiroThreadPoolExecutor.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShiroThreadPoolExecutor.java
@ -1,37 +0,0 @@
-package org.jeecg.common.util;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadContext;
-
-import java.util.concurrent.*;
-
-/**
- * @date 2025-09-04
- * @author scott
- * 
- * @Description: 支持shiro的API，获取当前登录人方法的线程池
- */
-public class ShiroThreadPoolExecutor extends ThreadPoolExecutor {
-
-    public ShiroThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
-        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
-    }
-
-    @Override
-    public void execute(Runnable command) {
-        Subject subject = SecurityUtils.getSubject();
-        SecurityManager securityManager = SecurityUtils.getSecurityManager();
-        super.execute(() -> {
-            try {
-                ThreadContext.bind(securityManager);
-                ThreadContext.bind(subject);
-                command.run();
-            } finally {
-                ThreadContext.unbindSubject();
-                ThreadContext.unbindSecurityManager();
-            }
-        });
-    }
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
@ -1,14 +1,13 @@
 package org.jeecg.common.util;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 import org.jeecg.common.constant.CommonConstant;
 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;
@ -17,7 +16,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 * @Description: spring上下文工具类
 * @author: jeecg-boot
 */
-@Lazy(false)
@Component
 public class SpringContextUtils implements ApplicationContextAware {

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
@ -16,13 +16,7 @@ import java.util.regex.Pattern;
 * @author zhoujf
 */
@Slf4j
-public class SqlInjectionUtil {
-
-	/**
-	 * sql注入黑名单数据库名
-	 */
-	public final static String XSS_STR_TABLE = "peformance_schema|information_schema";
-
+public class SqlInjectionUtil {	
 	/**
 	 * 默认—sql注入关键词
 	 */
@ -173,28 +167,7 @@ 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注入过滤处理，遇到注入关键字抛异常
 	 * 
@ -235,14 +208,6 @@ 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) {
@ -279,14 +244,6 @@ 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) {
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
@ -11,7 +11,7 @@ import org.jeecg.common.exception.JeecgBoot401Exception;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 /**
 * @Author scott
@ -65,10 +65,6 @@ public class TokenUtils {
        if (tenantId == null) {
            tenantId = oConvertUtils.getString(request.getHeader(CommonConstant.TENANT_ID));
        }
-
-        if (oConvertUtils.isNotEmpty(tenantId) && "undefined".equals(tenantId)) {
-            return null;
-        }
        return tenantId;
    }

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
@ -68,13 +68,6 @@ 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);
    }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
@ -1,7 +1,6 @@
 package org.jeecg.common.util.encryption;

-import org.apache.shiro.codec.Base64;
-
+import org.apache.shiro.lang.codec.Base64;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java
@ -2,7 +2,6 @@ package org.jeecg.common.util.filter;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.exception.JeecgBootException;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.IOException;
@ -35,7 +34,6 @@ 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");
@ -150,38 +148,29 @@ public class SsrfFileTypeFilter {
    public static void checkDownloadFileType(String filePath) throws IOException {
        //文件后缀
        String suffix = getFileTypeBySuffix(filePath);
-        log.debug(" 【文件下载校验】文件后缀 suffix: {}", suffix);
+        log.info("suffix:{}", suffix);
        boolean isAllowExtension = FILE_TYPE_WHITE_LIST.contains(suffix.toLowerCase());
        //是否允许下载的文件
        if (!isAllowExtension) {
-            throw new JeecgBootException("下载失败，存在非法文件类型：" + suffix);
+            throw new IOException("下载失败，存在非法文件类型：" + suffix);
        }
    }

+
    /**
     * 上传文件类型过滤
     *
     * @param file
     */
    public static void checkUploadFileType(MultipartFile file) throws Exception {
-        checkUploadFileType(file, null);
-    }
-    
-    /**
-     * 上传文件类型过滤
-     *
-     * @param file
-     */
-    public static void checkUploadFileType(MultipartFile file, String customPath) throws Exception {
-        //1. 路径安全校验
-        validatePathSecurity(customPath);
-        //2. 校验文件后缀和头
-        String suffix = getFileType(file, customPath);
-        log.info("【文件上传校验】文件后缀 suffix: {}，customPath：{}", suffix, customPath);
+        //获取文件真是后缀
+        String suffix = getFileType(file);
+
+        log.info("suffix:{}", suffix);
        boolean isAllowExtension = FILE_TYPE_WHITE_LIST.contains(suffix.toLowerCase());
        //是否允许下载的文件
        if (!isAllowExtension) {
-            throw new JeecgBootException("上传失败，存在非法文件类型：" + suffix);
+            throw new Exception("上传失败，存在非法文件类型：" + suffix);
        }
    }

@ -193,7 +182,7 @@ public class SsrfFileTypeFilter {
     * @throws Exception
     */

-    private static String getFileType(MultipartFile file, String customPath) throws Exception {
+    private static String getFileType(MultipartFile file) throws Exception {
        //update-begin-author:liusq date:20230404 for: [issue/4672]方法造成的文件被占用，注释掉此方法tomcat就能自动清理掉临时文件
        String fileExtendName = null;
        InputStream is = null;
@ -213,7 +202,7 @@ public class SsrfFileTypeFilter {
                    break;
                }
            }
-            log.debug("-----获取到的指定文件类型------"+fileExtendName);
+            log.info("-----获取到的指定文件类型------"+fileExtendName);
            // 如果不是上述类型，则判断扩展名
            if (StringUtils.isBlank(fileExtendName)) {
                String fileName = file.getOriginalFilename();
@ -224,6 +213,7 @@ public class SsrfFileTypeFilter {
                // 如果有扩展名，则返回扩展名
                return getFileTypeBySuffix(fileName);
            }
+            log.info("-----最終的文件类型------"+fileExtendName);
            is.close();
            return fileExtendName;
        } catch (Exception e) {
@ -258,34 +248,4 @@ public class SsrfFileTypeFilter {
        }
        return stringBuilder.toString();
    }
-
-    /**
-     * 路径安全校验
-     */
-    private static void validatePathSecurity(String customPath) throws JeecgBootException {
-        if (customPath == null || customPath.trim().isEmpty()) {
-            return;
-        }
-
-        // 统一分隔符为 /
-        String normalized = customPath.replace("\\", "/");
-
-        // 1. 防止路径遍历攻击
-        if (normalized.contains("..") || normalized.contains("~")) {
-            throw new JeecgBootException("上传业务路径包含非法字符！");
-        }
-
-        // 2. 限制路径深度
-        int depth = normalized.split("/").length;
-        if (depth > 5) {
-            throw new JeecgBootException("上传业务路径深度超出限制！");
-        }
-
-        // 3. 限制字符集（只允许字母、数字、下划线、横线、斜杠）
-        if (!normalized.matches("^[a-zA-Z0-9/_-]+$")) {
-            throw new JeecgBootException("上传业务路径包含非法字符！");
-        }
-    }
-
-    
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
@ -7,10 +7,9 @@ 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 jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@ -474,23 +473,6 @@ public class oConvertUtils {
 		return true;
 	}

-	/**
-	 * 判断字符串是否为JSON格式
-	 * @param str
-	 * @return
-	 */
-	public static boolean isJson(String str) {
-		if (str == null || str.trim().isEmpty()) {
-			return false;
-		}
-		try {
-			com.alibaba.fastjson.JSON.parse(str);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-	
 	/**
 	 * 获取Map对象
 	 */
@ -1149,24 +1131,7 @@ public class oConvertUtils {
 	 * @date 2020/9/12 15:50
 	 */
 	public static <T> boolean isIn(T obj, T... objs) {
-		if (isEmpty(objs)) {
-			return false;
-		}
-		for (T obj1 : objs) {
-			if (isEqual(obj, obj1)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * 判断租户ID是否有效
-	 * @param tenantId
-	 * @return
-	 */
-	public static boolean isEffectiveTenant(String tenantId) {
-		return MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && isNotEmpty(tenantId) && !("0").equals(tenantId);
+		return isIn(obj, objs);
 	}
 	
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
@ -97,8 +97,9 @@ public class OssBootUtil {
     * @return oss 中的相对文件路径
     */
    public static String upload(MultipartFile file, String fileDir,String customBucket) throws Exception {
-        // 文件安全校验，防止上传漏洞文件
+        //update-begin-author:liusq date:20210809 for: 过滤上传文件类型
        SsrfFileTypeFilter.checkUploadFileType(file);
+        //update-end-author:liusq date:20210809 for: 过滤上传文件类型

        String filePath = null;
        initOss(endPoint, accessKeyId, accessKeySecret);
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
@ -3,8 +3,6 @@ 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;
@ -68,8 +66,6 @@ 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);
@ -85,16 +81,6 @@ 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;
-                }
-            }
        }

        // 返回黑名单校验结果（不合法直接抛出异常）
@ -149,8 +135,6 @@ public abstract class AbstractQueryBlackListHandler {
     * 查询的表的信息
     */
    protected class QueryTable {
-        //数据库名
-        private String dbName;
        //表名
        private String name;
        //表的别名
@ -174,14 +158,6 @@ 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;
        }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
@ -3,14 +3,13 @@ package org.jeecg.config;
 import org.jeecgframework.core.util.ApplicationContextUtil;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;

 /**
 * @Author: Scott
 * @Date: 2018/2/7
 * @description: autopoi 配置类
 */
-@Lazy(false)
+
@Configuration
 public class AutoPoiConfig {

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
@ -3,7 +3,7 @@ package org.jeecg.config;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.system.vo.DictModel;
@ -25,7 +25,6 @@ import lombok.extern.slf4j.Slf4j;
 * @Version:1.0
 */
@Slf4j
-@Lazy(false)
@Service
 public class AutoPoiDictConfig implements AutoPoiDictServiceI {
 	final static String EXCEL_SPLIT_TAG = "_";
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
@ -2,7 +2,9 @@ package org.jeecg.config;

 import java.io.IOException;

-import javax.servlet.*;
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
+import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
+import jakarta.servlet.*;

 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -11,8 +13,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.Map;

 /**
+ * @author eightmonth@qq.com
 * 启动程序修改DruidWallConfig配置
 * 允许SELECT语句的WHERE子句是一个永真条件
 * @author eightmonth
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
@ -1,7 +1,10 @@
 package org.jeecg.config;

 import org.jeecg.config.vo.*;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;


@ -11,6 +14,7 @@ import org.springframework.stereotype.Component;
 */
@Component("jeecgBaseConfig")
@ConfigurationProperties(prefix = "jeecg")
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class JeecgBaseConfig {
    /**
     * 签名密钥串(字典等敏感接口)
@ -70,7 +74,7 @@ public class JeecgBaseConfig {
    /**
     * 百度开放API配置
     */
-    private BaiduApi baiduApi;    
+    private BaiduApi baiduApi;

    public String getCustomResourcePrefixPath() {
        return customResourcePrefixPath;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgGaodeBaseConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgGaodeBaseConfig.java
@ -1,29 +0,0 @@
-package org.jeecg.config;
-
-import org.jeecg.config.vo.GaoDeApi;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * 高德账号配置
- */
-@Lazy(false)
-@Configuration("jeecgGaodeBaseConfig")
-@ConfigurationProperties(prefix = "jeecg.jmreport")
-public class JeecgGaodeBaseConfig {
-
-    /**
-     * 高德开放API配置
-     */
-    private GaoDeApi gaoDeApi;
-
-    public GaoDeApi getGaoDeApi() {
-        return gaoDeApi;
-    }
-
-    public void setGaoDeApi(GaoDeApi gaoDeApi) {
-        this.gaoDeApi = gaoDeApi;
-    }
-    
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
@ -2,14 +2,12 @@ package org.jeecg.config;

 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

 /**
 * 设置静态参数初始化
 * @author: jeecg-boot
 */
-@Lazy(false)
@Component
@Data
 public class StaticConfig {
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@ -1,9 +1,8 @@
 //package org.jeecg.config;
 //
 //
-//import io.swagger.v3.oas.annotations.Operation;
+//import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 //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;
@ -19,13 +18,15 @@
 //import springfox.documentation.builders.ParameterBuilder;
 //import springfox.documentation.builders.PathSelectors;
 //import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.oas.annotations.EnableOpenApi;
 //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.WebFluxRequestHandlerProvider;
 //import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 //
 //import java.lang.reflect.Field;
 //import java.util.ArrayList;
@ -37,7 +38,8 @@
 // * @Author scott
 // */
 //@Configuration
-//@EnableSwagger2WebMvc
+//@EnableSwagger2    //开启 Swagger2
+//@EnableKnife4j     //开启 knife4j，可以不写
 //@Import(BeanValidatorPluginsConfiguration.class)
 //public class Swagger2Config implements WebMvcConfigurer {
 //
@ -95,14 +97,6 @@
 //        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;
 //    }
 //
@ -157,7 +151,7 @@
 //
 //            @Override
 //            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-//                if (bean instanceof WebMvcRequestHandlerProvider) {
+//                if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
 //                    customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
 //                }
 //                return bean;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
@ -68,15 +68,17 @@ public class Swagger3Config implements WebMvcConfigurer {
                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)))
+                    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))
-                        );
+                        pathItem.readOperations()
+                                .forEach(operation ->
+                                        operation.addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN))
+                                );
                    }
                });
            }
@ -88,7 +90,7 @@ public class Swagger3Config implements WebMvcConfigurer {
        return new OpenAPI()
                .info(new Info()
                        .title("JeecgBoot 后台服务API接口文档")
-                        .version("3.8.3")
+                        .version("3.8.0")
                        .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com"))
                        .description( "后台API接口")
                        .termsOfService("NO terms of service")
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
@ -0,0 +1,19 @@
+package org.jeecg.config;
+
+import io.undertow.server.DefaultByteBufferPool;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UndertowCustomizer implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
+    @Override
+    public void customize(UndertowServletWebServerFactory factory) {
+        factory.addDeploymentInfoCustomizers(deploymentInfo -> {
+            WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
+            webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(false, 1024));
+            deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
+        });
+    }
+}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
@ -10,19 +10,23 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
 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 io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectProvider;
 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.context.event.ApplicationReadyEvent;
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
 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.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@ -32,7 +36,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@ -58,14 +61,6 @@ 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、图片、视频、音频等
     */
@ -88,7 +83,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     */
    @Override
    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/").setViewName("redirect:/doc.html");
+        registry.addViewController("/").setViewName("doc.html");
    }

    @Bean
@ -154,17 +149,12 @@ public class WebMvcConfiguration implements WebMvcConfigurer {


    /**
-     * 监听应用启动完成事件，确保 PrometheusMeterRegistry 已经初始化
-     * for [QQYUN-12558]【监控】系统监控的头两个tab不好使，接口404
-     * @param event
-     * @author chenrui
-     * @date 2025/5/26 16:46
+     * 解决metrics端点不显示jvm信息的问题(zyf)
     */
-    @EventListener
-    public void onApplicationReady(ApplicationReadyEvent event) {
-        if(null != meterRegistryPostProcessor){
-            meterRegistryPostProcessor.postProcessAfterInitialization(prometheusMeterRegistry, "");
-        }
+    @Bean
+    @ConditionalOnBean(name = "meterRegistryPostProcessor")
+    InitializingBean forcePrometheusPostProcessor(BeanPostProcessor meterRegistryPostProcessor) {
+        return () -> meterRegistryPostProcessor.postProcessAfterInitialization(prometheusMeterRegistry, "");
    }

 //    /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
@ -3,8 +3,8 @@ package org.jeecg.config.filter;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper;

-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
@ -7,9 +7,9 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;

-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java
@ -8,14 +8,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
 public class LowCodeModeConfiguration implements WebMvcConfigurer {

-    private final LowCodeModeInterceptor lowCodeModeInterceptor;
-
-    public LowCodeModeConfiguration(LowCodeModeInterceptor lowCodeModeInterceptor) {
-        this.lowCodeModeInterceptor = lowCodeModeInterceptor;
+    public LowCodeModeInterceptor payInterceptor() {
+        return new LowCodeModeInterceptor();
    }

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(lowCodeModeInterceptor).addPathPatterns(LowCodeUrlsEnum.getLowCodeInterceptUrls());
+        registry.addInterceptor(payInterceptor()).addPathPatterns(LowCodeUrlsEnum.getLowCodeInterceptUrls());
    }
 }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
@ -11,12 +11,12 @@ 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.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Set;
@ -38,7 +38,6 @@ import java.util.Set;
 * @date 20230904
 */
@Slf4j
-@Component
 public class LowCodeModeInterceptor implements HandlerInterceptor {
    /**
     * 低代码开发模式
@ -48,22 +47,18 @@ 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());
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
@ -1,16 +1,11 @@
 package org.jeecg.config.mybatis;

+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.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
-import lombok.extern.slf4j.Slf4j;
-import me.zhyd.oauth.log.Log;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import org.jeecg.common.config.TenantContext;
@ -20,27 +15,24 @@ 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;

-import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+

 /**
 * 单数据源配置（jeecg.datasource.open = false时生效）
 * @Author zhoujf
 *
 */
-@Slf4j
@Configuration
@MapperScan(value={"org.jeecg.**.mapper*"})
 public class MybatisPlusSaasConfig {
-    @Autowired
-    private DataSource dataSource;
-    
+
    /**
     * 是否开启系统模块的租户隔离
     *  控制范围：用户、角色、部门、我的部门、字典、分类字典、多数据源、职务、通知公告
@ -130,23 +122,7 @@ public class MybatisPlusSaasConfig {
        //update-begin-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
        interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor());
        //update-end-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
-        
-        //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报表报错---
-        
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
        //【jeecg-boot/issues/3847】增加@Version乐观锁支持 
        interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
        return interceptor;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
@ -11,7 +11,7 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.config.mybatis.ThreadLocalDataHelper;
 import org.springframework.stereotype.Component;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
@ -6,8 +6,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 /**
 * 动态数据源切换拦截器
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
@ -1,5 +1,6 @@
 package org.jeecg.config.oss;

+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.SymbolConstant;
@ -8,13 +9,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;

 /**
 * Minio文件上传配置文件
 * @author: jeecg-boot
 */
-@Lazy(false)
@Slf4j
@Configuration
@ConditionalOnProperty(prefix = "jeecg.minio", name = "minio_url")
@ -28,7 +27,7 @@ public class MinioConfig {
    @Value(value = "${jeecg.minio.bucketName}")
    private String bucketName;

-    @Bean
+    @PostConstruct
    public void initMinio(){
        if(!minioUrl.startsWith(CommonConstant.STR_HTTP)){
            minioUrl = "http://" + minioUrl;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
@ -1,17 +1,16 @@
 package org.jeecg.config.oss;

+import jakarta.annotation.PostConstruct;
 import org.jeecg.common.util.oss.OssBootUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;

 /**
 * 云存储 配置
 * @author: jeecg-boot
 */
-@Lazy(false)
@Configuration
@ConditionalOnProperty(prefix = "jeecg.oss", name = "endpoint")
 public class OssConfiguration {
@ -28,7 +27,7 @@ public class OssConfiguration {
    private String staticDomain;


-    @Bean
+    @PostConstruct
    public void initOssBootConfiguration() {
        OssBootUtil.setEndPoint(endpoint);
        OssBootUtil.setAccessKeyId(accessKeyId);
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@ -1,5 +1,8 @@
 package org.jeecg.config.shiro;

+import jakarta.annotation.Resource;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
@ -8,6 +11,7 @@ import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.spring.web.ShiroUrlPathHelper;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.crazycake.shiro.*;
 import org.jeecg.common.constant.CommonConstant;
@ -17,25 +21,20 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean;
 import org.jeecg.config.shiro.filters.JwtFilter;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.*;
-import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.env.Environment;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.web.filter.DelegatingFilterProxy;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisCluster;

-import javax.annotation.Resource;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import java.lang.reflect.Method;
 import java.util.*;

 /**
@ -46,6 +45,7 @@ import java.util.*;

@Slf4j
@Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ShiroConfig {

    @Resource
@ -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");
@ -126,7 +126,6 @@ public class ShiroConfig {
        filterChainDefinitionMap.put("/**/*.ttf", "anon");
        filterChainDefinitionMap.put("/**/*.woff", "anon");
        filterChainDefinitionMap.put("/**/*.woff2", "anon");
-
        filterChainDefinitionMap.put("/**/*.glb", "anon");
        filterChainDefinitionMap.put("/**/*.wasm", "anon");
        //update-end--Author:scott Date:20221116 for：排除静态资源后缀
@ -154,11 +153,7 @@ 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("/drag/onlDragDatasetHead/queryAllById", "anon");
        filterChainDefinitionMap.put("/jimubi/view", "anon");
        filterChainDefinitionMap.put("/jimubi/share/view/**", "anon");

@ -174,12 +169,6 @@ 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");
-        //App vue3版本查询版本接口
-        filterChainDefinitionMap.put("/sys/version/app3version", "anon");

        //性能监控——安全隐患泄露TOEKN（durid连接池也有）
        //filterChainDefinitionMap.put("/actuator/**", "anon");
@ -191,6 +180,8 @@ public class ShiroConfig {
        // 企业微信证书排除
        filterChainDefinitionMap.put("/WW_verify*", "anon");

+        filterChainDefinitionMap.put("/openapi/call/**", "anon");
+
        // 添加自己的过滤器并且取名为jwt
        Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
        //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
@ -230,8 +221,6 @@ public class ShiroConfig {
        registration.addUrlPatterns("/airag/flow/debug");
        registration.addUrlPatterns("/airag/chat/send");
        registration.addUrlPatterns("/airag/app/debug");
-        registration.addUrlPatterns("/airag/app/prompt/generate");
-        registration.addUrlPatterns("/airag/chat/receive/**");
        //支持异步
        registration.setAsyncSupported(true);
        registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);
@ -331,7 +320,7 @@ public class ShiroConfig {

            return sentinelManager;
        }
-        
+
        // redis 单机支持，在集群为空，或者集群无机器时候使用 add by jzyadmin@163.com
        if (lettuceConnectionFactory.getClusterConfiguration() == null || lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().isEmpty()) {
            RedisManager redisManager = new RedisManager();
@ -364,6 +353,18 @@ public class ShiroConfig {
        return manager;
    }

+    /**
+     * 解决 ShiroRequestMappingConfig 获取 requestMappingHandlerMapping Bean 冲突
+     * spring-boot-autoconfigure:3.4.5 和 spring-boot-actuator-autoconfigure:3.4.5
+     */
+    @Primary
+    @Bean
+    public RequestMappingHandlerMapping overridedRequestMappingHandlerMapping() {
+        RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping();
+        mapping.setUrlPathHelper(new ShiroUrlPathHelper());
+        return mapping;
+    }
+
    private List<String> rebuildUrl(String[] bases, String[] uris) {
        List<String> urls = new ArrayList<>();
        for (String base : bases) {
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
@ -20,11 +20,13 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Set;

 /**
@ -35,6 +37,7 @@ import java.util.Set;
 */
@Component
@Slf4j
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ShiroRealm extends AuthorizingRealm {
 	@Lazy
    @Resource
@ -106,8 +109,8 @@ public class ShiroRealm extends AuthorizingRealm {
        try {
            loginUser = this.checkUserTokenIsEffect(token);
        } catch (AuthenticationException e) {
-            log.error("—————校验 check token 失败——————————"+ e.getMessage(), e);
            JwtUtil.responseError(SpringContextUtils.getHttpServletResponse(),401,e.getMessage());
+            e.printStackTrace();
            return null;
        }
        return new SimpleAuthenticationInfo(loginUser, token, getName());
@ -122,7 +125,7 @@ public class ShiroRealm extends AuthorizingRealm {
        // 解密获得username，用于和数据库进行对比
        String username = JwtUtil.getUsername(token);
        if (username == null) {
-            throw new AuthenticationException("Token非法无效!");
+            throw new AuthenticationException("token非法无效!");
        }

        // 查询用户信息
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
@ -12,7 +12,7 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter;
 import org.apache.shiro.mgt.SecurityManager;
 import org.springframework.beans.factory.BeanInitializationException;

-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.util.Map;

 /**
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
@ -13,10 +13,10 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;

-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 /**
 * @Description: 鉴权登录拦截器
@ -56,7 +56,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
            executeLogin(request, response);
            return true;
        } catch (Exception e) {
-            JwtUtil.responseError((HttpServletResponse)response,401,CommonConstant.TOKEN_IS_INVALID_MSG);
+            JwtUtil.responseError(response,401,CommonConstant.TOKEN_IS_INVALID_MSG);
            return false;
            //throw new AuthenticationException("Token失效，请重新登录", e);
        }
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
@ -1,9 +1,9 @@
 package org.jeecg.config.shiro.filters;

-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import lombok.extern.slf4j.Slf4j;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java
@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;

 /**
 * 签名 拦截器配置
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java
@ -4,8 +4,8 @@ package org.jeecg.config.sign.interceptor;
 import java.io.PrintWriter;
 import java.util.SortedMap;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java
@ -1,10 +1,10 @@
 package org.jeecg.config.sign.util;

-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.io.*;
 import java.nio.charset.Charset;

--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java
@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.SymbolConstant;
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/GaoDeApi.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/GaoDeApi.java
@ -1,17 +0,0 @@
-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;
-}
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
@ -14,8 +14,8 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.stereotype.Service;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.*;

 /**
--- a/Show More
+++ b/Show More