【issues/7561】主题切换为顶部混合模式时，页面顶部内容显示不出来，被遮盖

使seata直接与springboot datasource挂钩

.gitattributes

@@ -1,5 +1,5 @@
 *.js linguist-language=Java
 *.css linguist-language=Java
-*.html linguist-language=Java
-*.vue linguist-language=Java
+*.ts linguist-language=vue
+*.html linguist-language=vue
 *.sql linguist-language=Java

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,16 @@
 ##### 版本号：
 
+
 ##### 问题描述：
 
+
+
 ##### 错误截图：
 
 
 
 
 #### 友情提示：
-  - 未按格式要求发帖、描述过于简抽象的，会被直接删掉；
-  - 请确保问题描述清楚，方便我们理解并一次性调查解决问题；
-  - 如果使用的不是master，请说明你使用的那个分支
+  - 未按格式要求发帖、描述过于简单的，会被直接删掉;
+  - 描述问题请图文并茂，方便我们理解并快速定位问题;
+  - 如果使用的不是master，请说明你使用的分支;

LICENSE

@@ -201,16 +201,13 @@
    limitations under the License.
    
    In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
-
-  开源协议补充
-    JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
-    本软件受适用的国家软件著作权法（包括国际条约）和双重保护许可。
-  
-   1.允许基于本平台软件开展业务系统开发。
-   2.JeecgBoot底层依赖的非开源功能：online lib依赖、仪表盘lib依赖等，统一采用LGPL开源协议（不二次改造、不拆分出jeecgboot之外使用，就不产生侵权）
-   3.不得基于该平台软件的基础，修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售，或与JeecgBoot参与同类软件产品市场的竞争。
-	 违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
-	 
-     总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
-	 解释权归：http://www.jeecg.com
-	 
+   
+   JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
+   本软件受适用的国家软件著作权法（包括国际条约）和开源协议 双重保护许可。
+   
+   开源协议中文释意如下：
+   1.JeecgBoot开源版本无任何限制，在遵循本开源协议条款下，允许商用使用，不会造成侵权行为。
+   2.允许基于本平台软件开展业务系统开发。
+   3.在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件。
+   
+   最终解释权归：http://www.jeecg.com

README-EN.md

@@ -7,13 +7,12 @@
 JEECG BOOT Low Code Development Platform
 ===============
 
-当前最新版本： 3.7.0（发布日期：2024-06-17） 
+Current version: 3.7.2 (Release date: 2024-12-12)
 
 
 [![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/Blog-blog-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.7.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.7.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -39,9 +38,6 @@ Technical support
 
 Problems or bugs in use can be found in [Making on the Issues](https://github.com/jeecgboot/JeecgBoot/issues/new)
 
-Official Support: http://jeecg.com/doc/help
-
-
 
 ##### Project description
 
@@ -64,14 +60,11 @@ For the project
 Jeecg-Boot low code development platform can be applied in the development of any J2EE project, especially for SAAS projects, enterprise information management system (MIS), internal office system (OA), enterprise resource planning system (ERP), customer relationship management system (CRM), etc. Its semi-intelligent manual Merge development method, Can significantly improve the development efficiency of more than 70%, greatly reduce the development cost.
 
 
-
-Docker starts the project
+Starts the project
 -----------------------------------
 
-- [Docker starts the monomer background](https://help.jeecg.com/java/setup/docker/up.html)
-- [Docker starts the front-end](http://help.jeecg.com/publish/docker.html)
-- [Docker starts the micro-service background](https://help.jeecg.com/java/springcloud/docker.html)
-- [ChatGPT AI Config](https://help.jeecg.com/java/chatgpt.html)
+- [IDEA Quick start](https://help.jeecg.com/java/setup/idea/startup.html)
+- [Docker Quick start](https://help.jeecg.com/java/docker/quick.html)
 
 
 
@@ -79,12 +72,14 @@ Technical documentation
 -----------------------------------
 
 - Website：  [http://www.jeecg.com](http://www.jeecg.com)
-- Doc：  [http://help.jeecg.com](http://help.jeecg.com)
-- Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart)  |  [video](https://space.bilibili.com/454617261/channel/series) |   [Q&A ](http://www.jeecg.com/doc/qa)  |   [help](http://jeecg.com/doc/help) |  [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
-- Microservice Development：  [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
-- QQ group ： ⑨808791225、⑧825232878、⑦791696430、⑥730954414(full)、683903138(full)、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
 - Demo ： [OnlineDemo](http://boot3.jeecg.com) | [APP](http://jeecg.com/appIndex)
-> [please click obtain account password to obtain](http://jeecg.com/doc/demo) 
+- Doc：  [http://help.jeecg.com](http://help.jeecg.com)
+- Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart) |   [Q&A ](http://www.jeecg.com/doc/qa)  |  [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
+- QQ group ： ⑩716488839、⑨808791225、⑧825232878、⑦791696430、⑥730954414(full)、683903138(full)、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
+
+
+
+
 
 
 Star charts
@@ -180,7 +175,7 @@ Technical Architecture:
 
 #### Development Environment
 
-- Language: Java 8+ (less than 17)
+- Language: Java 8+ (17)
 
 - IDE(JAVA) : IDEA (lombok plug-in must be installed)
 
@@ -190,20 +185,20 @@ Technical Architecture:
 
 - Cache: Redis
 
-- Database: MySQL5.7 + & Oracle 11 g & Sqlserver2017  [More Databases](https://my.oschina.net/jeecg/blog/4905722)
+- Database: MySQL5.7 + [More Databases](https://my.oschina.net/jeecg/blog/4905722)
 
 
 #### backend
 
-- Basic framework: Spring Boot 2.6.14
+- Basic framework: Spring Boot 2.7.18
 
 - Microservice framework: Spring Cloud Alibaba 2021.0.1.0
 
-- Persistence layer framework: MybatisPlus 3.5.1
+- Persistence layer framework: MybatisPlus 3.5.3.2
 
-- Report tool: JimuReport 1.5.8
+- Report tool: JimuReport 1.9.1
 
-- Security framework: Apache Shiro 1.10.0, Jwt 3.11.0
+- Security framework: Apache Shiro 1.12.0, Jwt 3.11.0
 
 - Microservice technology stack: Spring Cloud Alibaba, Nacos, Gateway, Sentinel, Skywalking
 
@@ -218,6 +213,12 @@ Technical Architecture:
 
 - TechnologyStack：`Vue3.0+TypeScript+Vite+AntDesignVue+pinia+echarts`
 
+#### Front-end environment requirements
+
+*    `Node.js 、npm 、pnpm`
+*   Node.js Version suggestion: `v20.15.0`
+ ` ( Since Vite5 no longer supports EOL Node.js 14/16/17/19, Node.js 18/20 + is now required )`
+ 
 #### Support library
 
 |  database   |  support   |
@@ -227,44 +228,29 @@ Technical Architecture:
 |  Sqlserver2017   |  √   |
 |   PostgreSQL   |  √   |
 |   MariaDB   |  √   |
-|   达梦、人大金仓   |  √   |
-
+|   达梦   |  √   |
+|   人大金仓   |  √   |
+|   TiDB   |  √   |
 
 
 ## Microservice solutions
 
-
-1. Service registration and discovery Nacos √
-
-2. Nacos √
-
-3. Route gateway gateway(Three loading modes) √
-
-4. Distributed http feign √
-
-5. fuse degrade current limiting Sentinel √
-
-6. Distributed files Minio and Alioss √
-
-7. Unified permission control
-
-8. Service monitoring SpringBootAdmin√
-
-9. link tracking Skywalking  [reference document](https://help.jeecg.com/java/springcloud/super/skywarking.html)
-
-10. Messaging middleware RabbitMQ √
-
-11. Distributed task xxl-job √
-
-12. Distributed Transaction Seata
-
-13. Distributed log elk + kafka
-
-14. Support docker-compose, k8s, jenkins
-
-15. CAS SSO √
-
-16. Route traffic limiting √
+- 1. Service registration and discovery Nacos √
+- 2. Nacos √
+- 3. Route gateway gateway(Three loading modes) √
+- 4. Distributed http feign √
+- 5. fuse degrade current limiting Sentinel √
+- 6. Distributed files Minio and Alioss √
+- 7. Unified permission control
+- 8. Service monitoring SpringBootAdmin√
+- 9. link tracking Skywalking  [reference document](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 10. Messaging middleware RabbitMQ √
+- 11. Distributed task xxl-job √
+- 12. Distributed Transaction Seata
+- 13. Distributed log Loki+grafana
+- 14. Support docker-compose, k8s, jenkins
+- 15. CAS SSO √
+- 16. Route traffic limiting √
 
    
 #### Microservice architecture diagram
@@ -273,157 +259,9 @@ Technical Architecture:
 ### Jeecg Boot product functionality blueprint
 ![功能蓝图](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
 
-
-
-
-### Function module
-```
-├─系统管理
-│  ├─用户管理
-│  ├─角色管理
-│  ├─菜单管理
-│  ├─权限设置（支持按钮权限、数据权限）
-│  ├─表单权限（控制字段禁用、隐藏）
-│  ├─部门管理
-│  ├─我的部门（二级管理员）
-│  └─字典管理
-│  └─分类字典
-│  └─系统公告
-│  └─职务管理
-│  └─通讯录
-│  └─多租户管理
-├─消息中心
-│  ├─消息管理
-│  ├─模板管理
-├─代码生成器(低代码)
-│  ├─代码生成器功能（一键生成前后端代码，生成后无需修改直接用，绝对是后端开发福音）
-│  ├─代码生成器模板（提供4套模板，分别支持单表和一对多模型，不同风格选择）
-│  ├─代码生成器模板（生成代码，自带excel导入导出）
-│  ├─查询过滤器（查询逻辑无需编码，系统根据页面配置自动生成）
-│  ├─高级查询器（弹窗自动组合查询条件）
-│  ├─Excel导入导出工具集成（支持单表，一对多 导入导出）
-│  ├─平台移动自适应支持
-├─系统监控
-│  ├─Gateway路由网关
-│  ├─性能扫描监控
-│  │  ├─监控 Redis
-│  │  ├─Tomcat
-│  │  ├─jvm
-│  │  ├─服务器信息
-│  │  ├─请求追踪
-│  │  ├─磁盘监控
-│  ├─定时任务
-│  ├─系统日志
-│  ├─消息中心（支持短信、邮件、微信推送等等）
-│  ├─数据日志（记录数据快照，可对比快照，查看数据变更情况）
-│  ├─系统通知
-│  ├─SQL监控
-│  ├─swagger-ui(在线接口文档)
-│─报表示例
-│  ├─曲线图
-│  └─饼状图
-│  └─柱状图
-│  └─折线图
-│  └─面积图
-│  └─雷达图
-│  └─仪表图
-│  └─进度条
-│  └─排名列表
-│  └─等等
-│─大屏模板
-│  ├─作战指挥中心大屏
-│  └─物流服务中心大屏
-│─常用示例
-│  ├─自定义组件
-│  ├─对象存储(对接阿里云)
-│  ├─JVXETable示例（各种复杂ERP布局示例）
-│  ├─单表模型例子
-│  └─一对多模型例子
-│  └─打印例子
-│  └─一对多TAB例子
-│  └─内嵌table例子
-│  └─常用选择组件
-│  └─异步树table
-│  └─接口模拟测试
-│  └─表格合计示例
-│  └─异步树列表示例
-│  └─一对多JEditable
-│  └─JEditable组件示例
-│  └─图片拖拽排序
-│  └─图片翻页
-│  └─图片预览
-│  └─PDF预览
-│  └─分屏功能
-│─封装通用组件	
-│  ├─行编辑表格JEditableTable
-│  └─省略显示组件
-│  └─时间控件
-│  └─高级查询
-│  └─用户选择组件
-│  └─报表组件封装
-│  └─字典组件
-│  └─下拉多选组件
-│  └─选人组件
-│  └─选部门组件
-│  └─通过部门选人组件
-│  └─封装曲线、柱状图、饼状图、折线图等等报表的组件（经过封装，使用简单）
-│  └─在线code编辑器
-│  └─上传文件组件
-│  └─验证码组件
-│  └─树列表组件
-│  └─表单禁用组件
-│  └─等等
-│─更多页面模板
-│  ├─各种高级表单
-│  ├─各种列表效果
-│  └─结果页面
-│  └─异常页面
-│  └─个人页面
-├─高级功能
-│  ├─系统编码规则
-│  ├─提供单点登录CAS集成方案
-│  ├─提供APP发布方案
-│  ├─集成Websocket消息通知机制
-├─Online在线开发(低代码)
-│  ├─Online在线表单 - 功能已开放
-│  ├─Online代码生成器 - 功能已开放
-│  ├─Online在线报表 - 功能已开放
-│  ├─Online在线图表(未开源)
-│  ├─Online图表模板配置(未开源)
-│  ├─Online布局设计(未开源)
-│  ├─多数据源管理 - 功能已开放
-├─积木报表设计器(低代码)
-│  ├─打印设计器
-│  ├─数据报表设计
-│  ├─图形报表设计（支持echart）
-│  ├─大屏设计器(未开源)
-│─流程模块功能 (未开源)
-│  ├─流程设计器
-│  ├─表单设计器
-   ├─大屏设计器
-   ├─门户设计/仪表盘设计器
-│  └─我的任务
-│  └─历史流程
-│  └─历史流程
-│  └─流程实例管理
-│  └─流程监听管理
-│  └─流程表达式
-│  └─我发起的流程
-│  └─我的抄送
-│  └─流程委派、抄送、跳转
-│  └─。。。
-│─OA办公组件 (未开源)
-│  ├─更多功能
-│  └─。。。
-└─其他模块
-   └─更多功能开发中。。
-   
-```
-
-
-
-
-
+### quick start
+- Microservice Development：  [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
+- [Docker starts the micro-service background](https://help.jeecg.com/java/docker/springcloud.html)
 
 
 ### Effect of system
@@ -470,10 +308,22 @@ Technical Architecture:
 ![](https://oscimg.oschina.net/oscnet/up-7f83b25159663686d67ed080eb16068c3b4.png)
 
 #####  dashboard Designer
-![](https://oscimg.oschina.net/oscnet/up-9c9d41288c31398d76b390bdd400f13a582.png)
+
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/darg20240726105556.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135626.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135619.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135630.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240726105547.png)
 
 ![](https://oscimg.oschina.net/oscnet/up-fad98d42b2cf92f92a903c9cff7579f18ec.png)
 
+
+
 ##### report Designer
 ![](https://oscimg.oschina.net/oscnet/up-64648de000851f15f6c7b9573d107ebb5f8.png)
 

README.md

@@ -2,15 +2,14 @@
 JeecgBoot 低代码开发平台
 ===============
 
-当前最新版本： 3.7.0（发布日期：2024-06-17） 
+当前最新版本： 3.7.2（发布日期：2024-12-12） 
 
 
-[![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/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.7.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)
+[![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/jeecgboot/JeecgBoot/blob/master/LICENSE)
+[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://guojusoft.com)
+[![](https://img.shields.io/badge/version-3.7.2-brightgreen.svg)](https://github.com/jeecgboot/JeecgBoot)
+[![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/jeecgboot/JeecgBoot)
+[![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/jeecgboot/JeecgBoot)
 
 
 
@@ -19,7 +18,7 @@ JeecgBoot 低代码开发平台
 
 <h3 align="center">Java Low Code Platform for Enterprise web applications</h3>
 
-JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端分离架构 SpringBoot2.x和3.x，SpringCloud，Ant Design&Vue，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot 引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
+JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端分离架构 SpringBoot2.x和3.x，SpringCloud，Ant Design Vue3，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot集成AI模型能力，引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
 
 JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零代码`：Online表单开发、Online报表、报表配置能力、在线图表设计、仪表盘设计、大屏设计、移动配置能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）等等！
 
@@ -34,68 +33,137 @@ JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零
 Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，支持信创国产化（默认适配达梦和人大金仓）。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
 
 
-
 #### 项目说明
 
 | 项目名                | 说明                     | 
 |--------------------|------------------------|
 | `jeecg-boot`    | 后端源码JAVA（SpringBoot微服务架构）        |
 | `jeecgboot-vue3` | 前端源码VUE3（vue3+vite5+ts最新技术栈）  |
-| `jeecg-uniapp` | APP框架,一份代码多终端适配，支持APP、小程序、H5 |
+| `jeecg-uniapp` | [配套APP框架](https://github.com/jeecgboot/jeecg-uniapp) 适配多个终端，支持APP、小程序、H5 |
 
 
-其他源码
+开源协议说明
 -----------------------------------
-- APP源码地址：https://github.com/jeecgboot/jeecg-uniapp
+JeecgBoot开源版本，底层完全开源可以自主开发，遵循Apache2.0协议，详细见 https://github.com/jeecgboot/JeecgBoot#Apache-2.0-1-ov-file
 
-
-技术支持
------------------------------------
-
-关闭gitee的issue通道，使用中遇到问题或者BUG可以在 [Github上提Issues](https://github.com/jeecgboot/JeecgBoot/issues/new)
-
-
-快速启动项目
------------------------------------
-
-- [前端项目快速启动](http://help.jeecg.com/setup/startup.html)
-- [通过IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
-
-
-
-Docker启动项目
------------------------------------
-
-- [Docker启动前端](http://help.jeecg.com/publish/docker.html)
-- [Docker启动后台](https://help.jeecg.com/java/setup/docker/up.html)
-
-
-微服务方式启动
------------------------------------
-
-- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
-- [Docker启动微服务后台](https://help.jeecg.com/java/springcloud/docker.html)
+开源协议中文释意如下：
+- 1.JeecgBoot开源版本无任何限制，在遵循本开源协议条款下，允许商用使用，不会造成侵权行为。
+- 2.允许基于本平台软件开展业务系统开发。
+- 3.在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件。
+- 4.针对企业用户我们也提供“企业级版本”，详细见 https://jeecg.com/vip
 
 
 技术文档
 -----------------------------------
 
-- 产品官网：  [http://www.jeecg.com](http://www.jeecg.com)
-- 开发文档：  [https://help.jeecg.com](https://help.jeecg.com)
-- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart)  |   [常见问题 ](http://www.jeecg.com/doc/qa) |  [视频教程](https://space.bilibili.com/454617261/channel/series)  |  [1分钟低代码体验](https://my.oschina.net/jeecg/blog/3083313) 
-- AI助手配置: https://help.jeecg.com/java/chatgpt.html
-
+- 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
 - 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
-> 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 
->
-- QQ交流群 ： ⑨808791225、⑧825232878、⑦791696430(满)、⑥730954414(满)、683903138(满)、⑤860162132(满)、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
+- 快速体验： [一分钟体验低代码](https://jeecg.blog.csdn.net/article/details/106079007?spm=1001.2014.3001.5502 "一分钟体验零代码") | [在线体验零代码](https://app.qiaoqiaoyun.com/myapps/index "在线体验零代码")
+- 开发文档：  [https://help.jeecg.com](https://help.jeecg.com)
+- 反馈问题：  [在Github上提Issues](https://github.com/jeecgboot/JeecgBoot/issues/new)
+- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [入门视频](http://jeecg.com/doc/video)
+- QQ交流群 ： ⑩716488839、⑨808791225(满)、其他(满)
+
+
+
+
+启动项目
+-----------------------------------
+
+- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
+- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick.html)
+
+
+技术架构：
+-----------------------------------
+
+#### 后端
+
+- IDE建议： IDEA (必须安装lombok插件 )
+- 语言：Java 8+ (支持17)
+- 依赖管理：Maven
+- 基础框架：Spring Boot 2.7.18
+- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
+- 持久层框架：MybatisPlus 3.5.3.2
+- 报表工具： JimuReport 1.9.1
+- 安全框架：Apache Shiro 1.12.0，Jwt 3.11.0
+- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
+- 数据库连接池：阿里巴巴Druid 1.1.22
+- 日志打印：logback
+- 缓存：Redis
+- 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
+- 默认数据库脚本：MySQL5.7+
+- [其他数据库，需要自己转](https://my.oschina.net/jeecg/blog/4905722)
+
+
+#### 前端
+
+- 前端IDE建议：WebStorm、Vscode
+- 采用 Vue3.0+TypeScript+Vite5+Ant-Design-Vue等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能
+- 最新技术栈：Vue3.0 + TypeScript + Vite5 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6
+- 依赖管理：node、npm、pnpm
+
+
+#### 前端环境要求
+
+*   本地环境安装 `Node.js 、npm 、pnpm`
+*   Node.js 版本建议`v20.15.0`，要求`Node 20+` 版本以上
+
+ ` ( 因为Vite5 不再支持已 EOL 的 Node.js 14 / 16 / 17 / 19，现在需要 Node.js 18 / 20+ )`
+
+
+#### 支持库
+
+|  数据库   |  支持   |
+| --- | --- |
+|   MySQL   |  √   |
+|  Oracle11g   |  √   |
+|  Sqlserver2017   |  √   |
+|   PostgreSQL   |  √   |
+|   MariaDB   |  √   |
+|   MariaDB   |  √   |
+|   达梦   |  √   |
+|   人大金仓   |  √   |
+|   TiDB     |  √   |
+
+ 
+## 微服务解决方案
+
+
+- 1、服务注册和发现 Nacos √
+- 2、统一配置中心 Nacos  √
+- 3、路由网关 gateway(三种加载方式) √
+- 4、分布式 http feign √
+- 5、熔断降级限流 Sentinel √
+- 6、分布式文件 Minio、阿里OSS √ 
+- 7、统一权限控制 JWT + Shiro √
+- 8、服务监控 SpringBootAdmin√
+- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 10、消息中间件 RabbitMQ  √
+- 11、分布式任务 xxl-job  √ 
+- 12、分布式事务 Seata
+- 13、轻量分布式日志 Loki+grafana套件
+- 14、支持 docker-compose、k8s、jenkins
+- 15、CAS 单点登录   √
+- 16、路由限流   √
+
+
+#### 微服务方式启动
+
+- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
+- [Docker一键启动微服务前后端](https://help.jeecg.com/java/docker/quickcloud.html)
+
+
+#### 微服务架构图
+![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "在这里输入图片标题")
+
 
 
 为什么选择JeecgBoot?
 -----------------------------------
-* 1.采用最新主流前后分离框架（Springboot+Mybatis+antd），容易上手; 代码生成器依赖性低,灵活的扩展能力，可快速实现二次开发;
+* 1.采用最新主流前后分离框架（Springboot+Mybatis+antd+vue3），容易上手; 代码生成器依赖性低,灵活的扩展能力，可快速实现二次开发;
 * 2.支持微服务SpringCloud Alibaba(Nacos、Gateway、Sentinel、Skywalking)，提供切换机制支持单体和微服务自由切换
-* 3.开发效率高,采用代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用；
+* 3.开发效率高,采用代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用；引入AI能力，支持自动建表等功能；
 * 4.代码生成器提供强大模板机制，支持自定义模板，目前提供四套风格模板（单表两套、树模型一套、一对多三套）
 * 5.代码生成器非常智能，在线业务建模、在线配置、所见即所得支持23种类控件，一键生成前后端代码，大幅度提升开发效率，不再为重复工作发愁。
 * 6.低代码能力：Online在线表单（无需编码，通过在线配置表单，实现表单的增删改查，支持单表、树、一对多、一对一等模型，实现人人皆可编码）
@@ -111,7 +179,7 @@ Docker启动项目
 * 16.页面校验自动生成(必须输入、数字校验、金额校验、时间空间等);
 * 17.支持SAAS服务模式，提供SaaS多租户架构方案。
 * 18.分布式文件服务，集成minio、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
-* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦等主流数据库。
+* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦、人大金仓等主流数据库。
 * 20.集成工作流flowable，并实现了只需在页面配置流程转向，可极大的简化bpm工作流的开发；用bpm的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的java代码；
 * 21.低代码能力：在线流程设计，采用开源flowable流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
 * 22.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
@@ -134,103 +202,8 @@ Docker启动项目
 * 39.支持菜单动态路由
 * 40.权限控制采用 RBAC（Role-Based Access Control，基于角色的访问控制）
 * 41.提供新行编辑表格JVXETable，轻松满足各种复杂ERP布局，拥有更高的性能、更灵活的扩展、更强大的功能
+* 42.提供仪表盘设计器，类大屏设计支持移动端，免费的数据可视化设计工具，支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表和门户设计；目前支持多种图表类型：柱形图、折线图、散点图、饼图、环形图、面积图、漏斗图、进度图、仪表盘、雷达图、地图等等；
 
- 
- 
- 
-技术架构：
------------------------------------
-#### 开发环境
-
-- 语言：Java 8+ (小于17)
-
-- IDE(JAVA)： IDEA (必须安装lombok插件 )
-
-- IDE(前端)： Vscode、WebStorm、IDEA
-
-- 依赖管理：Maven
-
-- 缓存：Redis
-
-- 数据库脚本：MySQL5.7+  （其他数据库，[需要自己转](https://my.oschina.net/jeecg/blog/4905722)）
-
-
-#### 后端
-
-- 基础框架：Spring Boot 2.6.14
-
-- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
-
-- 持久层框架：MybatisPlus 3.5.1
-
-- 报表工具： JimuReport 1.5.8
-
-- 安全框架：Apache Shiro 1.10.0，Jwt 3.11.0
-
-- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
-
-- 数据库连接池：阿里巴巴Druid 1.1.22
-
-- 日志打印：logback
-
-- 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
-
-
-#### 前端
-
-- 技术栈：`Vue3.0 + TypeScript + Vite5 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6` 等最新技术栈
-
-#### 支持库
-
-|  数据库   |  支持   |
-| --- | --- |
-|   MySQL   |  √   |
-|  Oracle11g   |  √   |
-|  Sqlserver2017   |  √   |
-|   PostgreSQL   |  √   |
-|   MariaDB   |  √   |
-|   达梦、人大金仓   |  √   |
-
-
-
-## 微服务解决方案
-
-
-1、服务注册和发现 Nacos √
-
-2、统一配置中心 Nacos  √
-
-3、路由网关 gateway(三种加载方式) √
-
-4、分布式 http feign √
-
-5、熔断降级限流 Sentinel √
-
-6、分布式文件 Minio、阿里OSS √ 
-
-7、统一权限控制 JWT + Shiro √
-
-8、服务监控 SpringBootAdmin√
-
-9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
-
-10、消息中间件 RabbitMQ  √
-
-11、分布式任务 xxl-job  √ 
-
-12、分布式事务 Seata
-
-13、分布式日志 elk + kafka
-
-14、支持 docker-compose、k8s、jenkins
-
-15、CAS 单点登录   √
-
-16、路由限流   √
-
-   
-#### 微服务架构图
-![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "在这里输入图片标题")
 
 ### Jeecg Boot 产品功能蓝图
 ![功能蓝图](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
@@ -238,6 +211,20 @@ Docker启动项目
 
 
 
+### 分支说明
+
+> 主干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
+ 
+ 
+
 ### 功能模块
 ```
 ├─Online在线开发(低代码)
@@ -378,38 +365,6 @@ Docker启动项目
 
 
 
-后台目录结构
------------------------------------
-```
-项目结构
-├─jeecg-boot-parent（父POM： 项目依赖、modules组织）
-│  ├─jeecg-boot-base-core（共通模块： 工具类、config、权限、查询过滤器、注解等）
-│  ├─jeecg-module-demo    示例代码
-│  ├─jeecg-module-system  System系统管理目录
-│  │  ├─jeecg-system-biz    System系统管理权限等功能
-│  │  ├─jeecg-system-start  System单体启动项目(8080）
-│  │  ├─jeecg-system-api    System系统管理模块对外api
-│  │  │  ├─jeecg-system-cloud-api   System模块对外提供的微服务接口
-│  │  │  ├─jeecg-system-local-api   System模块对外提供的单体接口
-│  ├─jeecg-server-cloud           --微服务模块
-     ├─jeecg-cloud-gateway       --微服务网关模块(9999)
-     ├─jeecg-cloud-nacos       --Nacos服务模块(8848)
-     ├─jeecg-system-cloud-start  --System微服务启动项目(7001)
-     ├─jeecg-demo-cloud-start    --Demo微服务启动项目(7002)
-     ├─jeecg-visual
-        ├─jeecg-cloud-monitor       --微服务监控模块 (9111)
-        ├─jeecg-cloud-xxljob        --微服务xxljob定时任务服务端 (9080)
-        ├─jeecg-cloud-sentinel     --sentinel服务端 (9000)
-        ├─jeecg-cloud-test           -- 微服务测试示例（各种例子）
-           ├─jeecg-cloud-test-more         -- 微服务测试示例（feign、熔断降级、xxljob、分布式锁）
-           ├─jeecg-cloud-test-rabbitmq     -- 微服务测试示例（rabbitmq）
-           ├─jeecg-cloud-test-seata          -- 微服务测试示例（seata分布式事务）
-           ├─jeecg-cloud-test-shardingsphere    -- 微服务测试示例（分库分表）
-```
-
-
-
-
 ### 系统效果
 
 ##### PC端
@@ -435,10 +390,20 @@ Docker启动项目
 
 
 #####  仪表盘设计器
-![](https://oscimg.oschina.net/oscnet/up-9c9d41288c31398d76b390bdd400f13a582.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/darg20240726105556.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135626.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135619.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240724135630.png)
+
+![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/drag20240726105547.png)
 
 ![](https://oscimg.oschina.net/oscnet/up-fad98d42b2cf92f92a903c9cff7579f18ec.png)
 
+
 ##### 报表设计器
 ![](https://oscimg.oschina.net/oscnet/up-64648de000851f15f6c7b9573d107ebb5f8.png)
 
@@ -521,11 +486,4 @@ Docker启动项目
 
 如果觉得还不错，请作者喝杯咖啡吧 ☺
 
-![](https://static.oschina.net/uploads/img/201903/08155608_0EFX.png)
-
-
-### 流程引擎推荐
-
-大家在使用本开源项目时，如果想进一步集成流程引擎，推荐结合贺波老师的书 [《深入Activiti流程引擎：核心原理与高阶实战》](https://item.m.jd.com/product/13928958.html?gx=RnAomTM2bmCImZxDqYAkVCoIHuIYVqc)
-
-<img src="https://jeecgos.oss-cn-beijing.aliyuncs.com/files/tuijian20231220161656.png" width="25%" height="auto">
+![](https://static.oschina.net/uploads/img/201903/08155608_0EFX.png)

docker-compose-cloud.yml

@@ -0,0 +1,135 @@
+version: '2'
+services:
+  jeecg-boot-mysql:
+    build:
+      context: ./jeecg-boot/db
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_HOST: '%'
+      TZ: Asia/Shanghai
+    restart: always
+    container_name: jeecg-boot-mysql
+    image: jeecg-boot-mysql
+    command:
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+      --max_allowed_packet=128M
+      --default-authentication-plugin=caching_sha2_password
+    ports:
+      - 3306:3306
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-redis:
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
+    ports:
+      - 6379:6379
+    restart: always
+    hostname: jeecg-boot-redis
+    container_name: jeecg-boot-redis
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-nacos:
+    restart: always
+    build:
+      context: ./jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos
+    ports:
+      - 8848:8848
+    container_name: jeecg-boot-nacos
+    depends_on:
+      - jeecg-boot-mysql
+    hostname: jeecg-boot-nacos
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-system:
+    depends_on:
+      - jeecg-boot-nacos
+    build:
+      context: ./jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start
+    container_name: jeecg-system-start
+    hostname: jeecg-boot-system
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-demo:
+    depends_on:
+      - jeecg-boot-nacos
+    build:
+      context: ./jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start
+    container_name: jeecg-demo-start
+    hostname: jeecg-boot-demo
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-gateway:
+    restart: on-failure
+    build:
+      context: ./jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway
+    ports:
+      - 9999:9999
+    depends_on:
+      - jeecg-boot-nacos
+      - jeecg-boot-system
+    container_name: jeecg-boot-gateway
+    hostname: jeecg-boot-gateway
+    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
+#  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-vue:
+    build:
+      context: ./jeecgboot-vue3
+    container_name: jeecgboot-vue3-nginx
+    image: jeecgboot-vue3
+    depends_on:
+      - jeecg-boot-system
+    networks:
+      - jeecg-boot
+    ports:
+      - 80:80
+
+networks:
+  jeecg-boot:
+    name: jeecg_boot

docker-compose.yml

@@ -2,13 +2,14 @@ version: '2'
 services:
   jeecg-boot-mysql:
     build:
-      context: ../db
+      context: ./jeecg-boot/db
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_ROOT_HOST: '%'
       TZ: Asia/Shanghai
     restart: always
     container_name: jeecg-boot-mysql
+    image: jeecg-boot-mysql
     command:
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
@@ -22,28 +23,41 @@ services:
       - jeecg-boot
 
   jeecg-boot-redis:
-    image: redis:5.0
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
     ports:
       - 6379:6379
     restart: always
-    container_name: jeecg-boot-redis
     hostname: jeecg-boot-redis
+    container_name: jeecg-boot-redis
     networks:
       - jeecg-boot
 
+  jeecg-boot-system:
+    build:
+      context: ./jeecg-boot/jeecg-module-system/jeecg-system-start
+    restart: on-failure
+    depends_on:
+      - jeecg-boot-mysql
+      - jeecg-boot-redis
+    container_name: jeecg-boot-system
+    image: jeecg-boot-system
+    hostname: jeecg-boot-system
+    ports:
+      - 8080:8080
+    networks:
+      - jeecg-boot
+  jeecg-vue:
+    build:
+      context: ./jeecgboot-vue3
+    container_name: jeecgboot-vue3-nginx
+    image: jeecgboot-vue3
+    depends_on:
+      - jeecg-boot-system
+    networks:
+      - jeecg-boot
+    ports:
+      - 80:80
 
 networks:
   jeecg-boot:
     name: 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

jeecg-boot/LICENSE

@@ -0,0 +1,213 @@
+    Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2019 <a href="http://www.jeecg.com">Jeecg Boot</a> All rights reserved.
+ 
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
+   In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
+   
+   JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
+   本软件受适用的国家软件著作权法（包括国际条约）和开源协议 双重保护许可。
+   
+   开源协议中文释意如下：
+   1.JeecgBoot开源版本无任何限制，在遵循本开源协议条款下，允许商用使用，不会造成侵权行为。
+   2.允许基于本平台软件开展业务系统开发。
+   3.在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件。
+   
+   最终解释权归：http://www.jeecg.com

jeecg-boot/README.md

@@ -0,0 +1,165 @@
+
+JeecgBoot 低代码开发平台
+===============
+
+当前最新版本： 3.7.2（发布日期：2024-12-12） 
+
+
+[![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
+[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
+[![](https://img.shields.io/badge/version-3.7.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
+[![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
+
+
+
+项目介绍
+-----------------------------------
+
+<h3 align="center">Java Low Code Platform for Enterprise web applications</h3>
+
+JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端分离架构 SpringBoot2.x和3.x，SpringCloud，Ant Design Vue3，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot 引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
+
+
+#### 项目说明
+
+| 项目名                | 说明                     | 
+|--------------------|------------------------|
+| `jeecg-boot`    | 后端源码JAVA（SpringBoot微服务架构）        |
+| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite5+ts最新技术栈）  |
+
+
+
+技术文档
+-----------------------------------
+
+- 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
+- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart)
+- QQ交流群 ： ⑩716488839、⑨808791225、其他(满)
+- 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
+> 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 
+
+
+
+启动项目
+-----------------------------------
+
+- [IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
+- [Docker一键启动前后端](https://help.jeecg.com/java/docker/quick.html)
+
+
+微服务启动
+-----------------------------------
+- [单体快速切换微服务](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
+- [Docker启动微服务后台](https://help.jeecg.com/java/docker/springcloud.html)
+
+
+
+技术架构：
+-----------------------------------
+
+#### 后端
+
+- IDE建议： IDEA (必须安装lombok插件 )
+- 语言：Java 8+ (支持17)
+- 依赖管理：Maven
+- 基础框架：Spring Boot 2.7.18
+- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
+- 持久层框架：MybatisPlus 3.5.3.2
+- 报表工具： JimuReport 1.8.1
+- 安全框架：Apache Shiro 1.12.0，Jwt 3.11.0
+- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
+- 数据库连接池：阿里巴巴Druid 1.1.22
+- 日志打印：logback
+- 缓存：Redis
+- 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
+- 默认数据库脚本：MySQL5.7+
+- [其他数据库，需要自己转](https://my.oschina.net/jeecg/blog/4905722)
+
+
+#### 前端
+
+- 前端IDE建议：WebStorm、Vscode
+- 采用 Vue3.0+TypeScript+Vite+Ant-Design-Vue等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能
+- 最新技术栈：Vue3.0 + TypeScript + Vite5 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6
+- 依赖管理：node、npm、pnpm
+
+
+
+#### 支持库
+
+|  数据库   |  支持   |
+| --- | --- |
+|   MySQL   |  √   |
+|  Oracle11g   |  √   |
+|  Sqlserver2017   |  √   |
+|   PostgreSQL   |  √   |
+|   MariaDB   |  √   |
+|   达梦   |  √   |
+|   人大金仓   |  √   |
+|   TiDB   |  √   |
+
+
+
+ 
+## 微服务解决方案
+
+
+- 1、服务注册和发现 Nacos √
+- 2、统一配置中心 Nacos  √
+- 3、路由网关 gateway(三种加载方式) √
+- 4、分布式 http feign √
+- 5、熔断降级限流 Sentinel √
+- 6、分布式文件 Minio、阿里OSS √ 
+- 7、统一权限控制 JWT + Shiro √
+- 8、服务监控 SpringBootAdmin√
+- 9、链路跟踪 Skywalking   [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
+- 10、消息中间件 RabbitMQ  √
+- 11、分布式任务 xxl-job  √ 
+- 12、分布式事务 Seata
+- 13、轻量分布式日志 Loki+grafana套件
+- 14、支持 docker-compose、k8s、jenkins
+- 15、CAS 单点登录   √
+- 16、路由限流   √
+
+
+
+后台目录结构
+-----------------------------------
+```
+项目结构
+├─jeecg-boot-parent（父POM： 项目依赖、modules组织）
+│  ├─jeecg-boot-base-core（共通模块： 工具类、config、权限、查询过滤器、注解等）
+│  ├─jeecg-module-demo    示例代码
+│  ├─jeecg-module-system  System系统管理目录
+│  │  ├─jeecg-system-biz    System系统管理权限等功能
+│  │  ├─jeecg-system-start  System单体启动项目(8080）
+│  │  ├─jeecg-system-api    System系统管理模块对外api
+│  │  │  ├─jeecg-system-cloud-api   System模块对外提供的微服务接口
+│  │  │  ├─jeecg-system-local-api   System模块对外提供的单体接口
+│  ├─jeecg-server-cloud           --微服务模块
+     ├─jeecg-cloud-gateway       --微服务网关模块(9999)
+     ├─jeecg-cloud-nacos       --Nacos服务模块(8848)
+     ├─jeecg-system-cloud-start  --System微服务启动项目(7001)
+     ├─jeecg-demo-cloud-start    --Demo微服务启动项目(7002)
+     ├─jeecg-visual
+        ├─jeecg-cloud-monitor       --微服务监控模块 (9111)
+        ├─jeecg-cloud-xxljob        --微服务xxljob定时任务服务端 (9080)
+        ├─jeecg-cloud-sentinel     --sentinel服务端 (9000)
+        ├─jeecg-cloud-test           -- 微服务测试示例（各种例子）
+           ├─jeecg-cloud-test-more         -- 微服务测试示例（feign、熔断降级、xxljob、分布式锁）
+           ├─jeecg-cloud-test-rabbitmq     -- 微服务测试示例（rabbitmq）
+           ├─jeecg-cloud-test-seata          -- 微服务测试示例（seata分布式事务）
+           ├─jeecg-cloud-test-shardingsphere    -- 微服务测试示例（分库分表）
+```
+
+
+
+
+#### 微服务架构图
+![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot_springcloud2022.png "在这里输入图片标题")
+
+
+
+
+

jeecg-boot/db/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:8.0.19
+FROM registry.cn-hangzhou.aliyuncs.com/jeecgdocker/mysql:8.0.19
 
 MAINTAINER jeecgos@163.com
 

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.兼容问题
  每次发版，会针对不兼容地方重点说明。

jeecg-boot/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - jeecg-boot
 
   jeecg-boot-redis:
-    image: redis:5.0
+    image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
     ports:
       - 6379:6379
     restart: always

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-core</artifactId>
@@ -149,7 +149,7 @@
 		<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 -->

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

@@ -84,6 +84,12 @@ public class MessageDTO implements Serializable {
      * 邮件抄送地址
      */
     protected Set<String> ccEmailList;
+
+    /**
+     * 是否为定时任务推送email
+     */
+    private Boolean isTimeJob = false;
+    
     //---【邮件相关参数】-------------------------------------------------------------
     
     public MessageDTO(){

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

@@ -144,7 +144,9 @@ public interface CommonConstant {
      */
     String STATUS_0 = "0";
     String STATUS_1 = "1";
-    
+    Integer STATUS_0_INT = 0;
+    Integer STATUS_1_INT = 1;
+
     /**
      * 同步工作流引擎1同步0不同步
      */
@@ -475,6 +477,11 @@ public interface CommonConstant {
      */
     String FILE_EDITABLE = "editable";
 
+    /**
+     * 文件 只读
+     */
+    String FILE_READONLY = "readonly";
+
     /**
      * 登录失败，用于记录失败次数的key
      */
@@ -597,6 +604,11 @@ public interface CommonConstant {
     */
    String CHANGE_PHONE_REDIS_KEY_PRE = "sys:cache:phone:change_phone_msg:";
 
+  /**
+   * 手机号短信验证码redis-key的前缀
+   */
+   String LOG_OFF_PHONE_REDIS_KEY_PRE = "sys:cache:phone:qqy_log_off_user_msg:";
+
     /**
      * 缓存用户最后一次收到消息通知的时间 KEY
      */

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

@@ -1,6 +1,7 @@
 package org.jeecg.common.constant;
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -22,26 +23,30 @@ public class ProvinceCityArea {
     List<Area> areaList;
 
     public String getText(String code){
-        this.initAreaList();
-        if(this.areaList!=null || this.areaList.size()>0){
-            List<String> ls = new ArrayList<String>();
-            getAreaByCode(code,ls);
-            return String.join("/",ls);
+        if(StringUtils.isNotBlank(code)){
+            this.initAreaList();
+            if(this.areaList!=null || this.areaList.size()>0){
+                List<String> ls = new ArrayList<String>();
+                getAreaByCode(code,ls);
+                return String.join("/",ls);
+            }
         }
         return "";
     }
 
     public String getCode(String text){
-        this.initAreaList();
-        if(areaList!=null && areaList.size()>0){
-            for(int i=areaList.size()-1;i>=0;i--){
-                //update-begin-author:taoyan date:2022-5-24 for:VUEN-1088 online 导入 省市区导入后 导入数据错乱 北京市/市辖区/西城区-->山西省/晋城市/城区
-                String areaText = areaList.get(i).getText();
-                String cityText = areaList.get(i).getAheadText();
-                if(text.indexOf(areaText)>=0 && (cityText!=null && text.indexOf(cityText)>=0)){
-                    return areaList.get(i).getId();
+        if(StringUtils.isNotBlank(text)){
+            this.initAreaList();
+            if(areaList!=null && areaList.size()>0){
+                for(int i=areaList.size()-1;i>=0;i--){
+                    //update-begin-author:taoyan date:2022-5-24 for:VUEN-1088 online 导入 省市区导入后 导入数据错乱 北京市/市辖区/西城区-->山西省/晋城市/城区
+                    String areaText = areaList.get(i).getText();
+                    String cityText = areaList.get(i).getAheadText();
+                    if(text.indexOf(areaText)>=0 && (cityText!=null && text.indexOf(cityText)>=0)){
+                        return areaList.get(i).getId();
+                    }
+                    //update-end-author:taoyan date:2022-5-24 for:VUEN-1088 online 导入 省市区导入后 导入数据错乱 北京市/市辖区/西城区-->山西省/晋城市/城区
                 }
-                //update-end-author:taoyan date:2022-5-24 for:VUEN-1088 online 导入 省市区导入后 导入数据错乱 北京市/市辖区/西城区-->山西省/晋城市/城区
             }
         }
         return null;

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

@@ -15,15 +15,7 @@ public enum DySmsEnum {
 	/**修改密码短信模板编码*/
 	CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"),
 	/**注册账号短信模板编码*/
-	REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","code"),
-	/**会议通知*/
-	MEET_NOTICE_TEMPLATE_CODE("SMS_201480469","JEECG","username,title,minute,time"),
-	/**我的计划通知*/
-	PLAN_NOTICE_TEMPLATE_CODE("SMS_201470515","JEECG","username,title,time"),
-	/**支付成功短信通知*/
-	PAY_SUCCESS_NOTICE_CODE("SMS_461735163","敲敲云","realname,money,endTime"),
-	/**会员到期通知提醒*/
-	VIP_EXPIRE_NOTICE_CODE("SMS_461885023","敲敲云","realname,endTime");
+	REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","code");
 
 	/**
 	 * 短信模板编码

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

@@ -104,7 +104,7 @@ public class JeecgBootExceptionHandler {
 	@ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
 	public Result<?> handleAuthorizationException(AuthorizationException e){
 		log.error(e.getMessage(), e);
-		return Result.noauth("没有权限，请联系管理员授权，后刷新缓存!");
+		return Result.noauth("没有权限，请联系管理员分配权限！");
 	}
 
 	@ExceptionHandler(Exception.class)

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

@@ -746,7 +746,11 @@ public class QueryGenerator {
 	private static boolean judgedIsUselessField(String name) {
 		return "class".equals(name) || "ids".equals(name)
 				|| "page".equals(name) || "rows".equals(name)
-				|| "sort".equals(name) || "order".equals(name);
+//// update-begin--author:sunjianlei date:20240808 for：【TV360X-2009】取消过滤 sort、order 字段，防止前端排序报错 ------
+//// https://github.com/jeecgboot/JeecgBoot/issues/6937
+//				|| "sort".equals(name) || "order".equals(name)
+//// update-end----author:sunjianlei date:20240808 for：【TV360X-2009】取消过滤 sort、order 字段，防止前端排序报错 ------
+				;
 	}
 
 	
@@ -801,7 +805,9 @@ public class QueryGenerator {
 					addEasyQuery(queryWrapper, name, rule, DateUtils.str2Date(dateStr,DateUtils.datetimeFormat.get()));
 				}
 			}else {
-				addEasyQuery(queryWrapper, name, rule, NumberUtils.parseNumber(dataRule.getRuleValue(), propertyType));
+				//update-begin---author:chenrui ---date:20241125  for：[issues/7481]多租户模式下 数据权限使用变量：#{tenant_id} 报错------------
+				addEasyQuery(queryWrapper, name, rule, NumberUtils.parseNumber(converRuleValue(dataRule.getRuleValue()), propertyType));
+				//update-end---author:chenrui ---date:20241125  for：[issues/7481]多租户模式下 数据权限使用变量：#{tenant_id} 报错------------
 			}
 		}
 	}
@@ -834,6 +840,9 @@ public class QueryGenerator {
 	public static String getSqlRuleValue(String sqlRule){
 		try {
 			Set<String> varParams = getSqlRuleParams(sqlRule);
+			if (varParams == null || varParams.isEmpty()) {
+				return sqlRule;
+			}
 			for(String var:varParams){
 				String tempValue = converRuleValue(var);
 				sqlRule = sqlRule.replace("#{"+var+"}",tempValue);

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

@@ -54,8 +54,10 @@ public enum QueryRuleEnum {
     NOT_EMPTY("NOT_EMPTY","not_empty","值不为空"),
     /**查询规则 不包含*/
     NOT_IN("NOT_IN","not_in","不包含"),
-    /**查询规则 多词匹配*/
+    /**查询规则 多词精确匹配*/
     ELE_MATCH("ELE_MATCH","elemMatch","多词匹配"),
+    /**查询规则 多词精确不匹配*/
+    ELE_NOT_MATCH("ELE_NOT_MATCH","elemNotMatch","多词精确不匹配"),
     /**查询规则 范围查询*/
     RANGE("RANGE","range","范围查询"),
     /**查询规则 不在范围内查询*/

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

@@ -63,7 +63,7 @@ public class JwtUtil {
             os.flush();
             os.close();
         } catch (IOException e) {
-            e.printStackTrace();
+			log.error(e.getMessage(), e);
         }
     }
 
@@ -82,7 +82,8 @@ public class JwtUtil {
 			// 效验TOKEN
 			DecodedJWT jwt = verifier.verify(token);
 			return true;
-		} catch (Exception exception) {
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
 			return false;
 		}
 	}
@@ -97,6 +98,7 @@ public class JwtUtil {
 			DecodedJWT jwt = JWT.decode(token);
 			return jwt.getClaim("username").asString();
 		} catch (JWTDecodeException e) {
+			log.warn(e.getMessage(), e);
 			return null;
 		}
 	}

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

@@ -1,5 +1,6 @@
 package org.jeecg.common.util;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -8,11 +9,15 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.enums.DySmsEnum;
+import org.jeecg.config.JeecgSmsTemplateConfig;
 import org.jeecg.config.StaticConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 /**
  * Created on 17/6/7.
  * 短信API产品的DEMO程序,工程中包含了一个SmsDemo类，直接通过
@@ -75,15 +80,33 @@ public class DySmsHelper {
         
         //验证json参数
         validateParam(templateParamJson,dySmsEnum);
+
+        //update-begin---author:wangshuai---date:2024-11-05---for:【QQYUN-9422】短信模板管理，阿里云---
+        String templateCode = dySmsEnum.getTemplateCode();
+        JeecgSmsTemplateConfig baseConfig = SpringContextUtils.getBean(JeecgSmsTemplateConfig.class);
+        if(baseConfig != null && CollectionUtil.isNotEmpty(baseConfig.getTemplateCode())){
+            Map<String, String> smsTemplate = baseConfig.getTemplateCode();
+            if(smsTemplate.containsKey(templateCode) && StringUtils.isNotEmpty(smsTemplate.get(templateCode))){
+                templateCode = smsTemplate.get(templateCode);   
+                logger.info("yml中读取短信code{}",templateCode);
+            }
+        }
+        //签名名称
+        String signName = dySmsEnum.getSignName();
+        if(baseConfig != null && StringUtils.isNotEmpty(baseConfig.getSignature())){
+            logger.info("yml中读取签名名称{}",baseConfig.getSignature());
+            signName = baseConfig.getSignature();
+        }
+        //update-end---author:wangshuai---date:2024-11-05---for:【QQYUN-9422】短信模板管理，阿里云---
         
         //组装请求对象-具体描述见控制台-文档部分内容
         SendSmsRequest request = new SendSmsRequest();
         //必填:待发送手机号
         request.setPhoneNumbers(phone);
         //必填:短信签名-可在短信控制台中找到
-        request.setSignName(dySmsEnum.getSignName());
+        request.setSignName(signName);
         //必填:短信模板-可在短信控制台中找到
-        request.setTemplateCode(dySmsEnum.getTemplateCode());
+        request.setTemplateCode(templateCode);
         //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
         request.setTemplateParam(templateParamJson.toJSONString());
         

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

@@ -0,0 +1,206 @@
+package org.jeecg.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.jeecg.common.exception.JeecgBootException;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @program: file
+ * @description: 文件下载
+ * @author: chenrui
+ * @date: 2019-05-24 16:34
+ **/
+@Slf4j
+public class FileDownloadUtils {
+
+    /**
+     * 单文件下载
+     *
+     * @param response
+     * @param storePath 下载文件储存地址
+     * @param fileName  文件名称
+     * @author: chenrui
+     * @date: 2019/5/24 17:10
+     */
+    public static void downloadFile(HttpServletResponse response, String storePath, String fileName) {
+        response.setCharacterEncoding("UTF-8");
+        File file = new File(storePath);
+        if (!file.exists()) {
+            throw new NullPointerException("Specified file not found");
+        }
+        if (fileName == null || fileName.isEmpty()) {
+            throw new NullPointerException("The file name can not null");
+        }
+        // 配置文件下载
+        response.setHeader("content-type", "application/octet-stream");
+        response.setContentType("application/octet-stream");
+        // 下载文件能正常显示中文
+        try {
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        } catch (UnsupportedEncodingException e) {
+            log.error(e.getMessage(), e);
+        }
+        // 实现文件下载
+        byte[] buffer = new byte[1024];
+        try (FileInputStream fis = new FileInputStream(file);
+             BufferedInputStream bis = new BufferedInputStream(fis);) {
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 多文件下载
+     *
+     * @param filesPath   下载文件集合
+     * @param zipFileName 多文件合称名
+     * @author: chenrui
+     * @date: 2019/5/24 17:48
+     */
+    public static void downloadFileMulti(HttpServletResponse response, List<String> filesPath, String zipFileName) throws IOException {
+        //设置压缩包的名字
+        String downloadName = zipFileName + ".zip";
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("content-type", "application/octet-stream");
+        response.setContentType("application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(downloadName, "UTF-8"));
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+
+        log.info("开始压缩文件:" + filesPath);
+        //设置压缩流：直接写入response，实现边压缩边下载
+        try (ZipOutputStream zipOut = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
+             DataOutputStream os = new DataOutputStream(zipOut);) {
+            //设置压缩方法
+            zipOut.setMethod(ZipOutputStream.DEFLATED);
+            for (String filePath : filesPath) {
+                //循环将文件写入压缩流
+                File file = new File(filePath);
+                if (file.exists()) {
+                    //添加ZipEntry，并ZipEntry中写入文件流也就是将文件压入zip文件的目录下
+                    String fileName = file.getName();
+                    zipOut.putNextEntry(new ZipEntry(fileName));
+                    //格式输出流文件
+
+                    InputStream is = Files.newInputStream(file.toPath());
+                    byte[] b = new byte[1024];
+                    int length;
+                    while ((length = is.read(b)) != -1) {
+                        os.write(b, 0, length);
+                    }
+                    is.close();
+                    zipOut.closeEntry();
+                }
+            }
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            throw new JeecgBootException(e);
+        }
+    }
+
+    /**
+     * 下载网络资源到磁盘
+     *
+     * @param fileUrl
+     * @param storePath
+     * @author chenrui
+     * @date 2024/1/19 10:09
+     */
+    public static String download2DiskFromNet(String fileUrl, String storePath) {
+        try {
+            URL url = new URL(fileUrl);
+            URLConnection conn = url.openConnection();
+            // 设置超时间为3秒
+            conn.setConnectTimeout(3 * 1000);
+            // 防止屏蔽程序
+            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+            // 确保目录存在
+            File file = ensureDestFileDir(storePath);
+            try (InputStream inStream = conn.getInputStream();
+                 FileOutputStream fs = new FileOutputStream(file);) {
+                int byteread;
+                byte[] buffer = new byte[1204];
+                while ((byteread = inStream.read(buffer)) != -1) {
+                    fs.write(buffer, 0, byteread);
+                }
+                return storePath;
+            } catch (IOException e) {
+                log.error(e.getMessage(), e);
+                throw new JeecgBootException(e);
+            }
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            throw new JeecgBootException(e);
+        }
+    }
+
+
+    /**
+     * 获取不重名的文件
+     *
+     * @param file
+     * @return
+     * @author chenrui
+     * @date 2017年5月24日下午6:29:13
+     * @version v0.0.1
+     */
+    public static File getUniqueFile(final File file) {
+        if (!file.exists()) {
+            return file;
+        }
+
+        File tmpFile = new File(file.getAbsolutePath());
+        File parentDir = tmpFile.getParentFile();
+        int count = 1;
+        String extension = FilenameUtils.getExtension(tmpFile.getName());
+        String baseName = FilenameUtils.getBaseName(tmpFile.getName());
+        do {
+            tmpFile = new File(parentDir, baseName + "(" + count++ + ")." + extension);
+        } while (tmpFile.exists());
+        return tmpFile;
+    }
+
+    /**
+     * 确保输出文件目录
+     *
+     * @param destFilePath
+     * @return
+     * @author: chenrui
+     * @date: 2019-05-21 16:49
+     */
+    private static File ensureDestFileDir(String destFilePath) {
+        File destFile = new File(destFilePath);
+        FileDownloadUtils.checkDirAndCreate(destFile.getParentFile());
+        return destFile;
+    }
+
+    /**
+     * 验证文件夹存在且创建目录
+     *
+     * @param dir
+     * @author chenrui
+     * @date 2017年5月24日下午6:29:24
+     * @version v0.0.1
+     */
+    public static void checkDirAndCreate(File dir) {
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+    }
+}

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

@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
 
 
 /**
@@ -42,6 +46,30 @@ public class FillRuleUtil {
                 if (params == null) {
                     params = new JSONObject();
                 }
+
+                HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+
+                // 解析 params 中的变量
+                // 优先级：queryString > 系统变量 > 默认值
+                for (String key : params.keySet()) {
+                    // 1. 判断 queryString 中是否有该参数，如果有就优先取值
+                    //noinspection ConstantValue
+                    if (request != null) {
+                        String parameter = request.getParameter(key);
+                        if (oConvertUtils.isNotEmpty(parameter)) {
+                            params.put(key, parameter);
+                            continue;
+                        }
+                    }
+
+                    String value = params.getString(key);
+                    // 2. 用于替换 系统变量的值 #{sys_user_code}
+                    if (value != null && value.contains(SymbolConstant.SYS_VAR_PREFIX)) {
+                        value = QueryGenerator.getSqlRuleValue(value);
+                        params.put(key, value);
+                    }
+                }
+
                 if (formData == null) {
                     formData = new JSONObject();
                 }

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

@@ -1,7 +1,9 @@
 package org.jeecg.common.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.pegdown.PegDownProcessor;
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
 import org.springframework.web.util.HtmlUtils;
 
 /**
@@ -36,8 +38,14 @@ public class HTMLUtils {
      * @return
      */
     public static String parseMarkdown(String markdownContent) {
-        PegDownProcessor pdp = new PegDownProcessor();
-        return pdp.markdownToHtml(markdownContent);
+        //update-begin---author:wangshuai---date:2024-06-26---for:【TV360X-1344】JDK17 邮箱发送失败，需要换写法---
+        /*PegDownProcessor pdp = new PegDownProcessor();
+        return pdp.markdownToHtml(markdownContent);*/
+        Parser parser = Parser.builder().build();
+        Node document = parser.parse(markdownContent);
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
+        return renderer.render(document);
+        //update-end---author:wangshuai---date:2024-06-26---for:【TV360X-1344】JDK17 邮箱发送失败，需要换写法---
     }
 
 }

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

@@ -57,8 +57,8 @@ public class RestUtil {
 
     static {
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-        requestFactory.setConnectTimeout(3000);
-        requestFactory.setReadTimeout(3000);
+        requestFactory.setConnectTimeout(30000);
+        requestFactory.setReadTimeout(30000);
         RT = new RestTemplate(requestFactory);
         // 解决乱码问题
         RT.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));

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

@@ -84,6 +84,10 @@ public class DynamicDBUtil {
         } else {
             DruidDataSource dataSource = getJdbcDataSource(dbSource);
             if(dataSource!=null && dataSource.isEnable()){
+
+                // 【TV360X-2060】设置超时时间 6秒
+                dataSource.setMaxWait(6000);
+
                 DataSourceCachePool.putCacheBasicDataSource(dbKey, dataSource);
             }else{
                 throw new JeecgBootException("动态数据源连接失败，dbKey："+dbKey);
@@ -106,9 +110,10 @@ public class DynamicDBUtil {
                 dataSource.getConnection().commit();
                 dataSource.getConnection().close();
                 dataSource.close();
+                DataSourceCachePool.removeCache(dbKey);
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            log.warn(e.getMessage(), e);
         }
     }
 

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

@@ -73,6 +73,12 @@ public class JSqlParserUtils {
      * @return
      */
     private static SelectSqlInfo parseBySelectBody(SelectBody selectBody) {
+        // 判断是否使用了union等操作
+        if (selectBody instanceof SetOperationList) {
+            // 如果使用了union等操作，则只解析第一个查询
+            List<SelectBody> selectBodyList = ((SetOperationList) selectBody).getSelects();
+            return JSqlParserUtils.parseBySelectBody(selectBodyList.get(0));
+        }
         // 简单的select查询
         if (selectBody instanceof PlainSelect) {
             SelectSqlInfo sqlInfo = new SelectSqlInfo(selectBody);

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

@@ -62,8 +62,12 @@ public class JeecgBaseConfig {
      * @return
      */
     private WeiXinPay weiXinPay;
-    
-    
+
+    /**
+     * 百度开放API配置
+     */
+    private BaiduApi baiduApi;
+
     public Elasticsearch getElasticsearch() {
         return elasticsearch;
     }
@@ -143,5 +147,13 @@ public class JeecgBaseConfig {
     public void setWeiXinPay(WeiXinPay weiXinPay) {
         this.weiXinPay = weiXinPay;
     }
-    
+
+    public BaiduApi getBaiduApi() {
+        return baiduApi;
+    }
+
+    public void setBaiduApi(BaiduApi baiduApi) {
+        this.baiduApi = baiduApi;
+    }
+
 }

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

@@ -0,0 +1,33 @@
+package org.jeecg.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+* @Description: 短信模板
+*
+* @author: wangshuai
+* @date: 2024/11/5 下午3:44
+*/
+@Data
+@Component("jeecgSmsTemplateConfig")
+@ConfigurationProperties(prefix = "jeecg.oss.sms-template")
+public class JeecgSmsTemplateConfig {
+
+    /**
+     * 短信签名
+     */
+    private String signature;
+
+
+    /**
+     * 短信模板code
+     *
+     * @return
+     */
+    private Map<String,String> templateCode;
+    
+}

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

@@ -21,6 +21,12 @@ public class StaticConfig {
     @Value(value = "${spring.mail.username:}")
     private String emailFrom;
 
+    /**
+     * 是否开启定时发送
+     */
+    @Value(value = "${spring.mail.timeJobSend:false}")
+    private Boolean timeJobSend;
+
 //    /**
 //     * 签名密钥串
 //     */

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

@@ -3,6 +3,7 @@ package org.jeecg.config;
 
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
@@ -94,6 +95,14 @@ public class Swagger2Config implements WebMvcConfigurer {
         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;
     }
 

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

@@ -12,18 +12,15 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
-import org.springframework.boot.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.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;
@@ -40,7 +37,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Spring Boot 2.0 解决跨域问题
@@ -59,11 +55,6 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     @Autowired(required = false)
     private PrometheusMeterRegistry prometheusMeterRegistry;
 
-    @Autowired
-    private ObjectProvider<Jackson2ObjectMapperBuilder> builderProvider;
-    @Autowired
-    private JacksonProperties jacksonProperties;
-
     /**
      * 静态资源的配置 - 使得可以从磁盘中读取 Html、图片、视频、音频等
      */
@@ -116,10 +107,6 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     @Primary
     public ObjectMapper objectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
-        // 继承spring jackson 默认机制
-        if (Objects.nonNull(builderProvider.getIfAvailable())) {
-            objectMapper = builderProvider.getIfAvailable().createXmlMapper(false).build();
-        }
         //处理bigDecimal
         objectMapper.enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN);
         objectMapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
@@ -128,10 +115,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, false);
         objectMapper.configure(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES, false);
-        //默认的处理日期时间格式,接受通过spring.jackson.date-format配置格式化模式
-        if (Objects.isNull(jacksonProperties.getDateFormat())) {
-            objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
-        }
+        //默认的处理日期时间格式
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
         JavaTimeModule javaTimeModule = new JavaTimeModule();
         javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));

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

@@ -31,7 +31,7 @@ public class WebSocketConfig {
         FilterRegistrationBean bean = new FilterRegistrationBean();
         bean.setFilter(websocketFilter());
         //TODO 临时注释掉，测试下线上socket总断的问题
-        bean.addUrlPatterns("/taskCountSocket/*", "/websocket/*","/eoaSocket/*","/eoaNewChatSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
+        bean.addUrlPatterns("/taskCountSocket/*", "/websocket/*","/eoaSocket/*","/eoaNewChatSocket/*", "/newsWebsocket/*", "/dragChannelSocket/*", "/vxeSocket/*");
         return bean;
     }
 

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

@@ -1,6 +1,5 @@
 package org.jeecg.config.shiro;
 
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
@@ -127,6 +126,8 @@ 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：排除静态资源后缀
 
         filterChainDefinitionMap.put("/druid/**", "anon");
@@ -147,9 +148,15 @@ public class ShiroConfig {
         //拖拽仪表盘设计器排除
         filterChainDefinitionMap.put("/drag/view", "anon");
         filterChainDefinitionMap.put("/drag/page/queryById", "anon");
+        filterChainDefinitionMap.put("/drag/page/addVisitsNumber", "anon");
+        filterChainDefinitionMap.put("/drag/page/queryTemplateList", "anon");
+        filterChainDefinitionMap.put("/drag/share/view/**", "anon");
         filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getAllChartData", "anon");
         filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalData", "anon");
         filterChainDefinitionMap.put("/drag/mock/json/**", "anon");
+        filterChainDefinitionMap.put("/jimubi/view", "anon");
+        filterChainDefinitionMap.put("/jimubi/share/view/**", "anon");
+
         //大屏模板例子
         filterChainDefinitionMap.put("/test/bigScreen/**", "anon");
         filterChainDefinitionMap.put("/bigscreen/template1/**", "anon");
@@ -190,12 +197,24 @@ public class ShiroConfig {
     }
 
     //update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
+
+    /**
+     * spring过滤装饰器 <br/>
+     * 因为shiro的filter不支持异步请求,导致所有的异步请求都会报错. <br/>
+     * 所以需要用spring的FilterRegistrationBean再代理一下shiro的filter.为他扩展异步支持. <br/>
+     * 后续所有异步的接口都需要再这里增加registration.addUrlPatterns("/xxx/xxx");
+     * @return
+     * @author chenrui
+     * @date 2024/12/3 19:49
+     */
     @Bean
     public FilterRegistrationBean shiroFilterRegistration() {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setFilter(new DelegatingFilterProxy("shiroFilterFactoryBean"));
         registration.setEnabled(true);
-        registration.addUrlPatterns("/*");
+        //update-begin---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
+        registration.addUrlPatterns("/test/ai/chat/send");
+        //update-end---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
         //支持异步
         registration.setAsyncSupported(true);
         registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);
@@ -290,7 +309,7 @@ public class ShiroConfig {
             RedisSentinelManager sentinelManager = new RedisSentinelManager();
             sentinelManager.setMasterName(redisProperties.getSentinel().getMaster());
             sentinelManager.setHost(String.join(",", redisProperties.getSentinel().getNodes()));
-            sentinelManager.setPassword(redisProperties.getSentinel().getPassword());
+            sentinelManager.setPassword(redisProperties.getPassword());
             sentinelManager.setDatabase(redisProperties.getDatabase());
 
             return sentinelManager;

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

@@ -19,6 +19,7 @@ import org.jeecg.common.util.RedisUtil;
 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.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
@@ -141,7 +142,7 @@ public class ShiroRealm extends AuthorizingRealm {
         }
         //update-begin-author:taoyan date:20210609 for:校验用户的tenant_id和前端传过来的是否一致
         String userTenantIds = loginUser.getRelTenantIds();
-        if(oConvertUtils.isNotEmpty(userTenantIds)){
+        if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && oConvertUtils.isNotEmpty(userTenantIds)){
             String contextTenantId = TenantContext.getTenant();
             log.debug("登录租户：" + contextTenantId);
             log.debug("用户拥有那些租户：" + userTenantIds);

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

@@ -3,16 +3,16 @@ package org.jeecg.config.shiro.ignore;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.config.shiro.IgnoreAuth;
-import org.springframework.aop.framework.Advised;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 在spring boot初始化时，根据@RestController注解获取当前spring容器中的bean
@@ -22,24 +22,20 @@ import java.util.*;
 @Slf4j
 @Component
 @AllArgsConstructor
-public class IgnoreAuthPostProcessor implements ApplicationListener<ContextRefreshedEvent> {
+public class IgnoreAuthPostProcessor implements InitializingBean {
+
+    private RequestMappingHandlerMapping requestMappingHandlerMapping;
 
-    private ApplicationContext applicationContext;
 
     @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
+    public void afterPropertiesSet() throws Exception {
+
         long startTime = System.currentTimeMillis();
         
         List<String> ignoreAuthUrls = new ArrayList<>();
-        if (event.getApplicationContext().getParent() == null) {
-            // 只处理根应用上下文的事件，避免在子上下文中重复处理
-            Map<String, Object> restControllers = applicationContext.getBeansWithAnnotation(RestController.class);
-            for (Object restController : restControllers.values()) {
-                // 如 online系统的controller并不是spring 默认生成
-                if (restController instanceof Advised) {
-                    ignoreAuthUrls.addAll(postProcessRestController(restController));
-                }
-            }
+        Set<Class<?>> restControllers = requestMappingHandlerMapping.getHandlerMethods().values().stream().map(HandlerMethod::getBeanType).collect(Collectors.toSet());
+        for (Class<?> restController : restControllers) {
+            ignoreAuthUrls.addAll(postProcessRestController(restController));
         }
 
         log.info("Init Token ignoreAuthUrls Config [ 集合 ]  ：{}", ignoreAuthUrls);
@@ -53,9 +49,8 @@ public class IgnoreAuthPostProcessor implements ApplicationListener<ContextRefre
         log.info("Init Token ignoreAuthUrls Config [ 耗时 ] ：" + elapsedTime + "毫秒");
     }
 
-    private List<String> postProcessRestController(Object restController) {
+    private List<String> postProcessRestController(Class<?> clazz) {
         List<String> ignoreAuthUrls = new ArrayList<>();
-        Class<?> clazz = ((Advised) restController).getTargetClass();
         RequestMapping base = clazz.getAnnotation(RequestMapping.class);
         String[] baseUrl = Objects.nonNull(base) ? base.value() : new String[]{};
         Method[] methods = clazz.getDeclaredMethods();

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

@@ -0,0 +1,15 @@
+package org.jeecg.config.vo;
+
+import lombok.Data;
+
+/**
+ * 百度开放api配置
+ */
+@Data
+public class BaiduApi {
+
+    private String appId;
+    private String apiKey;
+    private String secretKey;
+
+}

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

@@ -11,6 +11,10 @@ public class Firewall {
      * 数据源安全 (开启后，Online报表和图表的数据源为必填)
      */
     private Boolean dataSourceSafe = false;
+    /**
+     * 是否禁止使用 * 查询所有字段
+     */
+    private Boolean disableSelectAll = false;
     /**
      * 低代码模式（dev:开发模式，prod:发布模式——关闭所有在线开发配置能力）
      */
@@ -36,4 +40,11 @@ public class Firewall {
         this.lowCodeMode = lowCodeMode;
     }
 
+    public Boolean getDisableSelectAll() {
+        return disableSelectAll;
+    }
+
+    public void setDisableSelectAll(Boolean disableSelectAll) {
+        this.disableSelectAll = disableSelectAll;
+    }
 }

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.7.0</version>
+        <version>3.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/impl/ChatServiceImpl.java

@@ -59,12 +59,6 @@ public class ChatServiceImpl implements ChatService {
     private OpenAiStreamClient openAiStreamClient = null;
 
     //update-begin---author:chenrui ---date:20240131  for：[QQYUN-8212]fix 没有配置启动报错------------
-    public ChatServiceImpl() {
-        try {
-            this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
-        } catch (Exception ignored) {
-        }
-    }
 
     /**
      * 防止client不能成功注入
@@ -73,8 +67,14 @@ public class ChatServiceImpl implements ChatService {
      * @date 2024/2/3 23:08
      */
     private OpenAiStreamClient ensureClient(){
-        if(null == this.openAiStreamClient){
-            this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
+        if (null == this.openAiStreamClient){
+            //update-begin---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
+            try {
+                this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
+            } catch (Exception ignored) {
+                sendErrorMsg("如果您想使用AI助手，请先设置相应配置!");
+            }
+            //update-end---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
         }
         return this.openAiStreamClient;
     }
@@ -163,16 +163,21 @@ public class ChatServiceImpl implements ChatService {
             log.info("聊天消息推送失败uid:[{}],没有创建连接，请重试。", uid);
             throw new JeecgBootException("聊天消息推送失败uid:[{}],没有创建连接，请重试。~");
         }
-        OpenAISSEEventSourceListener openAIEventSourceListener = new OpenAISSEEventSourceListener(topicId, sseEmitter);
-        ChatCompletion completion = ChatCompletion
-                .builder()
-                .messages(msgHistory)
-                .model(ChatCompletion.Model.GPT_3_5_TURBO.getName())
-                .build();
-        ensureClient().streamChatCompletion(completion, openAIEventSourceListener);
-        redisTemplate.opsForHash().put(cacheKey, CACHE_KEY_MSG_CONTEXT, JSONUtil.toJsonStr(msgHistory));
-        //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-        Result.ok(completion.tokens());
+        //update-begin---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
+        OpenAiStreamClient client = ensureClient();
+        if (null != client) {
+            OpenAISSEEventSourceListener openAIEventSourceListener = new OpenAISSEEventSourceListener(topicId, sseEmitter);
+            ChatCompletion completion = ChatCompletion
+                    .builder()
+                    .messages(msgHistory)
+                    .model(ChatCompletion.Model.GPT_3_5_TURBO.getName())
+                    .build();
+            client.streamChatCompletion(completion, openAIEventSourceListener);
+            redisTemplate.opsForHash().put(cacheKey, CACHE_KEY_MSG_CONTEXT, JSONUtil.toJsonStr(msgHistory));
+            //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
+            Result.ok(completion.tokens());
+        }
+        //update-end---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
     }
 
     //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
@@ -194,6 +199,35 @@ public class ChatServiceImpl implements ChatService {
         return Result.OK(chatHistoryVO);
     }
     //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
+
+    /**
+     * 发送异常消息给前端
+     * [TV360X-1570]给于更友好的提示，提示未配置ai
+     *
+     * @param msg
+     * @author chenrui
+     * @date 2024/6/25 10:38
+     */
+    private void sendErrorMsg(String msg) {
+        String uid = getUserId();
+        SseEmitter sseEmitter = (SseEmitter) LocalCache.CACHE.get(uid);
+        if (sseEmitter == null) {
+            return;
+        }
+        try {
+            sseEmitter.send(SseEmitter.event()
+                    .id("[ERR]")
+                    .data(Message.builder().content(msg).build())
+                    .reconnectTime(3000));
+            sseEmitter.send(SseEmitter.event()
+                    .id("[DONE]")
+                    .data("[DONE]")
+                    .reconnectTime(3000));
+            sseEmitter.complete();
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+        }
+    }
 }
 
 //update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java

@@ -95,7 +95,7 @@ public class JeecgOrderMainServiceImpl extends ServiceImpl<JeecgOrderMainMapper,
                 // 当传过来的id数据库不存在时，说明数据库没有，走新增逻辑
                 ticket.setOrderId(jeecgOrderMain.getId());
                 jeecgOrderTicketMapper.insert(ticket);
-                break;
+                continue;
             }
             if(orderTicket.getId().equals(ticket.getId())){
                 // 传过来的id和数据库id一至时，说明数据库存在该数据，走更新逻辑
@@ -109,7 +109,7 @@ public class JeecgOrderMainServiceImpl extends ServiceImpl<JeecgOrderMainMapper,
                 // 当传过来的id数据库不存在时，说明数据库没有，走新增逻辑
                 customer.setOrderId(jeecgOrderMain.getId());
                 jeecgOrderCustomerMapper.insert(customer);
-                break;
+                continue;
             }
             if(customers.getId().equals(customer.getId())){
                 //TODO 传过来的id和数据库id一至时，说明数据库存在该数据，走更新逻辑

jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json

@@ -0,0 +1,370 @@
+{
+  "list": [
+    {
+      "key": "1717072932495_439966",
+      "type": "card",
+      "isAutoGrid": true,
+      "isContainer": true,
+      "list": [
+        {
+          "type": "input",
+          "name": "名称",
+          "className": "form-input",
+          "icon": "icon-input",
+          "hideTitle": false,
+          "options": {
+            "width": "100%",
+            "defaultValue": "",
+            "required": true,
+            "dataType": null,
+            "pattern": "",
+            "placeholder": "",
+            "clearable": false,
+            "readonly": false,
+            "disabled": false,
+            "fillRuleCode": "",
+            "showPassword": false,
+            "unique": false,
+            "hidden": false,
+            "hiddenOnAdd": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "string",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "remoteAPI": {
+            "url": "",
+            "executed": false
+          },
+          "key": "1717072932495_556479",
+          "model": "input_1717072932495_556479",
+          "modelType": "main",
+          "rules": [
+            {
+              "required": true,
+              "message": "${title}必须填写"
+            }
+          ],
+          "isSubItem": false
+        },
+        {
+          "type": "number",
+          "name": "数字",
+          "className": "form-number",
+          "icon": "icon-number",
+          "hideTitle": false,
+          "options": {
+            "width": "",
+            "required": false,
+            "defaultValue": 0,
+            "placeholder": "",
+            "controls": false,
+            "min": 0,
+            "minUnlimited": true,
+            "max": 100,
+            "maxUnlimited": true,
+            "step": 1,
+            "disabled": false,
+            "controlsPosition": "right",
+            "unitText": "",
+            "unitPosition": "suffix",
+            "showPercent": false,
+            "align": "left",
+            "hidden": false,
+            "hiddenOnAdd": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "number",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "remoteAPI": {
+            "url": "",
+            "executed": false
+          },
+          "key": "1717072985868_606195",
+          "model": "number_1717072985868_606195",
+          "modelType": "main",
+          "rules": [],
+          "isSubItem": false
+        }
+      ],
+      "options": {
+        "required": false,
+        "hiddenOnAdd": false,
+        "hidden": false,
+        "fieldNote": ""
+      },
+      "model": "card_1717072932495_439966",
+      "hideTitle": false,
+      "modelType": "main"
+    },
+    {
+      "key": "1717072988159_545097",
+      "type": "card",
+      "isAutoGrid": true,
+      "isContainer": true,
+      "list": [
+        {
+          "type": "money",
+          "name": "金额",
+          "className": "form-money",
+          "icon": "icon-money",
+          "hideTitle": false,
+          "options": {
+            "width": "180px",
+            "placeholder": "请输入金额",
+            "required": false,
+            "unitText": "元",
+            "unitPosition": "suffix",
+            "precision": 2,
+            "hidden": false,
+            "disabled": false,
+            "hiddenOnAdd": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "number",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "remoteAPI": {
+            "url": "",
+            "executed": false
+          },
+          "key": "1717072988159_568693",
+          "model": "money_1717072988159_568693",
+          "modelType": "main",
+          "rules": [],
+          "isSubItem": false
+        },
+        {
+          "type": "select",
+          "name": "下拉选择框",
+          "className": "form-select",
+          "icon": "icon-select",
+          "hideTitle": false,
+          "options": {
+            "defaultValue": "",
+            "multiple": false,
+            "disabled": false,
+            "clearable": true,
+            "placeholder": "",
+            "required": false,
+            "showLabel": false,
+            "showType": "default",
+            "width": "",
+            "useColor": false,
+            "colorIteratorIndex": 3,
+            "options": [
+              {
+                "value": "下拉框1",
+                "itemColor": "#2196F3"
+              },
+              {
+                "value": "下拉框2",
+                "itemColor": "#08C9C9"
+              },
+              {
+                "value": "下拉框3",
+                "itemColor": "#00C345"
+              }
+            ],
+            "remote": false,
+            "filterable": false,
+            "remoteOptions": [],
+            "props": {
+              "value": "value",
+              "label": "label"
+            },
+            "remoteFunc": "",
+            "hidden": false,
+            "hiddenOnAdd": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "string",
+              "allowFunc": true,
+              "valueSplit": ",",
+              "customConfig": true
+            }
+          },
+          "remoteAPI": {
+            "url": "",
+            "executed": false
+          },
+          "key": "1717072991431_622198",
+          "model": "select_1717072991431_622198",
+          "modelType": "main",
+          "rules": [],
+          "isSubItem": false
+        }
+      ],
+      "options": {
+        "required": false,
+        "hiddenOnAdd": false,
+        "hidden": false,
+        "fieldNote": ""
+      },
+      "model": "card_1717072988159_545097",
+      "hideTitle": false,
+      "modelType": "main"
+    },
+    {
+      "key": "1717072932495_382575",
+      "type": "card",
+      "isAutoGrid": true,
+      "isContainer": true,
+      "list": [
+        {
+          "type": "imgupload",
+          "name": "图片上传",
+          "className": "form-tupian",
+          "icon": "icon-tupian",
+          "hideTitle": false,
+          "options": {
+            "defaultValue": [],
+            "size": {
+              "width": 100,
+              "height": 100
+            },
+            "width": "",
+            "tokenFunc": "funcGetToken",
+            "token": "",
+            "domain": "http://img.h5huodong.com",
+            "disabled": false,
+            "length": 9,
+            "multiple": true,
+            "hidden": false,
+            "hiddenOnAdd": false,
+            "required": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "key": "1717072996509_795340",
+          "model": "imgupload_1717072996509_795340",
+          "modelType": "main",
+          "rules": [],
+          "isSubItem": false
+        },
+        {
+          "type": "file-upload",
+          "name": "附件",
+          "className": "form-file-upload",
+          "icon": "icon-shangchuan",
+          "hideTitle": false,
+          "options": {
+            "defaultValue": [],
+            "token": "",
+            "length": 1,
+            "drag": false,
+            "multiple": false,
+            "disabled": false,
+            "buttonText": "添加附件",
+            "tokenFunc": "funcGetToken",
+            "hidden": false,
+            "hiddenOnAdd": false,
+            "required": false,
+            "fieldNote": "",
+            "autoWidth": 50
+          },
+          "key": "1717072932495_669325",
+          "model": "file_upload_1717072932495_669325",
+          "modelType": "main",
+          "rules": [],
+          "isSubItem": false
+        }
+      ],
+      "options": {
+        "required": false,
+        "hiddenOnAdd": false,
+        "hidden": false,
+        "fieldNote": ""
+      },
+      "model": "card_1717072932495_382575",
+      "hideTitle": false,
+      "modelType": "main"
+    }
+  ],
+  "config": {
+    "titleField": "input_1717072932495_556479",
+    "showHeaderTitle": true,
+    "labelWidth": 100,
+    "labelPosition": "top",
+    "size": "small",
+    "dialogOptions": {
+      "top": 20,
+      "width": 1000,
+      "padding": {
+        "top": 25,
+        "right": 25,
+        "bottom": 30,
+        "left": 25
+      }
+    },
+    "disabledAutoGrid": false,
+    "designMobileView": false,
+    "enableComment": true,
+    "hasWidgets": [
+      "input",
+      "number",
+      "card",
+      "money",
+      "select",
+      "imgupload",
+      "file-upload"
+    ],
+    "expand": {
+      "js": "",
+      "css": "",
+      "url": {
+        "js": "",
+        "css": ""
+      }
+    },
+    "transactional": true,
+    "customRequestURL": [
+      {
+        "url": ""
+      }
+    ],
+    "allowExternalLink": false,
+    "externalLinkShowData": false,
+    "headerImgUrl": "",
+    "externalTitle": "",
+    "enableNotice": false,
+    "noticeMode": "external",
+    "noticeType": "system",
+    "noticeReceiver": "",
+    "allowPrint": false,
+    "allowJmReport": false,
+    "jmReportURL": "",
+    "bizRuleConfig": [],
+    "bigDataMode": false
+  }
+}

jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json

@@ -0,0 +1,496 @@
+{
+  "list": [
+    {
+      "hideTitle": false,
+      "options": {
+        "hidden": false,
+        "hiddenOnAdd": false,
+        "fieldNote": "",
+        "required": false
+      },
+      "isContainer": true,
+      "model": "card_1717072902303_783177",
+      "modelType": "main",
+      "type": "card",
+      "isAutoGrid": true,
+      "list": [
+        {
+          "isSubItem": false,
+          "remoteAPI": {
+            "executed": false,
+            "url": ""
+          },
+          "icon": "icon-input",
+          "className": "form-input",
+          "rules": [
+            {
+              "required": true,
+              "message": "${title}必须填写"
+            }
+          ],
+          "modelType": "main",
+          "type": "input",
+          "hideTitle": false,
+          "name": "名称",
+          "options": {
+            "clearable": false,
+            "hidden": false,
+            "defaultValue": "",
+            "pattern": "",
+            "fillRuleCode": "",
+            "fieldNote": "",
+            "required": true,
+            "readonly": false,
+            "unique": false,
+            "hiddenOnAdd": false,
+            "width": "100%",
+            "autoWidth": 100,
+            "showPassword": false,
+            "disabled": false,
+            "placeholder": ""
+          },
+          "model": "input_1717072902303_477529",
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "string",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "key": "1717072902303_477529"
+        }
+      ],
+      "key": "1717072902303_783177"
+    },
+    {
+      "options": {
+        "required": false,
+        "hiddenOnAdd": false,
+        "hidden": false,
+        "fieldNote": ""
+      },
+      "isContainer": true,
+      "model": "card_1717073019436_526262",
+      "type": "card",
+      "isAutoGrid": true,
+      "list": [
+        {
+          "isSubItem": false,
+          "remoteAPI": {
+            "executed": false,
+            "url": ""
+          },
+          "icon": "icon-number",
+          "className": "form-number",
+          "rules": [],
+          "modelType": "main",
+          "type": "number",
+          "hideTitle": false,
+          "name": "数字",
+          "options": {
+            "controls": false,
+            "showPercent": false,
+            "hidden": false,
+            "max": 100,
+            "defaultValue": 0,
+            "unitPosition": "suffix",
+            "fieldNote": "",
+            "maxUnlimited": true,
+            "align": "left",
+            "required": false,
+            "min": 0,
+            "minUnlimited": true,
+            "hiddenOnAdd": false,
+            "width": "",
+            "autoWidth": 50,
+            "step": 1,
+            "disabled": false,
+            "placeholder": "",
+            "controlsPosition": "right",
+            "unitText": ""
+          },
+          "model": "number_1717073019436_586474",
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "number",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "key": "1717073019436_586474"
+        },
+        {
+          "isSubItem": false,
+          "remoteAPI": {
+            "executed": false,
+            "url": ""
+          },
+          "icon": "icon-money",
+          "className": "form-money",
+          "rules": [],
+          "modelType": "main",
+          "type": "money",
+          "hideTitle": false,
+          "name": "金额",
+          "options": {
+            "hidden": false,
+            "precision": 2,
+            "hiddenOnAdd": false,
+            "width": "180px",
+            "autoWidth": 50,
+            "unitPosition": "suffix",
+            "disabled": false,
+            "fieldNote": "",
+            "placeholder": "请输入金额",
+            "required": false,
+            "unitText": "元"
+          },
+          "model": "money_1717073021100_526660",
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "number",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "key": "1717073021100_526660"
+        }
+      ],
+      "key": "1717073019436_526262",
+      "hideTitle": false,
+      "modelType": "main"
+    },
+    {
+      "hideTitle": false,
+      "options": {
+        "hidden": false,
+        "hiddenOnAdd": false,
+        "fieldNote": "",
+        "required": false
+      },
+      "isContainer": true,
+      "model": "card_1717072902303_118977",
+      "modelType": "main",
+      "type": "card",
+      "isAutoGrid": true,
+      "list": [
+        {
+          "isSubItem": false,
+          "remoteAPI": {
+            "executed": false,
+            "url": ""
+          },
+          "icon": "icon-select",
+          "className": "form-select",
+          "rules": [],
+          "modelType": "main",
+          "type": "select",
+          "hideTitle": false,
+          "name": "下拉选择框",
+          "options": {
+            "remoteFunc": "",
+            "filterable": false,
+            "clearable": true,
+            "hidden": false,
+            "defaultValue": "",
+            "remoteOptions": [],
+            "multiple": false,
+            "fieldNote": "",
+            "remote": false,
+            "required": false,
+            "showLabel": false,
+            "useColor": false,
+            "props": {
+              "label": "label",
+              "value": "value"
+            },
+            "colorIteratorIndex": 3,
+            "hiddenOnAdd": false,
+            "width": "",
+            "options": [
+              {
+                "itemColor": "#2196F3",
+                "value": "下拉框1"
+              },
+              {
+                "itemColor": "#08C9C9",
+                "value": "下拉框2"
+              },
+              {
+                "itemColor": "#00C345",
+                "value": "下拉框3"
+              }
+            ],
+            "autoWidth": 50,
+            "showType": "default",
+            "disabled": false,
+            "placeholder": ""
+          },
+          "model": "select_1717073033259_273399",
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "string",
+              "allowFunc": true,
+              "valueSplit": ",",
+              "customConfig": true
+            }
+          },
+          "key": "1717073033259_273399"
+        },
+        {
+          "isSubItem": false,
+          "remoteAPI": {
+            "executed": false,
+            "url": ""
+          },
+          "icon": "icon-textarea",
+          "className": "form-textarea",
+          "rules": [],
+          "modelType": "main",
+          "type": "textarea",
+          "hideTitle": false,
+          "name": "描述",
+          "options": {
+            "readonly": false,
+            "hidden": false,
+            "defaultValue": "",
+            "unique": false,
+            "hiddenOnAdd": false,
+            "width": "100%",
+            "pattern": "",
+            "autoWidth": 50,
+            "disabled": false,
+            "fieldNote": "",
+            "placeholder": "",
+            "required": false
+          },
+          "model": "textarea_1717072902303_129466",
+          "advancedSetting": {
+            "defaultValue": {
+              "type": "compose",
+              "value": "",
+              "format": "string",
+              "allowFunc": true,
+              "valueSplit": "",
+              "customConfig": false
+            }
+          },
+          "key": "1717072902303_129466"
+        }
+      ],
+      "key": "1717072902303_118977"
+    },
+    {
+      "hideTitle": false,
+      "options": {
+        "hidden": false,
+        "hiddenOnAdd": false,
+        "fieldNote": "",
+        "required": false
+      },
+      "isContainer": true,
+      "model": "card_1717072902304_736053",
+      "modelType": "main",
+      "type": "card",
+      "isAutoGrid": true,
+      "list": [
+        {
+          "hideTitle": false,
+          "isSubItem": false,
+          "name": "图片上传",
+          "icon": "icon-tupian",
+          "options": {
+            "hidden": false,
+            "defaultValue": [],
+            "length": 9,
+            "multiple": true,
+            "fieldNote": "",
+            "required": false,
+            "token": "",
+            "size": {
+              "width": 100,
+              "height": 100
+            },
+            "tokenFunc": "funcGetToken",
+            "domain": "http://img.h5huodong.com",
+            "hiddenOnAdd": false,
+            "width": "",
+            "autoWidth": 50,
+            "disabled": false
+          },
+          "className": "form-tupian",
+          "model": "imgupload_1717073025137_563739",
+          "rules": [],
+          "modelType": "main",
+          "type": "imgupload",
+          "key": "1717073025137_563739"
+        },
+        {
+          "hideTitle": false,
+          "isSubItem": false,
+          "name": "附件",
+          "icon": "icon-shangchuan",
+          "options": {
+            "buttonText": "添加附件",
+            "hidden": false,
+            "defaultValue": [],
+            "length": 1,
+            "multiple": false,
+            "fieldNote": "",
+            "required": false,
+            "token": "",
+            "tokenFunc": "funcGetToken",
+            "hiddenOnAdd": false,
+            "autoWidth": 50,
+            "disabled": false,
+            "drag": false
+          },
+          "className": "form-file-upload",
+          "model": "file_upload_1717072902304_442777",
+          "rules": [],
+          "modelType": "main",
+          "type": "file-upload",
+          "key": "1717072902304_442777"
+        }
+      ],
+      "key": "1717072902304_736053"
+    },
+    {
+      "isSubItem": false,
+      "remoteAPI": {
+        "url": "",
+        "executed": false
+      },
+      "icon": "icon-link",
+      "className": "form-link-record",
+      "rules": [],
+      "modelType": "main",
+      "type": "link-record",
+      "hideTitle": false,
+      "name": "主表@表单控件",
+      "options": {
+        "sourceCode": "ai_control_main",
+        "showMode": "single",
+        "showType": "card",
+        "titleField": "wen_ben",
+        "showFields": [],
+        "allowView": true,
+        "allowEdit": true,
+        "allowAdd": true,
+        "allowSelect": true,
+        "buttonText": "添加记录",
+        "twoWayModel": "sub_table_design_1717137038626_791984",
+        "dataSelectAuth": "all",
+        "filters": [
+          {
+            "matchType": "AND",
+            "rules": []
+          }
+        ],
+        "search": {
+          "enabled": false,
+          "field": "",
+          "rule": "like",
+          "afterShow": false,
+          "fields": []
+        },
+        "createMode": {
+          "add": true,
+          "select": false,
+          "params": {
+            "selectLinkModel": ""
+          }
+        },
+        "width": "100%",
+        "defaultValue": "",
+        "defaultValType": "none",
+        "required": false,
+        "disabled": false,
+        "hidden": false,
+        "hiddenOnAdd": false,
+        "fieldNote": ""
+      },
+      "model": "link_record_1717137044235_306956",
+      "advancedSetting": {
+        "defaultValue": {
+          "type": "compose",
+          "value": "",
+          "format": "string",
+          "allowFunc": true,
+          "valueSplit": "",
+          "customConfig": true
+        }
+      },
+      "key": "1717137044235_306956"
+    }
+  ],
+  "config": {
+    "jmReportURL": "",
+    "enableComment": true,
+    "dialogOptions": {
+      "padding": {
+        "top": 25,
+        "left": 25,
+        "bottom": 30,
+        "right": 25
+      },
+      "top": 20,
+      "width": 1000
+    },
+    "allowJmReport": false,
+    "labelWidth": 100,
+    "headerImgUrl": "",
+    "noticeMode": "external",
+    "noticeReceiver": "",
+    "designMobileView": false,
+    "labelPosition": "top",
+    "allowPrint": false,
+    "enableNotice": false,
+    "bizRuleConfig": [],
+    "showHeaderTitle": true,
+    "bigDataMode": false,
+    "titleField": "input_1717072902303_477529",
+    "externalTitle": "",
+    "noticeType": "system",
+    "customRequestURL": [
+      {
+        "url": ""
+      }
+    ],
+    "hasWidgets": [
+      "input",
+      "card",
+      "number",
+      "money",
+      "select",
+      "textarea",
+      "imgupload",
+      "file-upload",
+      "link-record"
+    ],
+    "expand": {
+      "css": "",
+      "js": "",
+      "url": {
+        "css": "",
+        "js": ""
+      }
+    },
+    "size": "small",
+    "disabledAutoGrid": false,
+    "allowExternalLink": false,
+    "externalLinkShowData": false,
+    "transactional": true
+  }
+}

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-system-api</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.7.0</version>
+        <version>3.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -597,7 +597,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @return
      */
     @GetMapping("/sys/api/loadDictItemByKeyword")
-    List<DictModel> loadDictItemByKeyword(@RequestParam("dictCode") String dictCode, @RequestParam("keyword") String keyword, @RequestParam(value = "pageSize", required = false) Integer pageSize);
+    List<DictModel> loadDictItemByKeyword(@RequestParam("dictCode") String dictCode, @RequestParam("keyword") String keyword, @RequestParam(value = "pageNo", defaultValue = "1", required = false) Integer pageNo, @RequestParam(value = "pageSize", required = false) Integer pageSize);
 
     /**
      * 47 根据多个部门id(逗号分隔)，查询返回多个部门信息

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java

@@ -382,7 +382,7 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
     }
 
     @Override
-    public List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize) {
+    public List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageNo, Integer pageSize) {
         return null;
     }
 

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-system-api</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.7.0</version>
+        <version>3.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -457,7 +457,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param pageSize 分页条数
      * @return
      */
-    List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize);
+    List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageNo, Integer pageSize);
 
     /**
      * 新增数据日志

jeecg-boot/jeecg-module-system/jeecg-system-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-module-system</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.7.0</version>
+        <version>3.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-module-system</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -34,9 +34,10 @@
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
 		</dependency>
+		<!-- 积木BI -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>drag-free</artifactId>
+			<artifactId>jimubi-spring-boot-starter</artifactId>
 		</dependency>
 	<!-- 积木报表 mongo redis 支持包 
 		<dependency>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.config.jimureport;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.dto.LogDTO;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -13,6 +14,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,18 +44,38 @@ public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
      * @return key = dictCode ； value=对应的字典项
      */
     @Override
-    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
+    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList, List<JSONObject> tableDictList) {
         Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
-        Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
-        dictItemsMap.forEach((k,v)->{
-            List<DragDictModel> dictItems  = new ArrayList<>();
-            v.forEach(dictItem->{
-                DragDictModel dictModel = new DragDictModel();
-                BeanUtils.copyProperties(dictItem,dictModel);
-                dictItems.add(dictModel);
+        if(!CollectionUtils.isEmpty(codeList)){
+            Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
+            dictItemsMap.forEach((k,v)->{
+                List<DragDictModel> dictItems  = new ArrayList<>();
+                v.forEach(dictItem->{
+                    DragDictModel dictModel = new DragDictModel();
+                    BeanUtils.copyProperties(dictItem,dictModel);
+                    dictItems.add(dictModel);
+                });
+                manyDragDictItems.put(k,dictItems);
             });
-            manyDragDictItems.put(k,dictItems);
-        });
+        }
+
+        if(!CollectionUtils.isEmpty(tableDictList)){
+            tableDictList.forEach(item->{
+                List<DragDictModel> dictItems  = new ArrayList<>();
+                JSONObject object = JSONObject.parseObject(item.toString());
+                String dictField = object.getString("dictField");
+                String dictTable = object.getString("dictTable");
+                String dictText = object.getString("dictText");
+                String fieldName = object.getString("fieldName");
+                List<DictModel> dictItemsList = sysBaseApi.queryTableDictItemsByCode(dictTable,dictText,dictField);
+                dictItemsList.forEach(dictItem->{
+                    DragDictModel dictModel = new DragDictModel();
+                    BeanUtils.copyProperties(dictItem,dictModel);
+                    dictItems.add(dictModel);
+                });
+                manyDragDictItems.put(fieldName,dictItems);
+            });
+        }
         return manyDragDictItems;
     }
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.java

@@ -98,7 +98,7 @@ public class SystemApiController {
         try {
             SensitiveInfoUtil.handlerObject(loginUser, true);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
         return loginUser;
     }
@@ -666,8 +666,11 @@ public class SystemApiController {
      * @return
      */
     @GetMapping("/loadDictItemByKeyword")
-    public List<DictModel> loadDictItemByKeyword(@RequestParam("dictCode") String dictCode, @RequestParam("keyword") String keyword, @RequestParam(value = "pageSize", required = false) Integer pageSize) {
-        return sysBaseApi.loadDictItemByKeyword(dictCode, keyword, pageSize);
+    public List<DictModel> loadDictItemByKeyword(@RequestParam("dictCode") String dictCode,
+                                                 @RequestParam("keyword") String keyword,
+                                                 @RequestParam(value = "pageNo", defaultValue = "1", required = false) Integer pageNo,
+                                                 @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        return sysBaseApi.loadDictItemByKeyword(dictCode, keyword,pageNo, pageSize);
     }
 
     /**

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java

@@ -5,12 +5,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.StaticConfig;
+import org.jeecg.modules.message.entity.SysMessage;
 import org.jeecg.modules.message.handle.ISendMsgHandle;
+import org.jeecg.modules.message.mapper.SysMessageMapper;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,9 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
 
     @Autowired
     private RedisUtil redisUtil;
+    
+    @Autowired
+    private SysMessageMapper sysMessageMapper;
 
     /**
      * 真实姓名变量
@@ -78,6 +84,23 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
 
     @Override
     public void sendMessage(MessageDTO messageDTO) {
+        String content = messageDTO.getContent();
+        String title = messageDTO.getTitle();
+        //update-begin---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
+        boolean timeJobSendEmail = this.isTimeJobSendEmail(messageDTO.getToUser(), title, content);
+        if(timeJobSendEmail){
+            return;
+        }
+        //update-end---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
+        this.sendEmailMessage(messageDTO);
+    }
+
+    /**
+     * 直接发送邮件
+     * 
+     * @param messageDTO
+     */
+    public void sendEmailMessage(MessageDTO messageDTO) {
         String[] arr = messageDTO.getToUser().split(",");
         LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>().in(SysUser::getUsername, arr);
         List<SysUser> list = sysUserMapper.selectList(query);
@@ -213,4 +236,35 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
         redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 1 / 1000);
         return token;
     }
+
+    /**
+     * 是否定时发送邮箱
+     * @param toUser
+     * @param title
+     * @param content
+     * @return
+     */
+    private boolean isTimeJobSendEmail(String toUser, String title, String content) {
+        StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
+        Boolean timeJobSend = staticConfig.getTimeJobSend();
+        if(null != timeJobSend && timeJobSend){
+            this.addSysSmsSend(toUser,title,content);
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * 保存到短信发送表
+     */
+    private void addSysSmsSend(String toUser, String title, String content) {
+        SysMessage sysMessage = new SysMessage();
+        sysMessage.setEsTitle(title);
+        sysMessage.setEsContent(content);
+        sysMessage.setEsReceiver(toUser);
+        sysMessage.setEsSendStatus("0");
+        sysMessage.setEsSendNum(0);
+        sysMessage.setEsType(MessageTypeEnum.YJ.getType());
+        sysMessageMapper.insert(sysMessage);
+    }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java

@@ -51,6 +51,9 @@ public class SendMsgJob implements Job {
 				md.setToUser(sysMessage.getEsReceiver());
 				md.setType(sysMessage.getEsType());
 				md.setToAll(false);
+				//update-begin---author:wangshuai---date:2024-11-12---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
+				md.setIsTimeJob(true);
+				//update-end---author:wangshuai---date:2024-11-12---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
 				sysBaseAPI.sendTemplateMessage(md);
 				//发送消息成功
 				sysMessage.setEsSendStatus(SendMsgStatusEnum.SUCCESS.getCode());

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java

@@ -18,7 +18,7 @@ import static org.springframework.boot.actuate.endpoint.annotation.Selector.Matc
  * @Date: 2024/5/13 17:02
  */
 @Component
-@Endpoint(id = "httptrace-new")
+@Endpoint(id = "jeecghttptrace")
 public class CustomHttpTraceEndpoint{
     private final CustomInMemoryHttpTraceRepository repository;
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorMemoryController.java

@@ -26,27 +26,31 @@ public class ActuatorMemoryController {
     /**
      * 内存详情
      * @return
-     * @throws Exception
      */
     @GetMapping("/info")
-    public Result<?> getRedisInfo() throws Exception {
-		OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
-		JSONObject operatingSystemJson = JSONObject.parseObject(JSONObject.toJSONString(operatingSystemMXBean));
-		long totalPhysicalMemory = operatingSystemJson.getLongValue("totalPhysicalMemorySize");
-		long freePhysicalMemory = operatingSystemJson.getLongValue("freePhysicalMemorySize");
-		long usedPhysicalMemory = totalPhysicalMemory - freePhysicalMemory;
+    public Result<?> getRedisInfo() {
 		Runtime runtime = Runtime.getRuntime();
 		Map<String,Number> result = new HashMap<>();
-		result.put("memory.physical.total", totalPhysicalMemory);
-		result.put("memory.physical.used", freePhysicalMemory);
-		result.put("memory.physical.free", usedPhysicalMemory);
-		result.put("memory.physical.usage", NumberUtil.div(usedPhysicalMemory, totalPhysicalMemory));
 		result.put("memory.runtime.total", runtime.totalMemory());
 		result.put("memory.runtime.used", runtime.freeMemory());
 		result.put("memory.runtime.max", runtime.totalMemory() - runtime.freeMemory());
 		result.put("memory.runtime.free", runtime.maxMemory() - runtime.totalMemory() + runtime.freeMemory());
 		result.put("memory.runtime.usage", NumberUtil.div(runtime.totalMemory() - runtime.freeMemory(), runtime.totalMemory()));
-        return Result.ok(result);
+		//update-begin---author:chenrui ---date:20240705  for：[TV360X-1695]内存信息-立即更新 功能报错 #6635------------
+		OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
+		if (operatingSystemMXBean instanceof com.sun.management.OperatingSystemMXBean) {
+			com.sun.management.OperatingSystemMXBean opBean = (com.sun.management.OperatingSystemMXBean) operatingSystemMXBean;
+//			JSONObject operatingSystemJson = JSONObject.parseObject(JSONObject.toJSONString(operatingSystemMXBean));
+			long totalPhysicalMemory = opBean.getTotalPhysicalMemorySize();
+			long freePhysicalMemory = opBean.getFreePhysicalMemorySize();
+			long usedPhysicalMemory = totalPhysicalMemory - freePhysicalMemory;
+			result.put("memory.physical.total", totalPhysicalMemory);
+			result.put("memory.physical.used", freePhysicalMemory);
+			result.put("memory.physical.free", usedPhysicalMemory);
+			result.put("memory.physical.usage", NumberUtil.div(usedPhysicalMemory, totalPhysicalMemory));
+		}
+		//update-end---author:chenrui ---date:20240705  for：[TV360X-1695]内存信息-立即更新 功能报错 #6635------------
+		return Result.ok(result);
     }
 
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java

@@ -15,6 +15,7 @@ import org.jeecg.common.constant.SymbolConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.quartz.entity.QuartzJob;
 import org.jeecg.modules.quartz.service.IQuartzJobService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -206,6 +207,12 @@ public class QuartzJobController {
 	public ModelAndView exportXls(HttpServletRequest request, QuartzJob quartzJob) {
 		// Step.1 组装查询条件
 		QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, request.getParameterMap());
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		if (oConvertUtils.isNotEmpty(selections)) {
+			List<String> selectionList = Arrays.asList(selections.split(","));
+			queryWrapper.in("id",selectionList);
+		}
 		// Step.2 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		List<QuartzJob> pageList = quartzJobService.list(queryWrapper);

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -51,7 +51,7 @@ public class CommonController {
      */
     @GetMapping("/403")
     public Result<?> noauth()  {
-        return Result.error("没有权限，请联系管理员授权，后刷新缓存!");
+        return Result.error("没有权限，请联系管理员分配权限！");
     }
 
     /**

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
@@ -217,13 +218,21 @@ public class SysAnnouncementSendController {
 	@GetMapping(value = "/getMyAnnouncementSend")
 	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
 		announcementSendModel.setUserId(userId);
 		announcementSendModel.setPageNo((pageNo-1)*pageSize);
 		announcementSendModel.setPageSize(pageSize);
+		//update-begin---author:wangshuai---date:2024-06-11---for:【TV360X-545】我的消息列表不能通过时间范围查询---
+		if(StringUtils.isNotEmpty(announcementSendModel.getSendTimeBegin())){
+			announcementSendModel.setSendTimeBegin(announcementSendModel.getSendTimeBegin() + " 00:00:00");
+		}
+		if(StringUtils.isNotEmpty(announcementSendModel.getSendTimeBegin())){
+			announcementSendModel.setSendTimeEnd(announcementSendModel.getSendTimeEnd() + " 23:59:59");
+		}
+		//update-end---author:wangshuai---date:2024-06-11---for:【TV360X-545】我的消息列表不能通过时间范围查询---
 		Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
 		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
 		result.setResult(pageList);

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -364,9 +364,17 @@ public class SysDepartController {
 				//return arg0.getOrgCode().compareTo(arg1.getOrgCode());
 			//}
 		//});
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		List<String> idList = new ArrayList<>();
+		if (oConvertUtils.isNotEmpty(selections)) {
+			idList = Arrays.asList(selections.split(","));
+		}
 		//step.2 组装导出数据
 		Integer tenantId = sysDepart == null ? null : sysDepart.getTenantId();
-		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(tenantId);
+		//update-begin---author:wangshuai---date:2024-07-05---for:【TV360X-1671】部门管理不支持选中的记录导出---
+		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(tenantId,idList);
+		//update-end---author:wangshuai---date:2024-07-05---for:【TV360X-1671】部门管理不支持选中的记录导出---
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
         mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class);

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java

@@ -155,7 +155,8 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
     @RequiresPermissions("system:depart:role:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
+		this.sysDepartRoleService.deleteDepartRole(Arrays.asList(ids.split(",")));
+		//this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.ok("批量删除成功！");
 	}
 	

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java

@@ -2,11 +2,13 @@ package org.jeecg.modules.system.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.subject.Subject;
@@ -19,10 +21,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.ImportExcelUtil;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.TokenUtils;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.common.util.*;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.system.entity.SysDict;
@@ -78,8 +77,14 @@ public class SysDictController {
 	private ShiroRealm shiroRealm;
 
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
+	public Result<IPage<SysDict>> queryPageList(
+			SysDict sysDict,
+			@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+			// 查询关键字，模糊筛选code和name
+			@RequestParam(name = "keywords", required = false) String keywords,
+			HttpServletRequest req
+	) {
 		Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
 		//------------------------------------------------------------------------------------------------
 		//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
@@ -88,7 +93,12 @@ public class SysDictController {
 		}
 		//------------------------------------------------------------------------------------------------
 		QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
-		Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
+		// 查询关键字，模糊筛选code和name
+		if (oConvertUtils.isNotEmpty(keywords)) {
+			queryWrapper.and(i -> i.like("dict_code", keywords).or().like("dict_name", keywords));
+		}
+
+		Page<SysDict> page = new Page<>(pageNo, pageSize);
 		IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
 		log.debug("查询当前页："+pageList.getCurrent());
 		log.debug("查询当前页数量："+pageList.getSize());
@@ -202,7 +212,8 @@ public class SysDictController {
 	public Result<List<DictModel>> loadDict(@PathVariable("dictCode") String dictCode,
 			@RequestParam(name="keyword",required = false) String keyword,
 			@RequestParam(value = "sign",required = false) String sign,
-			@RequestParam(value = "pageSize", required = false) Integer pageSize) {
+			@RequestParam(name = "pageNo", defaultValue = "1", required = false) Integer pageNo,
+			@RequestParam(name = "pageSize", defaultValue = "10", required = false) Integer pageSize) {
 		
 		//update-begin-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905 RouteToRequestUrlFilter
 		if(keyword!=null && keyword.indexOf("%5")>=0){
@@ -217,7 +228,7 @@ public class SysDictController {
 		log.info(" 加载字典表数据,加载关键字: "+ keyword);
 		Result<List<DictModel>> result = new Result<List<DictModel>>();
 		try {
-			List<DictModel> ls = sysDictService.loadDict(dictCode, keyword, pageSize);
+			List<DictModel> ls = sysDictService.loadDict(dictCode, keyword, pageNo,pageSize);
 			if (ls == null) {
 				result.error500("字典Code格式不正确！");
 				return result;
@@ -249,12 +260,12 @@ public class SysDictController {
 			@RequestParam(value = "sign", required = false) String sign,
 			@RequestParam(value = "pageSize", required = false) Integer pageSize) {
 		// 首次查询查出来用户选中的值，并且不分页
-		Result<List<DictModel>> firstRes = this.loadDict(dictCode, keyword, sign, null);
+		Result<List<DictModel>> firstRes = this.loadDict(dictCode, keyword, sign,null, null);
 		if (!firstRes.isSuccess()) {
 			return firstRes;
 		}
 		// 然后再查询出第一页的数据
-		Result<List<DictModel>> result = this.loadDict(dictCode, "", sign, pageSize);
+		Result<List<DictModel>> result = this.loadDict(dictCode, "", sign,1, pageSize);
 		if (!result.isSuccess()) {
 			return result;
 		}
@@ -666,6 +677,45 @@ public class SysDictController {
 			return Result.error("操作失败!");
 		}
 	}
+	/**
+	 * 还原被逻辑删除的用户
+	 *
+	 * @param jsonObject
+	 * @return
+	 */
+	@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
+	public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
+		try {
+			String ids = jsonObject.getString("ids");
+			if (StringUtils.isNotBlank(ids)) {
+				sysDictService.revertLogicDeleted(Arrays.asList(ids.split(",")));
+				return Result.ok("操作成功!");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Result.error("操作失败!");
+		}
+		return Result.ok("还原成功");
+	}
+	/**
+	 * 彻底删除字典
+	 *
+	 * @param ids 被删除的字典ID，多个id用半角逗号分割
+	 * @return
+	 */
+	@RequiresPermissions("system:dict:deleteRecycleBin")
+	@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
+	public Result deleteRecycleBin(@RequestParam("ids") String ids) {
+		try {
+			if (StringUtils.isNotBlank(ids)) {
+				sysDictService.removeLogicDeleted(Arrays.asList(ids.split(",")));
+			}
+			return Result.ok("删除成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Result.error("删除失败!");
+		}
+	}
 
 	/**
 	 * VUEN-2584【issue】平台sql注入漏洞几个问题

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.util.oConvertUtils;
@@ -15,6 +15,8 @@ import org.jeecg.modules.system.service.ISysGatewayRouteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -75,4 +77,72 @@ public class SysGatewayRouteController extends JeecgController<SysGatewayRoute,
         return Result.ok("删除路由成功");
     }
 
+	/**
+	 * 查询被删除的列表
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteList", method = RequestMethod.GET)
+	public Result<List<SysGatewayRoute>> deleteList(HttpServletRequest request) {
+		Result<List<SysGatewayRoute>> result = new Result<>();
+		List<SysGatewayRoute> list = sysGatewayRouteService.getDeletelist();
+		result.setSuccess(true);
+		result.setResult(list);
+		return result;
+	}
+
+	/**
+	 * 还原被逻辑删除的路由
+	 *
+	 * @param jsonObject
+	 * @return
+	 */
+	@RequiresPermissions("system:gateway:putRecycleBin")
+	@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
+	public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
+		try {
+			String ids = jsonObject.getString("ids");
+			if (StringUtils.isNotBlank(ids)) {
+				sysGatewayRouteService.revertLogicDeleted(Arrays.asList(ids.split(",")));
+				return Result.ok("操作成功!");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Result.error("操作失败!");
+		}
+		return Result.ok("还原成功");
+	}
+	/**
+	 * 彻底删除路由
+	 *
+	 * @param ids 被删除的路由ID，多个id用半角逗号分割
+	 * @return
+	 */
+	@RequiresPermissions("system:gateway:deleteRecycleBin")
+	@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
+	public Result deleteRecycleBin(@RequestParam("ids") String ids) {
+		try {
+			if (StringUtils.isNotBlank(ids)) {
+				sysGatewayRouteService.deleteLogicDeleted(Arrays.asList(ids.split(",")));
+			}
+			return Result.ok("删除成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Result.error("删除失败!");
+		}
+	}
+	/**
+	 * 复制路由
+	 *
+	 * @param id 路由id
+	 * @return
+	 */
+	@RequiresPermissions("system:gateway:copyRoute")
+	@RequestMapping(value = "/copyRoute", method = RequestMethod.GET)
+	public Result<SysGatewayRoute> copyRoute(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
+		Result<SysGatewayRoute> result = new Result<>();
+		SysGatewayRoute sysGatewayRoute= sysGatewayRouteService.copyRoute(id);
+		result.setResult(sysGatewayRoute);
+		result.setSuccess(true);
+		return result;
+	}
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -604,9 +604,8 @@ public class SysPermissionController {
 			log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
 
 			//update-begin---author:scott ---date:2024-06-18  for：【TV360X-1320】分配权限必须退出重新登录才生效，造成很多用户困扰---
-			// 获取当前用户的Subject对象
-			Subject currentUser = SecurityUtils.getSubject();
 			// 清除当前用户的授权缓存信息
+			Subject currentUser = SecurityUtils.getSubject();
 			if (currentUser.isAuthenticated()) {
 				shiroRealm.clearCache(currentUser.getPrincipals());
 			}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java

@@ -219,26 +219,31 @@ public class SysPositionController {
      * @param response
      */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+    public ModelAndView exportXls(SysPosition sysPosition,HttpServletRequest request, HttpServletResponse response) {
         // Step.1 组装查询条件
         QueryWrapper<SysPosition> queryWrapper = null;
         try {
             String paramsStr = request.getParameter("paramsStr");
             if (oConvertUtils.isNotEmpty(paramsStr)) {
                 String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                SysPosition sysPosition = JSON.parseObject(deString, SysPosition.class);
+                sysPosition = JSON.parseObject(deString, SysPosition.class);
                 //------------------------------------------------------------------------------------------------
                 //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
                 if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
                     sysPosition.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
                 }
                 //------------------------------------------------------------------------------------------------
-                queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap());
             }
+            queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap());
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-
+        //update-begin--Author:liusq  Date:20240715 for：[03]职务导出，如果选择数据则只导出相关数据--------------------
+        String selections = request.getParameter("selections");
+        if(!oConvertUtils.isEmpty(selections)){
+            queryWrapper.in("id",selections.split(","));
+        }
+        //update-end--Author:liusq  Date:20240715 for：[03]职务导出，如果选择数据则只导出相关数据----------------------
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         List<SysPosition> pageList = sysPositionService.list(queryWrapper);

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -220,7 +220,7 @@ public class SysRoleController {
 			String username = "admin";
 			if(getRoleCount == 0 && !username.equals(sysUser.getUsername())){
 				baseCommonService.addLog("未经授权，删除非本租户下的角色ID：" + id + "，操作人：" + sysUser.getUsername(), CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_4);
-				return Result.error("删除角色失败，删除角色不属于登录租户！");
+				return Result.error("删除角色失败,当前角色不在此租户中。");
 			}
 		}
     	

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -42,7 +43,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      * @param req
      * @return
      */
-    @RequiresRoles("admin")
+    //@RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:list")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(
             SysTableWhiteList sysTableWhiteList,
@@ -64,7 +66,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      */
     @AutoLog(value = "系统表白名单-添加")
     @ApiOperation(value = "系统表白名单-添加", notes = "系统表白名单-添加")
-    @RequiresRoles("admin")
+    //@RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:add")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody SysTableWhiteList sysTableWhiteList) {
         if (sysTableWhiteListService.add(sysTableWhiteList)) {
@@ -82,7 +85,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      */
     @AutoLog(value = "系统表白名单-编辑")
     @ApiOperation(value = "系统表白名单-编辑", notes = "系统表白名单-编辑")
-    @RequiresRoles("admin")
+    //@RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<?> edit(@RequestBody SysTableWhiteList sysTableWhiteList) {
         if (sysTableWhiteListService.edit(sysTableWhiteList)) {
@@ -100,7 +104,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      */
     @AutoLog(value = "系统表白名单-通过id删除")
     @ApiOperation(value = "系统表白名单-通过id删除", notes = "系统表白名单-通过id删除")
-    @RequiresRoles("admin")
+//    @RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:delete")
     @DeleteMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id") String id) {
         if (sysTableWhiteListService.deleteByIds(id)) {
@@ -118,7 +123,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      */
     @AutoLog(value = "系统表白名单-批量删除")
     @ApiOperation(value = "系统表白名单-批量删除", notes = "系统表白名单-批量删除")
-    @RequiresRoles("admin")
+//    @RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
         if (sysTableWhiteListService.deleteByIds(ids)) {
@@ -136,7 +142,8 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
      */
     @AutoLog(value = "系统表白名单-通过id查询")
     @ApiOperation(value = "系统表白名单-通过id查询", notes = "系统表白名单-通过id查询")
-    @RequiresRoles("admin")
+//    @RequiresRoles("admin")
+    @RequiresPermissions("system:tableWhite:queryById")
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
         SysTableWhiteList sysTableWhiteList = sysTableWhiteListService.getById(id);

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -205,7 +205,8 @@ public class SysUserController {
                 // 修改用户走一个service 保证事务
                 //获取租户ids
                 String relTenantIds = jsonObject.getString("relTenantIds");
-				sysUserService.editUser(user, roles, departs, relTenantIds);
+                String updateFromPage = jsonObject.getString("updateFromPage");
+				sysUserService.editUser(user, roles, departs, relTenantIds, updateFromPage);
 				result.success("修改成功!");
 			}
 		} catch (Exception e) {
@@ -222,7 +223,12 @@ public class SysUserController {
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
+        List<String> userNameList = sysUserService.userIdToUsername(Arrays.asList(id));
 		this.sysUserService.deleteUser(id);
+
+        if (!userNameList.isEmpty()) {
+            String joinedString = String.join(",", userNameList);
+        }
 		return Result.ok("删除用户成功");
 	}
 
@@ -233,7 +239,13 @@ public class SysUserController {
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
+        List<String> userNameList = sysUserService.userIdToUsername(Arrays.asList(ids.split(",")));
 		this.sysUserService.deleteBatchUsers(ids);
+		
+        // 用户变更，触发同步工作流
+        if (!userNameList.isEmpty()) {
+            String joinedString = String.join(",", userNameList);
+        }
 		return Result.ok("批量删除用户成功");
 	}
 
@@ -906,6 +918,9 @@ public class SysUserController {
             boolean b = sysUserDepartService.remove(queryWrapper);
             if(b){
                 departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId);
+            }else{
+                result.error500("删除失败，目标用户不在当前部门！");
+                return result;
             }
             result.success("删除成功!");
         }catch(Exception e) {
@@ -1286,7 +1301,7 @@ public class SysUserController {
      * @param jsonObject
      * @return
      */
-    @RequiresRoles({"admin"})
+    @RequiresPermissions("system:user:app:edit")
     @RequestMapping(value = "/appEdit", method = {RequestMethod.PUT,RequestMethod.POST})
     public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
         Result<SysUser> result = new Result<SysUser>();
@@ -1829,4 +1844,19 @@ public class SysUserController {
     public Result<?> importAppUser(HttpServletRequest request, HttpServletResponse response)throws IOException {
         return sysUserService.importAppUser(request);
     }
+
+    /**
+     * 发送短信验证码接口(修改手机号)
+     *
+     * @param jsonObject
+     * @return
+     */
+    @PostMapping(value = "/sendChangePhoneSms")
+    public Result<String> sendChangePhoneSms(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
+        //获取登录用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        String ipAddress = IpUtils.getIpAddr(request);
+        sysUserService.sendChangePhoneSms(jsonObject, username, ipAddress);
+        return Result.ok("发送验证码成功！");
+    }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java

@@ -11,12 +11,14 @@ import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
+import me.zhyd.oauth.utils.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.*;
 import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysThirdAccount;
 import org.jeecg.modules.system.entity.SysThirdAppConfig;
 import org.jeecg.modules.system.entity.SysUser;
@@ -25,6 +27,7 @@ import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysThirdAccountService;
 import org.jeecg.modules.system.service.ISysThirdAppConfigService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl;
 import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +63,8 @@ public class ThirdLoginController {
     private RedisUtil redisUtil;
 	@Autowired
 	private AuthRequestFactory factory;
+	@Autowired
+	private ISysDepartService sysDepartService;
 
 	@Autowired
 	private ThirdAppWechatEnterpriseServiceImpl thirdAppWechatEnterpriseService;
@@ -250,8 +255,8 @@ public class ThirdLoginController {
 		}
 		//update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的
 		JSONObject obj = new JSONObject();
-		//TODO 第三方登确定登录租户和部门逻辑
-
+		//第三方登确定登录租户和部门逻辑
+		this.setUserTenantAndDepart(sysUser,obj,result);		
 		//用户登录信息
 		obj.put("userInfo", sysUser);
 		//获取字典缓存【解决 #jeecg-boot/issues/3998】
@@ -528,4 +533,88 @@ public class ThirdLoginController {
 			return Result.error("注册失败");
 		}
 	}
+
+	/**
+	 * 设置用户租户和部门信息
+	 *
+	 * @param sysUser
+	 * @param obj
+	 * @param result
+	 */
+	private void setUserTenantAndDepart(SysUser sysUser, JSONObject obj, Result<JSONObject> result) {
+		//1.设置登录租户
+		sysUserService.setLoginTenant(sysUser, obj, sysUser.getUsername(), result);
+		//2.设置登录部门
+		String orgCode = sysUser.getOrgCode();
+		//部门不为空还是用原来的部门code
+		if(StringUtils.isEmpty(orgCode)){
+			List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+			//部门不为空取第一个作为当前登录部门
+			if(CollectionUtil.isNotEmpty(departs)){
+				orgCode = departs.get(0).getOrgCode();
+				sysUser.setOrgCode(orgCode);
+				this.sysUserService.updateUserDepart(sysUser.getUsername(), orgCode,null);
+			}
+		}
+	}
+
+	/**
+	 * 新版钉钉登录
+	 *
+	 * @param authCode
+	 * @param state
+	 * @param tenantId
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@GetMapping("/oauth2/dingding/login")
+	public String OauthDingDingLogin(@RequestParam(value = "authCode", required = false) String authCode,
+									 @RequestParam("state") String state,
+									 @RequestParam(name = "tenantId",defaultValue = "0") String tenantId,
+									 HttpServletResponse response) {
+		SysUser loginUser = thirdAppDingtalkService.oauthDingDingLogin(authCode,Integer.valueOf(tenantId));
+		try {
+			String redirect = "";
+			if (state.indexOf("?") > 0) {
+				String[] arr = state.split("\\?");
+				state = arr[0];
+				if(arr.length>1){
+					redirect = arr[1];
+				}
+			}
+			String token = saveToken(loginUser);
+			state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8") + "&tenantId=" + URLEncoder.encode(tenantId, "UTF-8");
+			state += "&thirdType=DINGTALK";
+			if (redirect != null && redirect.length() > 0) {
+				state += "&" + redirect;
+			}
+			log.info("OAuth2登录重定向地址: " + state);
+			try {
+				response.sendRedirect(state);
+				return "ok";
+			} catch (IOException e) {
+				log.error(e.getMessage(),e);
+				return "重定向失败";
+			}
+		} catch (UnsupportedEncodingException e) {
+			log.error(e.getMessage(),e);
+			return "解码失败";
+		}
+	}
+
+	/**
+	 * 获取企业id和应用id
+	 * @param tenantId
+	 * @return
+	 */
+	@ResponseBody
+	@GetMapping("/get/corpId/clientId")
+	public Result<SysThirdAppConfig> getCorpIdClientId(@RequestParam(value = "tenantId", defaultValue = "0") String tenantId){
+		Result<SysThirdAppConfig> result = new Result<>();
+		SysThirdAppConfig sysThirdAppConfig = thirdAppDingtalkService.getCorpIdClientId(Integer.valueOf(tenantId));
+		result.setSuccess(true);
+		result.setResult(sysThirdAppConfig);
+		return result;
+	}
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.system.controller;
 import javax.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.system.util.XssUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +25,13 @@ public class WechatVerifyController {
      */
     @RequestMapping(value = "/WW_verify_{code}.txt")
     public void mpVerify(@PathVariable("code") String code, HttpServletResponse response) {
+        if(StringUtils.isEmpty(code)){
+            log.error("企业微信证书验证失败！(code为空)");
+            return;
+        }
         try {
             PrintWriter writer = response.getWriter();
+            code = XssUtils.scriptXss(code);
             writer.write(code);
             writer.close();
         } catch (Exception e) {

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -77,4 +78,11 @@ public class SysComment implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+
+    /**
+     * 不是数据库字段，用于评论跳转
+     */
+    @TableField(exist = false)
+    private String tableId;
+
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -97,6 +98,12 @@ public class SysGatewayRoute implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
+
+    /**
+     * 删除状态（0未删除，1已删除）
+     */
+    @TableLogic
+    private Integer delFlag;
     /*    *//**更新人*//*
     @ApiModelProperty(value = "更新人")
     private String updateBy;

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java

@@ -47,7 +47,7 @@ public class SysPosition {
     /**
      * 职级
      */
-    @Excel(name = "职级", width = 15,dicCode ="position_rank")
+    //@Excel(name = "职级", width = 15,dicCode ="position_rank")
     @ApiModelProperty(value = "职级")
     @Dict(dicCode = "position_rank")
     private java.lang.String postRank;

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java

@@ -51,10 +51,10 @@ public class SysThirdAppConfig {
     @ApiModelProperty(value = "钉钉/企业微信应用id对应的秘钥")
     private String clientSecret;
 
-    /**企业微信自建应用Secret*/
-    @Excel(name = "企业微信自建应用Secret", width = 15)
-    @ApiModelProperty(value = "企业微信自建应用Secret")
-    private String agentAppSecret;
+    /**钉钉企业id*/
+    @Excel(name = "钉钉企业id", width = 15)
+    @ApiModelProperty(value = "钉钉企业id")
+    private String corpId;
 
     /**第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)*/
     @Excel(name = "第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)", width = 15)

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -177,5 +177,5 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	 * @param parentId
 	 * @return
 	 */
-    List<SysDepartExportVo> getSysDepartList(@Param("parentId") String parentId,@Param("tenantId") Integer tenantId);
+    List<SysDepartExportVo> getSysDepartList(@Param("parentId") String parentId,@Param("tenantId") Integer tenantId, List<String> idList);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysDepartRolePermissionMapper extends BaseMapper<SysDepartRolePermission> {
 
+    void deleteByRoleIds(@Param("ids")List<String> ids);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysDepartRoleUserMapper extends BaseMapper<SysDepartRoleUser> {
 
+    void deleteByRoleIds(@Param("ids")List<String> ids);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -200,4 +200,18 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 	 */
 	@Select("select * from sys_dict where del_flag = 1 and tenant_id = #{tenantId}")
 	List<SysDict> queryDeleteListBtTenantId(@Param("tenantId") Integer tenantId);
+
+	/**
+	 * 还原被逻辑删除的数据（根据id）
+	 * @param ids
+	 * @return
+	 */
+	int revertLogicDeleted(@Param("ids") List<String> ids);
+
+	/**
+	 *  彻底删除的数据（根据ids）
+	 * @param ids
+	 * @return
+	 */
+    int removeLogicDeleted(@Param("ids")List<String> ids);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.system.entity.SysGatewayRoute;
 
+import java.util.List;
+
 /**
  * @Description: gateway路由管理
  * @Author: jeecg-boot
@@ -10,5 +14,22 @@ import org.jeecg.modules.system.entity.SysGatewayRoute;
  * @Version: V1.0
  */
 public interface SysGatewayRouteMapper extends BaseMapper<SysGatewayRoute> {
+    /**
+     * 还原逻辑删除
+     * @param ids
+     */
+    int revertLogicDeleted(@Param("ids") List<String> ids);
 
+    /**
+     *彻底删除
+     * @param ids
+     */
+    int deleteLogicDeleted(@Param("ids") List<String> ids);
+
+    /**
+     * 查询删除的列表
+     * @return
+     */
+    @Select("select * from sys_gateway_route where del_flag = 1")
+    List<SysGatewayRoute> queryDeleteList();
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml

@@ -47,7 +47,10 @@
 
 	<!-- 获取用户未读消息数量 -->
 	<select id="getUnreadMessageCountByUserId" resultType="java.lang.Integer">
-		select count(1) from sys_announcement_send where user_id = #{userId} and read_flag = 0 and create_time &gt;= #{beginDate}
+		<!-- update by wangshuai 2024-07-02【TV360X-1682】撤销之后数量还显示，但是点开面板没有这条数据，他会一直显示有数据，需要联查判断已经发送的-->
+		select count(1) from sys_announcement_send sas
+		right join sys_announcement sa on sas.annt_id = sa.id and sa.send_status = '1'
+	    where sas.user_id = #{userId} and sas.read_flag = 0 and sas.create_time &gt;= #{beginDate}
 	</select>
 	
 	<!-- 查询消息记录 -->

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -58,6 +58,10 @@
         <if test="announcementSendModel.msgCategory !=null and announcementSendModel.msgCategory != ''">
             and sa.msg_category = #{announcementSendModel.msgCategory}
         </if>
+		<if test="announcementSendModel.sendTimeBegin !=null and announcementSendModel.sendTimeBegin != '' 
+		and announcementSendModel.sendTimeEnd != '' and announcementSendModel.sendTimeEnd != ''">
+			and sa.send_time between #{announcementSendModel.sendTimeBegin} and #{announcementSendModel.sendTimeEnd}
+		</if>
 	   order by sas.read_flag,sa.send_time desc
 	</select>
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -182,9 +182,15 @@
                 parent_id = #{parentId}
             </when>
             <otherwise>
-                parent_id IS NULL OR parent_id=''
+                (parent_id IS NULL OR parent_id='')
             </otherwise>
         </choose>
+        <if test="idList != null and !idList.isEmpty()">
+            and id in
+            <foreach item="id" index="index" collection="idList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY depart_order DESC
     </select>
 </mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper">
 
+    <delete id="deleteByRoleIds">
+        DELETE FROM sys_depart_role_permission
+        WHERE role_id IN
+        <foreach collection="ids" item="roleId" open="(" close=")" separator="," >
+            #{roleId}
+        </foreach>
+    </delete>
 </mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleUserMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysDepartRoleUserMapper">
 
+    <delete id="deleteByRoleIds">
+        DELETE FROM sys_depart_role_user
+        WHERE drole_id IN
+        <foreach collection="ids" item="roleId" open="(" close=")" separator="," >
+            #{roleId}
+        </foreach>
+    </delete>
 </mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -217,5 +217,29 @@
 		and tenant_id = #{tenantId}
 	</select>
 
+	<!-- 还原被逻辑删除的字典 -->
+	<update id="revertLogicDeleted">
+		UPDATE
+		sys_dict
+		SET
+		del_flag = 0
+		WHERE
+		del_flag = 1
+		AND id IN
+		<foreach collection="ids" item="dictId" open="(" close=")" separator="," >
+			#{dictId}
+		</foreach>
+	</update>
+
+	<!-- 彻底删除字典 -->
+	<delete id="removeLogicDeleted">
+		DELETE FROM sys_dict
+		WHERE
+		del_flag = 1
+		AND id IN
+		<foreach collection="ids" item="dictId" open="(" close=")" separator="," >
+			#{dictId}
+		</foreach>
+	</delete>
 
 </mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysGatewayRouteMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysGatewayRouteMapper">
 
+    <!-- 还原被逻辑删除的路由 -->
+    <update id="revertLogicDeleted">
+        UPDATE
+        sys_gateway_route
+        SET
+        del_flag = 0
+        WHERE
+        del_flag = 1
+        AND id IN
+        <foreach collection="ids" item="routeId" open="(" close=")" separator="," >
+            #{routeId}
+        </foreach>
+    </update>
+
+    <!-- 彻底删除路由 -->
+    <delete id="deleteLogicDeleted">
+        DELETE FROM sys_gateway_route
+        WHERE
+        del_flag = 1
+        AND id IN
+        <foreach collection="ids" item="routeId" open="(" close=")" separator="," >
+            #{routeId}
+        </foreach>
+    </delete>
+
 </mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml

@@ -181,7 +181,29 @@
 
 	<!-- 查询部门权限数据 -->
 	<select id="queryDepartPermissionList" parameterType="String"  resultType="org.jeecg.modules.system.entity.SysPermission">
-		SELECT * FROM sys_permission
+		SELECT
+			id,
+			parent_id,
+			name,
+			url,
+			component,
+			is_route,
+			component_name,
+			redirect,
+			menu_type,
+			perms,
+			perms_type,
+			sort_no,
+			always_show,
+			icon,
+			is_leaf AS leaf,
+			keep_alive,
+			hidden,
+			hide_tab,
+			rule_flag,
+			status,
+			internal_or_external
+		FROM sys_permission
 		where del_flag = 0
 		and id in (
 			select permission_id from sys_depart_permission where depart_id = #{departId}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml

@@ -10,9 +10,20 @@
             AND role_name like #{bindKeyword}
         </if>
         <if test="role.roleCode!='' and role.roleCode!=null">
-            <bind name="bindRoleCode" value="'%'+role.roleCode+'%'"/>
-            AND role_code like #{bindRoleCode}
+            <choose>
+                <when test="role.roleCode.indexOf(',') != -1">
+                    AND role_code in
+                    <foreach item="item" index="index" collection="role.roleCode.split(',')" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </when>
+                <otherwise>
+                    <bind name="bindRoleCode" value="'%'+role.roleCode+'%'"/>
+                    AND role_code like #{bindRoleCode}
+                </otherwise>
+            </choose>
         </if>
+       order by create_time desc
     </select>
    
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -23,9 +23,10 @@
 
 	<!-- 根据部门查询部门用户 分页 -->
 	<select id="queryDepartUserPageList" resultType="org.jeecg.modules.system.entity.SysUser">
-		select a.*, c.depart_name as org_code_txt from sys_user a
-		join sys_user_depart b on b.user_id = a.id
-		join sys_depart c on b.dep_id = c.id
+		<!-- update by wangshuai 2024-07-03【issues/6342】部门人员选择组件出现人员重复-->
+		select DISTINCT a.* from sys_user a
+		left join sys_user_depart b on b.user_id = a.id
+		left join sys_depart c on b.dep_id = c.id
 		<bind name="bindOrgCode" value="orgCode+'%'"/>
 		where a.del_flag = 0 and a.status = 1 and c.org_code like #{bindOrgCode} and a.username!='_reserve_user_external'
 		<if test="username!=null and username!=''">

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -74,4 +74,13 @@ public class AnnouncementSendModel implements Serializable {
 	 */
 	private java.lang.String msgAbstract;
 
+	/**
+	 * 发布开始日期
+	 */
+	private java.lang.String sendTimeBegin;
+	
+	/**
+	 * 发布结束日期
+	 */
+	private java.lang.String sendTimeEnd;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java

@@ -21,4 +21,9 @@ public interface ISysDepartRoleService extends IService<SysDepartRole> {
      */
     List<SysDepartRole> queryDeptRoleByDeptAndUser(String orgCode, String userId);
 
+    /**
+     *  删除部门角色和对应关联表信息
+     * @param ids
+     */
+    void deleteDepartRole(List<String> ids);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -229,9 +229,10 @@ public interface ISysDepartService extends IService<SysDepart>{
     /**
      * 根据租户id导出部门
      * @param tenantId
+     * @param idList
      * @return
      */
-    List<SysDepartExportVo> getExportDepart(Integer tenantId);
+    List<SysDepartExportVo> getExportDepart(Integer tenantId, List<String> idList);
 
     /**
      * 导出系统部门excel

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -194,7 +194,7 @@ public interface ISysDictService extends IService<SysDict> {
 	 * @return
 	 */
 	@Deprecated
-	public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize);
+	public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageNo, int pageSize);
 
 	/**
 	 * 查询字典表所有数据
@@ -264,10 +264,11 @@ public interface ISysDictService extends IService<SysDict> {
      *
      * @param dictCode 字典code格式：table,text,code
      * @param keyword
+     * @param pageNo
      * @param pageSize 每页条数
      * @return
      */
-    List<DictModel> loadDict(String dictCode, String keyword, Integer pageSize);
+    List<DictModel> loadDict(String dictCode, String keyword, Integer pageNo, Integer pageSize);
 
 	/**
 	 * 根据应用id获取字典列表和详情
@@ -287,4 +288,16 @@ public interface ISysDictService extends IService<SysDict> {
 	 * @param sysDictVo
 	 */
 	void editDictByLowAppId(SysDictVo sysDictVo);
+
+	/**
+	 * 还原逻辑删除
+	 * @param ids
+	 */
+	boolean revertLogicDeleted(List<String> ids);
+
+	/**
+	 * 彻底删除数据
+	 * @param ids
+	 */
+	boolean removeLogicDeleted(List<String> ids);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.entity.SysGatewayRoute;
 
+import java.util.List;
+
 /**
  * @Description: gateway路由管理
  * @Author: jeecg-boot
@@ -35,4 +37,28 @@ public interface ISysGatewayRouteService extends IService<SysGatewayRoute> {
      */
     void clearRedis();
 
+    /**
+     * 还原逻辑删除
+     * @param ids
+     */
+    void revertLogicDeleted(List<String> ids);
+
+    /**
+     * 彻底删除
+     * @param ids
+     */
+    void deleteLogicDeleted(List<String> ids);
+
+    /**
+     * 复制路由
+     * @param id
+     * @return
+     */
+    SysGatewayRoute copyRoute(String id);
+
+    /**
+     * 获取删除列表
+     * @return
+     */
+    List<SysGatewayRoute> getDeletelist();
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -89,7 +89,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param user
 	 * @param roles
 	 */
-	public void addUserWithRole(SysUser user, String roles);
+	public void addUserWithRole(SysUser user,String roles);
 	
 	
 	/**
@@ -97,7 +97,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param user
 	 * @param roles
 	 */
-	public void editUserWithRole(SysUser user, String roles);
+	public void editUserWithRole(SysUser user,String roles);
 
 	/**
 	 * 获取用户的授权角色
@@ -113,7 +113,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param version 前端UI版本
 	 * @return
 	 */
-	public SysRoleIndex getDynamicIndexByUserRole(String username, String version);
+	public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
 	
 	/**
 	  * 查询用户信息包括 部门信息
@@ -177,7 +177,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param username 用户账户名称
 	 * @return
 	 */
-	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username);
+	public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
 
 	/**
 	 * 通过用户名获取用户角色集合
@@ -311,8 +311,9 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param roles 选择的角色id，多个以逗号隔开
 	 * @param departs 选择的部门id，多个以逗号隔开
 	 * @param relTenantIds 多个租户id
+	 * @param updateFromPage 更新来自的页面 [TV360X-1686]
 	 */
-	void editUser(SysUser user, String roles, String departs, String relTenantIds);
+	void editUser(SysUser user, String roles, String departs, String relTenantIds, String updateFromPage);
 
 	/**
      * userId转为username
@@ -355,7 +356,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param sysUser
 	 * @return
 	 */
-	Result<JSONObject> setLoginTenant(SysUser sysUser, JSONObject obj, String username, Result<JSONObject> result);
+	Result<JSONObject>  setLoginTenant(SysUser sysUser, JSONObject obj, String username, Result<JSONObject> result);
 
 	//--- author:taoyan date:20221231 for: QQYUN-3515【应用】应用下的组织机构管理功能，细节实现 ---
 	/**
@@ -399,7 +400,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	void editTenantUser(SysUser sysUser, String tenantId, String departs, String roles);
 
-	/**
+/**
 	 * 修改用户账号状态
 	 * @param id 账号id
 	 * @param status 账号状态
@@ -442,4 +443,19 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param ipAddress ip地址
 	 */
 	void sendChangePhoneSms(JSONObject jsonObject, String username, String ipAddress);
+
+	/**
+	 * 发送注销用户手机号验证密码[敲敲云专用]
+	 * @param jsonObject
+	 * @param username
+	 * @param ipAddress
+	 */
+	void sendLogOffPhoneSms(JSONObject jsonObject, String username, String ipAddress);
+
+	/**
+	 * 用户注销[敲敲云专用]
+	 * @param jsonObject
+	 * @param username
+	 */
+	void userLogOff(JSONObject jsonObject, String username);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1531,8 +1531,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	 * @return
 	 */
 	@Override
-	public List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize) {
-		return sysDictService.loadDict(dictCode, keyword, pageSize);
+	public List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageNo, Integer pageSize) {
+		return sysDictService.loadDict(dictCode, keyword,pageNo, pageSize);
 	}
 
 	@Override
@@ -1597,7 +1597,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 				// 邮件消息要解析Markdown
 				message.setContent(HTMLUtils.parseMarkdown(message.getContent()));
 			}
-			emailSendMsgHandle.sendMessage(message);
+			//update-begin---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
+			if(message.getIsTimeJob() != null && message.getIsTimeJob()){
+				emailSendMsgHandle.sendEmailMessage(message);
+			}else{
+				emailSendMsgHandle.sendMessage(message);
+			}
+			//update-end---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定---
 		}else if(MessageTypeEnum.DD.getType().equals(messageType)){
 			ddSendMsgHandle.sendMessage(message);
 		}else if(MessageTypeEnum.QYWX.getType().equals(messageType)){