Merge pull request #7797 from EightMonth/springboot3

固定vue-router版本号

README-EN.md

@@ -7,12 +7,12 @@
 JEECG BOOT Low Code Development Platform
 ===============
 
-Current version: 3.7.2 (Release date: 2024-12-12)
+Current version: 3.7.1 (Release date: 2024-09-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/version-3.7.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.7.1-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)
 
@@ -75,7 +75,7 @@ Technical documentation
 - Demo ： [OnlineDemo](http://boot3.jeecg.com) | [APP](http://jeecg.com/appIndex)
 - 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)
+- QQ group ： ⑨808791225、⑧825232878、⑦791696430、⑥730954414(full)、683903138(full)、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
 
 
 
@@ -196,7 +196,7 @@ Technical Architecture:
 
 - Persistence layer framework: MybatisPlus 3.5.3.2
 
-- Report tool: JimuReport 1.9.1
+- Report tool: JimuReport 1.8.1
 
 - Security framework: Apache Shiro 1.12.0, Jwt 3.11.0
 

README.md

@@ -2,12 +2,12 @@
 JeecgBoot 低代码开发平台
 ===============
 
-当前最新版本： 3.7.2（发布日期：2024-12-12） 
+当前最新版本： 3.7.1（发布日期：2024-09-12） 
 
 
 [![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)
+[![](https://img.shields.io/badge/version-3.7.1-brightgreen.svg)](https://github.com/jeecgboot/JeecgBoot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/jeecgboot/JeecgBoot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/jeecgboot/JeecgBoot)
 
@@ -18,7 +18,7 @@ JeecgBoot 低代码开发平台
 
 <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集成AI模型能力，引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
+JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端分离架构 SpringBoot2.x和3.x，SpringCloud，Ant Design Vue3，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot 引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
 
 JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零代码`：Online表单开发、Online报表、报表配置能力、在线图表设计、仪表盘设计、大屏设计、移动配置能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）等等！
 
@@ -33,6 +33,7 @@ JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零
 Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，支持信创国产化（默认适配达梦和人大金仓）。尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
 
 
+
 #### 项目说明
 
 | 项目名                | 说明                     | 
@@ -42,27 +43,15 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 | `jeecg-uniapp` | [配套APP框架](https://github.com/jeecgboot/jeecg-uniapp) 适配多个终端，支持APP、小程序、H5 |
 
 
-开源协议说明
------------------------------------
-JeecgBoot开源版本，底层完全开源可以自主开发，遵循Apache2.0协议，详细见 https://github.com/jeecgboot/JeecgBoot#Apache-2.0-1-ov-file
-
-开源协议中文释意如下：
-- 1.JeecgBoot开源版本无任何限制，在遵循本开源协议条款下，允许商用使用，不会造成侵权行为。
-- 2.允许基于本平台软件开展业务系统开发。
-- 3.在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件。
-- 4.针对企业用户我们也提供“企业级版本”，详细见 https://jeecg.com/vip
-
-
 技术文档
 -----------------------------------
 
 - 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
 - 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
-- 快速体验： [一分钟体验低代码](https://jeecg.blog.csdn.net/article/details/106079007?spm=1001.2014.3001.5502 "一分钟体验零代码") | [在线体验零代码](https://app.qiaoqiaoyun.com/myapps/index "在线体验零代码")
 - 开发文档：  [https://help.jeecg.com](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(满)、其他(满)
+- QQ交流群 ： ⑨808791225、其他(满)
 
 
 
@@ -85,7 +74,7 @@ JeecgBoot开源版本，底层完全开源可以自主开发，遵循Apache2.0
 - 基础框架：Spring Boot 2.7.18
 - 微服务框架： Spring Cloud Alibaba 2021.0.1.0
 - 持久层框架：MybatisPlus 3.5.3.2
-- 报表工具： JimuReport 1.9.1
+- 报表工具： JimuReport 1.8.1
 - 安全框架：Apache Shiro 1.12.0，Jwt 3.11.0
 - 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
 - 数据库连接池：阿里巴巴Druid 1.1.22
@@ -163,7 +152,7 @@ JeecgBoot开源版本，底层完全开源可以自主开发，遵循Apache2.0
 -----------------------------------
 * 1.采用最新主流前后分离框架（Springboot+Mybatis+antd+vue3），容易上手; 代码生成器依赖性低,灵活的扩展能力，可快速实现二次开发;
 * 2.支持微服务SpringCloud Alibaba(Nacos、Gateway、Sentinel、Skywalking)，提供切换机制支持单体和微服务自由切换
-* 3.开发效率高,采用代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用；引入AI能力，支持自动建表等功能；
+* 3.开发效率高,采用代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用；
 * 4.代码生成器提供强大模板机制，支持自定义模板，目前提供四套风格模板（单表两套、树模型一套、一对多三套）
 * 5.代码生成器非常智能，在线业务建模、在线配置、所见即所得支持23种类控件，一键生成前后端代码，大幅度提升开发效率，不再为重复工作发愁。
 * 6.低代码能力：Online在线表单（无需编码，通过在线配置表单，实现表单的增删改查，支持单表、树、一对多、一对一等模型，实现人人皆可编码）

jeecg-boot/README.md

@@ -2,12 +2,12 @@
 JeecgBoot 低代码开发平台
 ===============
 
-当前最新版本： 3.7.2（发布日期：2024-12-12） 
+当前最新版本： 3.7.1（发布日期：2024-09-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)
+[![](https://img.shields.io/badge/version-3.7.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -35,7 +35,7 @@ JeecgBoot 是一款基于代码生成器的`低代码开发平台`！前后端
 
 - 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
 - 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart)
-- QQ交流群 ： ⑩716488839、⑨808791225、其他(满)
+- QQ交流群 ： ⑨808791225、其他(满)
 - 在线演示 ：  [在线演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)
 > 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 
 

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

@@ -3,7 +3,6 @@
 > JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。
 
 ### 增量升级方案
-
 #### 1.代码合并
  本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；
 
@@ -12,12 +11,5 @@
 - 其他库请手工执行SQL, 目录： `jeecg-module-system\jeecg-system-start\src\main\resources\flyway\sql\mysql`
 > 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。
 
-#### 3.其他数据库脚本说明
+#### 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/jeecg-boot-base-core/pom.xml

@@ -4,11 +4,15 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>3.7.2</version>
+		<version>3.7.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-core</artifactId>
 
+	<properties>
+		<spring-boot.version>3.1.5</spring-boot.version>
+	</properties>
+
 	<repositories>
 		<repository>
 			<id>aliyun</id>
@@ -43,12 +47,22 @@
 		<!--jeecg-tools-->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-common</artifactId>
+			<artifactId>jeecg-boot-common3</artifactId>
 		</dependency>
 		<!--集成springmvc框架并实现自动配置 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
 		<!-- websocket -->
 		<dependency>
@@ -105,14 +119,14 @@
 		<!-- druid -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
+			<artifactId>druid-spring-boot-3-starter</artifactId>
 			<version>${druid.version}</version>
 		</dependency>
 
 		<!-- 动态数据源 -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+			<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
 			<version>${dynamic-datasource-spring-boot-starter.version}</version>
 		</dependency>
 
@@ -164,6 +178,7 @@
 			<version>${dm8.version}</version>
 		</dependency>
       
+
 		<!-- Quartz定时任务 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -182,6 +197,12 @@
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring-boot-starter</artifactId>
 			<version>${shiro.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-spring</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- shiro-redis -->
 		<dependency>
@@ -197,18 +218,61 @@
 					<artifactId>checkstyle</artifactId>
 					<groupId>com.puppycrawl.tools</groupId>
 				</exclusion>
+				<!-- TODO shiro 无法使用 spring boot 3.X 自带的jedis，降版本处理 -->
+				<exclusion>
+					<artifactId>jedis</artifactId>
+					<groupId>redis.clients</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- TODO shiro 无法使用 spring boot 3.X 自带的jedis，降版本处理 -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${jedis.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+			<!-- 排除仍使用了javax.servlet的依赖 -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-web</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- 引入适配jakarta的依赖包 -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-core</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-web</artifactId>
+			<classifier>jakarta</classifier>
+			<version>${shiro.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.shiro</groupId>
+					<artifactId>shiro-core</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<!-- knife4j -->
-<!--		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-spring-boot-starter</artifactId>
-			<version>3.0.3</version>
-		</dependency>-->
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
+			<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
 			<version>${knife4j-spring-boot-starter.version}</version>
 		</dependency>
 
@@ -222,7 +286,7 @@
 
 		<!-- AutoPoi Excel工具类-->
 		<dependency>
-			<groupId>org.jeecgframework</groupId>
+			<groupId>org.jeecgframework.boot3</groupId>
 			<artifactId>autopoi-web</artifactId>
 			<version>${autopoi-web.version}</version>
 			<exclusions>
@@ -265,6 +329,16 @@
 		<dependency>
 			<groupId>com.xkcoding.justauth</groupId>
 			<artifactId>justauth-spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-autoconfigure</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-configuration-processor</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
@@ -292,7 +366,7 @@
 		<!-- chatgpt -->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-starter-chatgpt</artifactId>
+			<artifactId>jeecg-boot-starter3-chatgpt</artifactId>
 		</dependency>
 	</dependencies>
 </project>

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

@@ -2,7 +2,7 @@ package org.jeecg.common.api.dto;
 
 import lombok.Data;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 
 /**

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

@@ -84,12 +84,6 @@ 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/api/vo/Result.java

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

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java

@@ -21,13 +21,14 @@ import org.jeecg.common.util.IpUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.core.StandardReflectionParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.Date;
 
@@ -172,7 +173,7 @@ public class AutoLogAspect {
             // 请求的方法参数值
             Object[] args = joinPoint.getArgs();
             // 请求的方法参数名称
-            LocalVariableTableParameterNameDiscoverer u = new LocalVariableTableParameterNameDiscoverer();
+            StandardReflectionParameterNameDiscoverer u=new StandardReflectionParameterNameDiscoverer();
             String[] paramNames = u.getParameterNames(method);
             if (args != null && paramNames != null) {
                 for (int i = 0; i < args.length; i++) {

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.List;
 

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

@@ -604,11 +604,6 @@ 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/enums/DySmsEnum.java

@@ -15,7 +15,15 @@ public enum DySmsEnum {
 	/**修改密码短信模板编码*/
 	CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"),
 	/**注册账号短信模板编码*/
-	REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","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");
 
 	/**
 	 * 短信模板编码

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

@@ -1,6 +1,8 @@
 package org.jeecg.common.exception;
 
 import cn.hutool.core.util.ObjectUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.shiro.SecurityUtils;
@@ -30,8 +32,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java

@@ -23,9 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 

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

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

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

@@ -805,9 +805,7 @@ public class QueryGenerator {
 					addEasyQuery(queryWrapper, name, rule, DateUtils.str2Date(dateStr,DateUtils.datetimeFormat.get()));
 				}
 			}else {
-				//update-begin---author:chenrui ---date:20241125  for：[issues/7481]多租户模式下 数据权限使用变量：#{tenant_id} 报错------------
+				addEasyQuery(queryWrapper, name, rule, NumberUtils.parseNumber(dataRule.getRuleValue(), propertyType));
-				addEasyQuery(queryWrapper, name, rule, NumberUtils.parseNumber(converRuleValue(dataRule.getRuleValue()), propertyType));
-				//update-end---author:chenrui ---date:20241125  for：[issues/7481]多租户模式下 数据权限使用变量：#{tenant_id} 报错------------
 			}
 		}
 	}

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

@@ -54,10 +54,8 @@ 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/JeecgDataAutorUtils.java

@@ -5,7 +5,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.SpringContextUtils;
 import org.springframework.util.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -11,10 +11,10 @@ import com.google.common.base.Joiner;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Date;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -63,7 +63,7 @@ public class JwtUtil {
             os.flush();
             os.close();
         } catch (IOException e) {
-			log.error(e.getMessage(), e);
+            e.printStackTrace();
         }
     }
 
@@ -82,8 +82,7 @@ public class JwtUtil {
 			// 效验TOKEN
 			DecodedJWT jwt = verifier.verify(token);
 			return true;
-		} catch (Exception e) {
+		} catch (Exception exception) {
-			log.error(e.getMessage(), e);
 			return false;
 		}
 	}
@@ -98,7 +97,6 @@ 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/BrowserUtils.java

@@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * 

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

@@ -19,7 +19,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.sql.DataSource;
 import java.io.ByteArrayInputStream;
 import java.io.File;

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

@@ -1,6 +1,5 @@
 package org.jeecg.common.util;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -9,15 +8,11 @@ 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类，直接通过
@@ -81,32 +76,14 @@ 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(signName);
+        request.setSignName(dySmsEnum.getSignName());
         //必填:短信模板-可在短信控制台中找到
-        request.setTemplateCode(templateCode);
+        request.setTemplateCode(dySmsEnum.getTemplateCode());
         //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
         request.setTemplateParam(templateParamJson.toJSONString());
         

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

@@ -1,10 +1,10 @@
 package org.jeecg.common.util;
 
+import jakarta.servlet.http.HttpServletResponse;
 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;

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

@@ -6,11 +6,7 @@ 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;
 
 
 /**
@@ -46,30 +42,6 @@ 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/IpUtils.java

@@ -1,6 +1,6 @@
 package org.jeecg.common.util;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.CommonConstant;

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(30000);
+        requestFactory.setConnectTimeout(3000);
-        requestFactory.setReadTimeout(30000);
+        requestFactory.setReadTimeout(3000);
         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/SpringContextUtils.java

@@ -1,7 +1,7 @@
 package org.jeecg.common.util;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.ServiceNameConstants;

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

@@ -11,7 +11,7 @@ import org.jeecg.common.exception.JeecgBoot401Exception;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @Author scott

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

@@ -84,10 +84,6 @@ 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);
@@ -110,10 +106,9 @@ public class DynamicDBUtil {
                 dataSource.getConnection().commit();
                 dataSource.getConnection().close();
                 dataSource.close();
-                DataSourceCachePool.removeCache(dbKey);
             }
         } catch (SQLException e) {
-            log.warn(e.getMessage(), e);
+            e.printStackTrace();
         }
     }
 

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

@@ -9,7 +9,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.SymbolConstant;
 import org.springframework.beans.BeanUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -463,7 +463,7 @@ public class oConvertUtils {
 			return false;
 		}
 
-		String[] childs = childArray.toArray(new String[]{});
+		String[] childs = (String[]) childArray.toArray();
 		for (String v : childs) {
 			if (!isIn(v, all)) {
 				return false;

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

@@ -73,12 +73,6 @@ 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/AutoPoiDictConfig.java

@@ -3,7 +3,7 @@ package org.jeecg.config;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.system.vo.DictModel;

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

@@ -2,7 +2,9 @@ package org.jeecg.config;
 
 import java.io.IOException;
 
-import javax.servlet.*;
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
+import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
+import jakarta.servlet.*;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -11,8 +13,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
 
 /**

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

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * @author eightmonth@qq.com
  * 启动程序修改DruidWallConfig配置
  * 允许SELECT语句的WHERE子句是一个永真条件
  * @author eightmonth

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

@@ -1,33 +0,0 @@
-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,12 +21,6 @@ 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

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

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

@@ -0,0 +1,59 @@
+package org.jeecg.config;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.jeecg.common.constant.CommonConstant;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class Swagger3Config implements WebMvcConfigurer {
+        /**
+     *
+     * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
+     *
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    @Bean
+    public GroupedOpenApi swaggerOpenApi() {
+        return GroupedOpenApi.builder()
+                .group("default")
+                .packagesToScan("org.jeecg")
+                // 剔除以下几个包路径的接口生成文档
+                .packagesToExclude("org.jeecg.modules.drag", "org.jeecg.modules.online", "org.jeecg.modules.jmreport")
+                // 加了Operation注解的方法，才生成接口文档
+                .addOpenApiMethodFilter(method -> method.isAnnotationPresent(Operation.class))
+                .build();
+    }
+
+    @Bean
+    public OpenAPI customOpenAPI() {
+        return new OpenAPI()
+                .info(new Info()
+                        .title("JeecgBoot 后台服务API接口文档")
+                        .version("1.0")
+                        .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com"))
+                        .description( "后台API接口")
+                        .termsOfService("NO terms of service")
+                        .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html"))
+                );
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.config;
+
+import io.undertow.server.DefaultByteBufferPool;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UndertowCustomizer implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
+    @Override
+    public void customize(UndertowServletWebServerFactory factory) {
+        factory.addDeploymentInfoCustomizers(deploymentInfo -> {
+            WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
+            webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(false, 1024));
+            deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
+        });
+    }
+}

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

@@ -11,16 +11,20 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
+import jakarta.annotation.Resource;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
+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;
@@ -30,7 +34,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

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/*", "/dragChannelSocket/*", "/vxeSocket/*");
+        bean.addUrlPatterns("/taskCountSocket/*", "/websocket/*","/eoaSocket/*","/eoaNewChatSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
         return bean;
     }
 

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

@@ -3,8 +3,8 @@ package org.jeecg.config.filter;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper;
 
-import javax.servlet.*;
+import jakarta.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**

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

@@ -7,9 +7,9 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 
-import javax.servlet.*;
+import jakarta.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

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

@@ -17,9 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Set;

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

@@ -11,7 +11,7 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.config.mybatis.ThreadLocalDataHelper;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 
 /**

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

@@ -6,8 +6,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 动态数据源切换拦截器

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

@@ -1,5 +1,6 @@
 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;
@@ -32,9 +33,9 @@ import org.springframework.web.filter.DelegatingFilterProxy;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisCluster;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.DispatcherType;
+import jakarta.servlet.Filter;
-import javax.servlet.Filter;
+import jakarta.servlet.DispatcherType;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -126,15 +127,13 @@ 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");
         filterChainDefinitionMap.put("/swagger-ui.html", "anon");
         filterChainDefinitionMap.put("/swagger**/**", "anon");
         filterChainDefinitionMap.put("/webjars/**", "anon");
-        filterChainDefinitionMap.put("/v2/**", "anon");
+        filterChainDefinitionMap.put("/v3/**", "anon");
 
         // update-begin--Author:sunjianlei Date:20210510 for：排除消息通告查看详情页面（用于第三方APP）
         filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
@@ -148,15 +147,9 @@ 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");
@@ -197,24 +190,12 @@ 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);
-        //update-begin---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
+        registration.addUrlPatterns("/*");
-        registration.addUrlPatterns("/test/ai/chat/send");
-        //update-end---author:chenrui ---date:20241202  for：[issues/7491]运行时间好长，效率慢 ------------
         //支持异步
         registration.setAsyncSupported(true);
         registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);

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

@@ -23,8 +23,8 @@ import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Set;
 
 /**
@@ -168,8 +168,8 @@ public class ShiroRealm extends AuthorizingRealm {
 
                     //*********************************************
                     if(!isAuthorization){
-                        log.info("租户异常——登录租户：" + contextTenantId);
+                        log.warn("租户异常——当前登录的租户是：" + contextTenantId);
-                        log.info("租户异常——用户拥有租户组：" + userTenantIds);
+                        log.warn("租户异常——用户拥有的租户是：" + userTenantIds);
                         throw new AuthenticationException("登录租户授权变更，请重新登陆!");
                     }
                     //*********************************************

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

@@ -12,7 +12,7 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter;
 import org.apache.shiro.mgt.SecurityManager;
 import org.springframework.beans.factory.BeanInitializationException;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.util.Map;
 
 /**

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

@@ -13,10 +13,10 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * @Description: 鉴权登录拦截器

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

@@ -1,9 +1,9 @@
 package org.jeecg.config.shiro.filters;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.AccessControlFilter;
 import lombok.extern.slf4j.Slf4j;

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 签名 拦截器配置

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java

@@ -4,8 +4,8 @@ package org.jeecg.config.sign.interceptor;
 import java.io.PrintWriter;
 import java.util.SortedMap;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java

@@ -1,10 +1,10 @@
 package org.jeecg.config.sign.util;
 
-import javax.servlet.ReadListener;
+import jakarta.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.io.*;
 import java.nio.charset.Charset;
 

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java

@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.SymbolConstant;

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java

@@ -14,8 +14,8 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**

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.2</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 服务端提供方——feign接口

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java

@@ -6,8 +6,8 @@ import org.apache.commons.io.IOUtils;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.swing.filechooser.FileSystemView;
 import java.io.File;
 import java.io.IOException;

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java

@@ -18,7 +18,7 @@ import org.jeecg.modules.demo.mock.vxe.entity.MockEntity;
 import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLDecoder;

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java

@@ -6,12 +6,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.VxeSocketConst;
 import org.springframework.stereotype.Component;
 
-import javax.websocket.OnClose;
+import jakarta.websocket.OnClose;
-import javax.websocket.OnMessage;
+import jakarta.websocket.OnMessage;
-import javax.websocket.OnOpen;
+import jakarta.websocket.OnOpen;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
-import javax.websocket.server.PathParam;
+import jakarta.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpoint;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java

@@ -4,13 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.annotations.ApiParam;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.mgt.DefaultSecurityManager;
@@ -31,8 +30,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import reactor.core.publisher.Mono;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -45,7 +42,7 @@ import java.util.List;
  * @Version:V2.0
  */
 @Slf4j
-@Api(tags = "单表DEMO")
+@Tag(name = "单表DEMO")
 @RestController
 @RequestMapping("/test/jeecgDemo")
 public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoService> {
@@ -64,7 +61,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      * @param req
      * @return
      */
-    @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
+    @Operation(summary = "获取所有Demo数据列表")
     @GetMapping(value = "/list")
     @PermissionData(pageComponent = "jeecg/JeecgDemoList")
     public Result<?> list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -89,7 +86,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      */
     @PostMapping(value = "/add")
     @AutoLog(value = "添加测试DEMO")
-    @ApiOperation(value = "添加DEMO", notes = "添加DEMO")
+    @Operation(summary = "添加DEMO")
     public Result<?> add(@RequestBody JeecgDemo jeecgDemo) {
         jeecgDemoService.save(jeecgDemo);
         return Result.OK("添加成功！");
@@ -102,7 +99,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      * @return
      */
     @AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
-    @ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
+    @Operation(summary = "编辑DEMO")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
     public Result<?> edit(@RequestBody JeecgDemo jeecgDemo) {
         jeecgDemoService.updateById(jeecgDemo);
@@ -117,7 +114,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      */
     @AutoLog(value = "删除测试DEMO")
     @DeleteMapping(value = "/delete")
-    @ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
+    @Operation(summary = "通过ID删除DEMO")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         jeecgDemoService.removeById(id);
         return Result.OK("删除成功!");
@@ -130,7 +127,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      * @return
      */
     @DeleteMapping(value = "/deleteBatch")
-    @ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO")
+    @Operation(summary = "批量删除DEMO")
     public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.jeecgDemoService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功！");
@@ -143,8 +140,8 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      * @return
      */
     @GetMapping(value = "/queryById")
-    @ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
+    @Operation(summary = "通过ID查询DEMO")
-    public Result<?> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
+    public Result<?> queryById(/*@ApiParam(name = "id", value = "示例id", required = true)*/ @RequestParam(name = "id", required = true) String id) {
         JeecgDemo jeecgDemo = jeecgDemoService.getById(id);
         return Result.OK(jeecgDemo);
     }
@@ -477,7 +474,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
      * 测试Mono对象
      * @return
      */
-    @ApiOperation("Mono测试")
+    @Operation(summary = "Mono测试")
     @GetMapping(value ="/test")
     public Mono<String> test() {
         //解决shiro报错No SecurityManager accessible to the calling code, either bound to the org.apache.shiro

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java

@@ -1,8 +1,7 @@
 package org.jeecg.modules.demo.test.controller;
 
-import io.lettuce.core.dynamic.annotation.Param;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -11,7 +10,10 @@ import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.service.IJeecgDemoService;
 import org.jeecg.modules.demo.test.service.IJeecgDynamicDataService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -21,7 +23,7 @@ import java.util.List;
  * @Date:2020-04-21
  */
 @Slf4j
-@Api(tags = "动态数据源测试")
+@Tag(name = "动态数据源测试")
 @RestController
 @RequestMapping("/test/dynamic")
 public class JeecgDynamicDataController extends JeecgController<JeecgDemo, IJeecgDemoService> {
@@ -37,7 +39,7 @@ public class JeecgDynamicDataController extends JeecgController<JeecgDemo, IJeec
      */
     @PostMapping(value = "/test1")
     @AutoLog(value = "动态切换数据源")
-    @ApiOperation(value = "动态切换数据源", notes = "动态切换数据源")
+    @Operation(summary = "动态切换数据源")
     public Result<List<JeecgDemo>> selectSpelByKey(@RequestParam(required = false) String dsName) {
         List<JeecgDemo> list = jeecgDynamicDataService.selectSpelByKey(dsName);
         return Result.OK(list);

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java

@@ -17,7 +17,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
 /**

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java

@@ -5,8 +5,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java

@@ -7,8 +7,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.test.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.Version;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -10,8 +11,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,59 +24,59 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="测试DEMO对象", description="测试DEMO")
+@Schema(description="测试DEMO")
 @TableName("demo")
 public class JeecgDemo extends JeecgEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/** 姓名 */
 	@Excel(name="姓名",width=25)
-	@ApiModelProperty(value = "姓名")
+	@Schema(description = "姓名")
 	private java.lang.String name;
 	/** 关键词 */
-	@ApiModelProperty(value = "关键词")
+	@Schema(description = "关键词")
 	@Excel(name="关键词",width=15)
 	private java.lang.String keyWord;
 	/** 打卡时间 */
-	@ApiModelProperty(value = "打卡时间")
+	@Schema(description = "打卡时间")
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date punchTime;
 	/** 工资 */
-	@ApiModelProperty(value = "工资",example = "0")
+	@Schema(description = "工资",example = "0")
 	@Excel(name="工资",type = 4,width=15)
 	private java.math.BigDecimal salaryMoney;
 	/** 奖金 */
-	@ApiModelProperty(value = "奖金",example = "0")
+	@Schema(description = "奖金",example = "0")
 	@Excel(name="奖金",type = 4,width=15)
 	private java.lang.Double bonusMoney;
 	/** 性别 {男:1,女:2} */
-	@ApiModelProperty(value = "性别")
+	@Schema(description = "性别")
 	@Excel(name = "性别", width = 15, dicCode = "sex")
 	private java.lang.String sex;
 	/** 年龄 */
-	@ApiModelProperty(value = "年龄",example = "0")
+	@Schema(description = "年龄",example = "0")
 	@Excel(name="年龄",type = 4,width=15)
 	private java.lang.Integer age;
 	/** 生日 */
-	@ApiModelProperty(value = "生日")
+	@Schema(description = "生日")
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@Excel(name="生日",format="yyyy-MM-dd")
 	private java.util.Date birthday;
 	/** 邮箱 */
-	@ApiModelProperty(value = "邮箱")
+	@Schema(description = "邮箱")
 	@Excel(name="邮箱",width=30)
 	private java.lang.String email;
 	/** 个人简介 */
-	@ApiModelProperty(value = "个人简介")
+	@Schema(description = "个人简介")
 	private java.lang.String content;
 	/** 部门编码 */
 	@Excel(name="部门编码",width=25)
-	@ApiModelProperty(value = "部门编码")
+	@Schema(description = "部门编码")
 	private java.lang.String sysOrgCode;
 
-	@ApiModelProperty(value = "租户ID")
+//	@Schema(description = "租户ID")
 	private java.lang.Integer tenantId;
 	/** 乐观锁字段 */
 	@Version

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java

@@ -18,7 +18,7 @@ import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket;
 import org.jeecg.modules.dlglong.entity.MockEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLDecoder;

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

@@ -1,370 +0,0 @@
-{
-  "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

@@ -1,496 +0,0 @@
-{
-  "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.2</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.2</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.2</version>
+        <version>3.7.1</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.2</version>
+		<version>3.7.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jeecgframework.boot</groupId>
+			<groupId>org.jeecgframework.boot3</groupId>
 			<artifactId>hibernate-re</artifactId>
 		</dependency>
 
@@ -32,12 +32,11 @@
 		<!-- 积木报表 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimureport-spring-boot-starter</artifactId>
+			<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
 		</dependency>
-		<!-- 积木BI -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimubi-spring-boot-starter</artifactId>
+			<artifactId>jimureport-dashboard-spring-boot3-starter</artifactId>
 		</dependency>
 	<!-- 积木报表 mongo redis 支持包 
 		<dependency>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.java

@@ -1,33 +1,33 @@
-package org.jeecg.config.init;
+//package org.jeecg.config.init;
-
+//
-import org.apache.catalina.Context;
+//import org.apache.catalina.Context;
-import org.apache.tomcat.util.scan.StandardJarScanner;
+//import org.apache.tomcat.util.scan.StandardJarScanner;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+//import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Configuration;
-
+//
-/**
+///**
- * @Description: TomcatFactoryConfig
+// * @Description: TomcatFactoryConfig
- * @author: scott
+// * @author: scott
- * @date: 2021年01月25日 11:40
+// * @date: 2021年01月25日 11:40
- */
+// */
-@Configuration
+//@Configuration
-public class TomcatFactoryConfig {
+//public class TomcatFactoryConfig {
-    /**
+//    /**
-     * tomcat-embed-jasper引用后提示jar找不到的问题
+//     * tomcat-embed-jasper引用后提示jar找不到的问题
-     */
+//     */
-    @Bean
+//    @Bean
-    public TomcatServletWebServerFactory tomcatFactory() {
+//    public TomcatServletWebServerFactory tomcatFactory() {
-        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
+//        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() {
-            @Override
+//            @Override
-            protected void postProcessContext(Context context) {
+//            protected void postProcessContext(Context context) {
-                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+//                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
-            }
+//            }
-        };
+//        };
-        factory.addConnectorCustomizers(connector -> {
+//        factory.addConnectorCustomizers(connector -> {
-            connector.setProperty("relaxedPathChars", "[]{}");
+//            connector.setProperty("relaxedPathChars", "[]{}");
-            connector.setProperty("relaxedQueryChars", "[]{}");
+//            connector.setProperty("relaxedQueryChars", "[]{}");
-        });
+//        });
-        return factory;
+//        return factory;
-    }
+//    }
-}
+//}

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

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -36,11 +36,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
 
     @Override
     public String getToken(HttpServletRequest request) {
-        try {
+        return TokenUtils.getTokenByRequest(request);
-            return TokenUtils.getTokenByRequest(request);
-        } catch (Exception e) {
-            return null;
-        }
     }
 
     @Override

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java

@@ -15,7 +15,7 @@ import org.jeecg.modules.system.entity.SysTenantPack;
 import org.jeecg.modules.system.entity.SysTenantPackUser;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.Method;
 import java.util.Date;
 

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

@@ -2,8 +2,8 @@ package org.jeecg.modules.cas.controller;
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;

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

@@ -2,8 +2,8 @@ package org.jeecg.modules.message.controller;
 
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;

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

@@ -3,8 +3,8 @@ package org.jeecg.modules.message.controller;
 import java.util.Arrays;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.api.vo.Result;

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

@@ -5,15 +5,12 @@ 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;
@@ -21,8 +18,8 @@ import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
@@ -47,9 +44,6 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
     @Autowired
     private RedisUtil redisUtil;
 
-    @Autowired
-    private SysMessageMapper sysMessageMapper;
-
     /**
      * 真实姓名变量
      */
@@ -84,23 +78,6 @@ 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);
@@ -236,35 +213,4 @@ 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/handle/impl/SystemSendMsgHandle.java

@@ -19,7 +19,7 @@ import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Date;
 import java.util.Map;
 

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

@@ -51,9 +51,6 @@ 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/message/websocket/WebSocket.java

@@ -2,9 +2,9 @@ package org.jeecg.modules.message.websocket;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.websocket.*;
+import jakarta.websocket.*;
-import javax.websocket.server.PathParam;
+import jakarta.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpoint;
 
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.base.BaseMap;

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.monitor.actuator;
 
 import org.jeecg.modules.monitor.actuator.httptrace.CustomInMemoryHttpTraceRepository;
-import org.springframework.boot.actuate.autoconfigure.trace.http.HttpTraceAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.trace.http.HttpTraceProperties;
+import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesProperties;
-import org.springframework.boot.actuate.trace.http.HttpTraceRepository;
+import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -18,8 +18,8 @@ import org.springframework.context.annotation.Configuration;
  * @Date: 2024/5/13 17:20
  */
 @Configuration
-@EnableConfigurationProperties(HttpTraceProperties.class)
+@EnableConfigurationProperties(HttpExchangesProperties.class)
-@AutoConfigureBefore(HttpTraceAutoConfiguration.class)
+@AutoConfigureBefore(HttpExchangesAutoConfiguration.class)
 public class CustomActuatorConfig {
 
     /**
@@ -30,7 +30,7 @@ public class CustomActuatorConfig {
      */
     @Bean
     @ConditionalOnProperty(prefix = "management.trace.http", name = "enabled", matchIfMissing = true)
-    @ConditionalOnMissingBean(HttpTraceRepository.class)
+    @ConditionalOnMissingBean(HttpExchangeRepository.class)
     public CustomInMemoryHttpTraceRepository traceRepository() {
         return new CustomInMemoryHttpTraceRepository();
     }

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

@@ -4,7 +4,7 @@ import lombok.Getter;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Selector;
-import org.springframework.boot.actuate.trace.http.HttpTrace;
+import org.springframework.boot.actuate.web.exchanges.HttpExchange;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
@@ -18,7 +18,7 @@ import static org.springframework.boot.actuate.endpoint.annotation.Selector.Matc
  * @Date: 2024/5/13 17:02
  */
 @Component
-@Endpoint(id = "jeecghttptrace")
+@Endpoint(id = "httptrace-new")
 public class CustomHttpTraceEndpoint{
     private final CustomInMemoryHttpTraceRepository repository;
 
@@ -29,14 +29,14 @@ public class CustomHttpTraceEndpoint{
 
     @ReadOperation
     public HttpTraceDescriptor traces(@Selector(match = ALL_REMAINING) String query) {
-        return new CustomHttpTraceEndpoint.HttpTraceDescriptor(this.repository.findAll(query));
+        return new HttpTraceDescriptor(this.repository.findAll(query));
     }
 
     @Getter
     public static final class HttpTraceDescriptor {
-        private final List<HttpTrace> traces;
+        private final List<HttpExchange> traces;
 
-        private HttpTraceDescriptor(List<HttpTrace> traces) {
+        private HttpTraceDescriptor(List<HttpExchange> traces) {
             this.traces = traces;
         }
 

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.monitor.actuator.httptrace;
 
-import org.springframework.boot.actuate.trace.http.HttpTrace;
+import org.springframework.boot.actuate.web.exchanges.HttpExchange;
-import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -12,17 +12,17 @@ import java.util.stream.Stream;
  * @Author: chenrui
  * @Date: 2024/5/13 17:02
  */
-public class CustomInMemoryHttpTraceRepository extends InMemoryHttpTraceRepository {
+public class CustomInMemoryHttpTraceRepository extends InMemoryHttpExchangeRepository {
 
     @Override
-    public List<HttpTrace> findAll() {
+    public List<HttpExchange> findAll() {
         return super.findAll();
     }
 
-    public List<HttpTrace> findAll(String query) {
+    public List<HttpExchange> findAll(String query) {
-        List<HttpTrace> allTrace = super.findAll();
+        List<HttpExchange> allTrace = super.findAll();
         if (null != allTrace && !allTrace.isEmpty()) {
-            Stream<HttpTrace> stream = allTrace.stream();
+            Stream<HttpExchange> stream = allTrace.stream();
             String[] params = query.split(",");
             stream = filter(params, stream);
             stream = sort(params, stream);
@@ -31,7 +31,7 @@ public class CustomInMemoryHttpTraceRepository extends InMemoryHttpTraceReposito
         return allTrace;
     }
 
-    private Stream<HttpTrace> sort(String[] params, Stream<HttpTrace> stream) {
+    private Stream<HttpExchange> sort(String[] params, Stream<HttpExchange> stream) {
         if (params.length < 2) {
             return stream;
         }
@@ -56,7 +56,7 @@ public class CustomInMemoryHttpTraceRepository extends InMemoryHttpTraceReposito
         });
     }
 
-    private static Stream<HttpTrace> filter(String[] params, Stream<HttpTrace> stream) {
+    private static Stream<HttpExchange> filter(String[] params, Stream<HttpExchange> stream) {
         if (params.length == 0) {
             return stream;
         }

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

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.swing.filechooser.FileSystemView;
 import java.io.File;
 import java.util.ArrayList;

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

@@ -2,7 +2,7 @@ package org.jeecg.modules.monitor.service.impl;
 
 import java.util.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.oss.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;

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

@@ -3,8 +3,8 @@ package org.jeecg.modules.quartz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -31,8 +31,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/sys/quartzJob")
 @Slf4j
-@Api(tags = "定时任务接口")
+@Tag(name = "定时任务接口")
 public class QuartzJobController {
 	@Autowired
 	private IQuartzJobService quartzJobService;
@@ -155,7 +155,7 @@ public class QuartzJobController {
 	//@RequiresRoles("admin")
     @RequiresPermissions("system:quartzJob:pause")
 	@GetMapping(value = "/pause")
-	@ApiOperation(value = "停止定时任务")
+	@Operation(summary = "停止定时任务")
 	public Result<Object> pauseJob(@RequestParam(name = "id") String id) {
 		QuartzJob job = quartzJobService.getById(id);
 		if (job == null) {
@@ -174,7 +174,7 @@ public class QuartzJobController {
 	//@RequiresRoles("admin")
     @RequiresPermissions("system:quartzJob:resume")
 	@GetMapping(value = "/resume")
-	@ApiOperation(value = "启动定时任务")
+	@Operation(summary = "启动定时任务")
 	public Result<Object> resumeJob(@RequestParam(name = "id") String id) {
 		QuartzJob job = quartzJobService.getById(id);
 		if (job == null) {

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/cache/AuthStateRedisCache.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.system.cache;
 
+import jakarta.annotation.PostConstruct;
 import me.zhyd.oauth.cache.AuthCacheConfig;
 import me.zhyd.oauth.cache.AuthStateCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
-import javax.annotation.PostConstruct;
 import java.util.concurrent.TimeUnit;
 
 

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

@@ -19,8 +19,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.*;
 
 /**

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.system.controller;
 
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @Title: DuplicateCheckAction
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @RestController
 @RequestMapping("/sys/duplicate")
-@Api(tags="重复校验")
+@Tag(name="重复校验")
 public class DuplicateCheckController {
 
 	@Autowired
@@ -36,7 +36,7 @@ public class DuplicateCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/check", method = RequestMethod.GET)
-	@ApiOperation("重复校验接口")
+	@Operation(summary = "重复校验接口")
 	public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
 		log.debug("----duplicate check------："+ duplicateCheckVo.toString());
 		

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

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -34,9 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/sys")
-@Api(tags="用户登录")
+@Tag(name="用户登录")
 @Slf4j
 public class LoginController {
 	@Autowired
@@ -70,7 +70,7 @@ public class LoginController {
 
 	private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
 
-	@ApiOperation("登录接口")
+	@Operation(summary = "登录接口")
 	@RequestMapping(value = "/login", method = RequestMethod.POST)
 	public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel, HttpServletRequest request){
 		Result<JSONObject> result = new Result<JSONObject>();
@@ -402,7 +402,7 @@ public class LoginController {
 	 * @param jsonObject
 	 * @return
 	 */
-	@ApiOperation("手机号登录接口")
+	@Operation(summary ="手机号登录接口")
 	@PostMapping("/phoneLogin")
 	public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
 		Result<JSONObject> result = new Result<JSONObject>();
@@ -521,7 +521,7 @@ public class LoginController {
 	 * @param response
 	 * @param key
 	 */
-	@ApiOperation("获取验证码")
+	@Operation(summary ="获取验证码")
 	@GetMapping(value = "/randomImage/{key}")
 	public Result<String> randomImage(HttpServletResponse response,@PathVariable("key") String key){
 		Result<String> res = new Result<String>();
@@ -664,7 +664,7 @@ public class LoginController {
 	/**
 	 * 登录二维码
 	 */
-	@ApiOperation(value = "登录二维码", notes = "登录二维码")
+	@Operation(summary = "登录二维码")
 	@GetMapping("/getLoginQrcode")
 	public Result<?>  getLoginQrcode() {
 		String qrcodeId = CommonConstant.LOGIN_QRCODE_PRE+IdWorker.getIdStr();
@@ -678,7 +678,7 @@ public class LoginController {
 	/**
 	 * 扫码二维码
 	 */
-	@ApiOperation(value = "扫码登录二维码", notes = "扫码登录二维码")
+	@Operation(summary = "扫码登录二维码")
 	@PostMapping("/scanLoginQrcode")
 	public Result<?> scanLoginQrcode(@RequestParam String qrcodeId, @RequestParam String token) {
 		Object check = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId);
@@ -695,7 +695,7 @@ public class LoginController {
 	/**
 	 * 获取用户扫码后保存的token
 	 */
-	@ApiOperation(value = "获取用户扫码后保存的token", notes = "获取用户扫码后保存的token")
+	@Operation(summary = "获取用户扫码后保存的token")
 	@GetMapping("/getQrcodeToken")
 	public Result getQrcodeToken(@RequestParam String qrcodeId) {
 		Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId);

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

@@ -44,9 +44,9 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;

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

@@ -3,7 +3,7 @@ package org.jeecg.modules.system.controller;
 import java.util.Arrays;
 import java.util.Date;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;