feat(支持springboot3): 支持springboot3框架

springboot/fastbee-admin/pom.xml

@@ -39,8 +39,9 @@
 
          <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>mysql</groupId>
+            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql.version}</version>
         </dependency>
 
         <!-- 核心模块-->

springboot/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java

@@ -1,5 +1,6 @@
 package com.fastbee;
 
+import com.dtflys.forest.springboot.annotation.ForestScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author ruoyi
  */
 @SpringBootApplication
+@ForestScan(basePackages = "com.fastbee")
 public class FastBeeApplication
 {
     public static void main(String[] args)

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java

@@ -3,9 +3,9 @@ package com.fastbee.web.controller.common;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java

@@ -2,8 +2,8 @@ package com.fastbee.web.controller.common;
 
 import java.util.ArrayList;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.monitor;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.monitor;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.system;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java

@@ -2,7 +2,7 @@ package com.fastbee.web.controller.system;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.system;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.system;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java

@@ -1,7 +1,7 @@
 package com.fastbee.web.controller.system;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java

@@ -22,7 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.stream.Collectors;
 

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java

@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * swagger 用户测试方法

springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

springboot/fastbee-admin/src/main/resources/application.yml

@@ -90,11 +90,20 @@ token:
 
 # mybatis-plus配置
 mybatis-plus:
-  typeAliasesPackage: com.fastbee.**.domain             # 搜索指定包别名
+  # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
-  mapperLocations: classpath*:mapper/**/*Mapper.xml     # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  enableLogicDelete: true
+  # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
+  mapperPackage: com.fastbee.**.mapper
+  # 对应的 XML 文件位置
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
   configLocation: classpath:mybatis/mybatis-config.xml  # 加载全局的配置文件
+  # 实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: org.dromara.**.domain
   global-config:
-    db-config:
+    dbConfig:
+      # 主键类型
+      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
+      # 如需改为自增 需要将数据库表全部设置为自增
       id-type: AUTO # 自增 ID
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
@@ -110,3 +119,8 @@ xss:
   enabled: true                                         # 过滤开关
   excludes: /system/notice                              # 排除链接（多个用逗号分隔）
   urlPatterns: /system/*,/monitor/*,/tool/*             # 匹配链接
+
+forest:
+  max-connections: 1000        # 连接池最大连接数
+  connect-timeout: 3000        # 连接超时时间，单位为毫秒
+  read-timeout: 3000           # 数据读取超时时间，单位为毫秒

springboot/fastbee-common/pom.xml

@@ -38,7 +38,7 @@
         <!-- mybatis-plus -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>
@@ -74,7 +74,7 @@
         <!-- 动态数据源 -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+			<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
 		</dependency>
 
         <!-- 阿里JSON解析器 -->
@@ -139,9 +139,10 @@
 
         <!-- servlet包 -->
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -173,16 +174,16 @@
             <artifactId>guava</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.redisson</groupId>-->
-<!--            <artifactId>redisson-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

springboot/fastbee-common/src/main/java/com/fastbee/common/annotation/Excel.java

@@ -1,14 +1,13 @@
 package com.fastbee.common.annotation;
 
-import com.fastbee.common.utils.poi.ExcelHandlerAdapter;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import com.fastbee.common.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解
@@ -57,6 +56,7 @@ public @interface Excel
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
+    @SuppressWarnings("deprecation")
     public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
     /**

springboot/fastbee-common/src/main/java/com/fastbee/common/core/controller/BaseController.java

@@ -15,12 +15,13 @@ import com.fastbee.common.utils.StringUtils;
 import com.fastbee.common.utils.sql.SqlUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
-import javax.annotation.Resource;
+
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/PageParam.java

@@ -1,10 +1,11 @@
 package com.fastbee.common.core.domain;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
+
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/TreeSelect.java

@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fastbee.common.constant.UserConstants;
 import com.fastbee.common.core.domain.entity.SysDept;
 import com.fastbee.common.core.domain.entity.SysMenu;
+import com.fastbee.common.utils.StringUtils;
 
 /**
  * Treeselect树结构实体类
@@ -22,6 +24,9 @@ public class TreeSelect implements Serializable
     /** 节点名称 */
     private String label;
 
+    /** 节点禁用 */
+    private boolean disabled = false;
+
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
@@ -35,6 +40,7 @@ public class TreeSelect implements Serializable
     {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
+        this.disabled = StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus());
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
@@ -65,6 +71,16 @@ public class TreeSelect implements Serializable
         this.label = label;
     }
 
+    public boolean isDisabled()
+    {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled)
+    {
+        this.disabled = disabled;
+    }
+
     public List<TreeSelect> getChildren()
     {
         return children;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDept.java

@@ -2,13 +2,13 @@ package com.fastbee.common.core.domain.entity;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fastbee.common.core.domain.BaseEntity;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictData.java

@@ -1,8 +1,7 @@
 package com.fastbee.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysDictType.java

@@ -1,8 +1,9 @@
 package com.fastbee.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
+
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysMenu.java

@@ -2,9 +2,9 @@ package com.fastbee.common.core.domain.entity;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysRole.java

@@ -1,12 +1,13 @@
 package com.fastbee.common.core.domain.entity;
 
 import java.util.Set;
-import javax.validation.constraints.NotBlank;
+
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fastbee.common.annotation.Excel;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java

@@ -2,7 +2,9 @@ package com.fastbee.common.core.domain.entity;
 
 import java.util.Date;
 import java.util.List;
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

springboot/fastbee-common/src/main/java/com/fastbee/common/core/mq/InvokeReqDto.java

@@ -5,7 +5,7 @@ import com.fastbee.common.utils.DateUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Map;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * OTA远程升级

springboot/fastbee-common/src/main/java/com/fastbee/common/core/redis/RedisCache.java

@@ -627,7 +627,7 @@ public class RedisCache {
     public List<Object> scan(String query) {
         Set<String> keys = (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
             Set<String> keysTmp = new HashSet<>();
-            Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(query).count(1000).build());
+            Cursor<byte[]> cursor = connection.scan(ScanOptions.scanOptions().match(query).count(1000).build());
             while (cursor.hasNext()) {
                 keysTmp.add(new String(cursor.next()));
             }

springboot/fastbee-common/src/main/java/com/fastbee/common/core/text/Convert.java

@@ -1,7 +1,5 @@
 package com.fastbee.common.core.text;
 
-import com.fastbee.common.utils.StringUtils;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -9,6 +7,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
+import com.fastbee.common.utils.StringUtils;
 
 /**
  * 类型转换器

springboot/fastbee-common/src/main/java/com/fastbee/common/enums/DesensitizedType.java

@@ -1,8 +1,7 @@
 package com.fastbee.common.enums;
 
-import com.fastbee.common.utils.DesensitizedUtil;
-
 import java.util.function.Function;
+import com.fastbee.common.utils.DesensitizedUtil;
 
 /**
  * 脱敏类型

springboot/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatableFilter.java

@@ -1,13 +1,13 @@
 package com.fastbee.common.filter;
 
 import java.io.IOException;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import jakarta.servlet.FilterConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-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 org.springframework.http.MediaType;
 import com.fastbee.common.utils.StringUtils;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/filter/RepeatedlyRequestWrapper.java

@@ -4,11 +4,11 @@ import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import javax.servlet.ReadListener;
+import jakarta.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ServletInputStream;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import com.fastbee.common.utils.http.HttpHelper;
 import com.fastbee.common.constant.Constants;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/filter/XssFilter.java

@@ -3,14 +3,14 @@ package com.fastbee.common.filter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import jakarta.servlet.FilterConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-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 com.fastbee.common.utils.StringUtils;
 import com.fastbee.common.enums.HttpMethod;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/filter/XssHttpServletRequestWrapper.java

@@ -2,10 +2,10 @@ package com.fastbee.common.filter;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import javax.servlet.ReadListener;
+import jakarta.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/DictUtils.java

@@ -1,14 +1,13 @@
 package com.fastbee.common.utils;
 
+import java.util.Collection;
+import java.util.List;
 import com.alibaba.fastjson2.JSONArray;
 import com.fastbee.common.constant.CacheConstants;
 import com.fastbee.common.core.domain.entity.SysDictData;
 import com.fastbee.common.core.redis.RedisCache;
 import com.fastbee.common.utils.spring.SpringUtils;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * 字典工具类
  *

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/ExceptionUtils.java

@@ -2,7 +2,7 @@ package com.fastbee.common.utils;
 
 import lombok.NoArgsConstructor;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/ServletUtils.java

@@ -7,12 +7,10 @@ import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-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 cn.hutool.extra.servlet.ServletUtil;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -217,12 +215,4 @@ public class ServletUtils
             return StringUtils.EMPTY;
         }
     }
-
-    public static String getClientIP() {
-        HttpServletRequest request = getRequest();
-        if (request == null) {
-            return null;
-        }
-        return ServletUtil.getClientIP(request);
-    }
 }

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/ValidationUtils.java

@@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import org.springframework.util.StringUtils;
 
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
-import javax.validation.Validation;
+import jakarta.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 import java.util.Set;
 import java.util.regex.Pattern;
 

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/bean/BeanValidators.java

@@ -1,9 +1,9 @@
 package com.fastbee.common.utils.bean;
 
 import java.util.Set;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 /**
  * bean对象属性验证

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/file/FileUtils.java

@@ -9,8 +9,8 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/http/HttpHelper.java

@@ -5,7 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/ip/IpUtils.java

@@ -1,11 +1,10 @@
 package com.fastbee.common.utils.ip;
 
-import com.fastbee.common.utils.ServletUtils;
-import com.fastbee.common.utils.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import jakarta.servlet.http.HttpServletRequest;
+import com.fastbee.common.utils.ServletUtils;
+import com.fastbee.common.utils.StringUtils;
 
 /**
  * 获取IP方法

springboot/fastbee-common/src/main/java/com/fastbee/common/utils/poi/ExcelUtil.java

@@ -30,7 +30,7 @@ import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

springboot/fastbee-common/src/main/java/com/fastbee/common/xss/Xss.java

@@ -1,7 +1,7 @@
 package com.fastbee.common.xss;
 
-import javax.validation.Constraint;
+import jakarta.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

springboot/fastbee-common/src/main/java/com/fastbee/common/xss/XssValidator.java

@@ -1,8 +1,8 @@
 package com.fastbee.common.xss;
 
 import com.fastbee.common.utils.StringUtils;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

springboot/fastbee-framework/pom.xml

@@ -42,7 +42,7 @@
         <!-- 阿里数据库连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
         </dependency>
 
         <!-- 验证码 -->
@@ -66,10 +66,15 @@
         <!-- 动态数据源 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
             <version>${dynamic-datasource.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

springboot/fastbee-framework/src/main/java/com/fastbee/framework/aspectj/LogAspect.java

@@ -29,8 +29,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Collection;
 import java.util.Map;
 

springboot/fastbee-framework/src/main/java/com/fastbee/framework/config/DruidConfig.java

@@ -1,13 +1,16 @@
 package com.fastbee.framework.config;
 
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
+import jakarta.servlet.Filter;
-import javax.servlet.*;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 
 @Configuration
@@ -30,7 +33,7 @@ public class DruidConfig {
         Filter filter = new Filter()
         {
             @Override
-            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
+            public void init(jakarta.servlet.FilterConfig filterConfig) throws ServletException
             {
             }
             @Override

springboot/fastbee-framework/src/main/java/com/fastbee/framework/config/FilterConfig.java

@@ -1,17 +1,16 @@
 package com.fastbee.framework.config;
 
-import com.fastbee.common.filter.RepeatableFilter;
+import java.util.HashMap;
-import com.fastbee.common.filter.XssFilter;
+import java.util.Map;
-import com.fastbee.common.utils.StringUtils;
+import jakarta.servlet.DispatcherType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
+import com.fastbee.common.filter.RepeatableFilter;
-import javax.servlet.DispatcherType;
+import com.fastbee.common.filter.XssFilter;
-import java.util.HashMap;
+import com.fastbee.common.utils.StringUtils;
-import java.util.Map;
 
 /**
  * Filter配置

springboot/fastbee-framework/src/main/java/com/fastbee/framework/config/SecurityConfig.java

@@ -111,17 +111,17 @@ public class SecurityConfig
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
             // 注解标记允许匿名访问的url
             .authorizeHttpRequests((requests) -> {
-                permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
+                permitAllUrl.getUrls().forEach(url -> requests.requestMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 // 静态资源，可匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage","/iot/tool/register","/iot/tool/ntp","/iot/tool/download",
+                requests.requestMatchers("/login", "/register", "/captchaImage","/iot/tool/register","/iot/tool/ntp","/iot/tool/download",
                             "/iot/tool/mqtt/auth","/iot/tool/mqtt/authv5","/iot/tool/mqtt/webhook","/iot/tool/mqtt/webhookv5","/auth/**/**",
                             "/wechat/mobileLogin", "/wechat/miniLogin", "/wechat/wxBind/callback").permitAll()
-                    .antMatchers("/zlmhook/**").permitAll()
+                    .requestMatchers("/zlmhook/**").permitAll()
-                    .antMatchers("/goview/sys/login","/goview/project/getData").permitAll()
+                    .requestMatchers("/goview/sys/login","/goview/project/getData").permitAll()
                     // 静态资源，可匿名访问
-                    .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
+                    .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    .requestMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

springboot/fastbee-framework/src/main/java/com/fastbee/framework/config/ServerConfig.java

@@ -3,7 +3,7 @@ package com.fastbee.framework.config;
 import com.fastbee.common.utils.ServletUtils;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * 服务相关配置

springboot/fastbee-framework/src/main/java/com/fastbee/framework/config/SqlFilterArgumentResolver.java

@@ -10,7 +10,7 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/interceptor/RepeatSubmitInterceptor.java

@@ -1,8 +1,8 @@
 package com.fastbee.framework.interceptor;
 
 import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -3,7 +3,7 @@ package com.fastbee.framework.interceptor.impl;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/manager/ShutdownManager.java

@@ -3,7 +3,7 @@ package com.fastbee.framework.manager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 /**
  * 确保应用退出时能关闭后台线程

springboot/fastbee-framework/src/main/java/com/fastbee/framework/mybatis/config/AutoPaginationInnerInterceptor.java

@@ -1,6 +1,5 @@
 package com.fastbee.framework.mybatis.config;
 
-
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/mybatis/config/MybatisPlusConfig.java

@@ -4,11 +4,13 @@ import cn.hutool.core.net.NetUtil;
 import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.fastbee.framework.config.SqlFilterArgumentResolver;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -17,8 +19,8 @@ import java.util.List;
 /**
  * @author admin
  */
-@Configuration(proxyBeanMethods = false)
+@EnableTransactionManagement(proxyTargetClass = true)
-@MapperScan("com.fastbee.**.mapper")
+@MapperScan("${mybatis-plus.mapperPackage}")
 public class MybatisPlusConfig implements WebMvcConfigurer {
 
     /**
@@ -30,13 +32,6 @@ public class MybatisPlusConfig implements WebMvcConfigurer {
         argumentResolvers.add(new SqlFilterArgumentResolver());
     }
 
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(paginationInnerInterceptor());
-        return interceptor;
-    }
-
     /**
      * 分页插件，自动识别数据库类型
      */
@@ -64,4 +59,26 @@ public class MybatisPlusConfig implements WebMvcConfigurer {
         return new MybatisPlusMetaObjectHandler();
     }
 
+
+    /**
+     * 乐观锁插件
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 数据权限处理
+        // interceptor.addInnerInterceptor(dataPermissionInterceptor());
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        return interceptor;
+    }
+
+
+
 }

springboot/fastbee-framework/src/main/java/com/fastbee/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -1,10 +1,10 @@
 package com.fastbee.framework.security.filter;
 
 import java.io.IOException;
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -2,8 +2,8 @@ package com.fastbee.framework.security.handle;
 
 import java.io.IOException;
 import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -1,11 +1,9 @@
 package com.fastbee.framework.security.handle;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-
-import com.fastbee.common.utils.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.Authentication;
@@ -14,6 +12,7 @@ import com.alibaba.fastjson2.JSON;
 import com.fastbee.common.constant.Constants;
 import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.domain.model.LoginUser;
+import com.fastbee.common.utils.MessageUtils;
 import com.fastbee.common.utils.ServletUtils;
 import com.fastbee.common.utils.StringUtils;
 import com.fastbee.framework.manager.AsyncManager;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/Server.java

@@ -1,8 +1,16 @@
 package com.fastbee.framework.web.domain;
 
+import java.net.UnknownHostException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
 import com.fastbee.common.utils.Arith;
 import com.fastbee.common.utils.ip.IpUtils;
-import com.fastbee.framework.web.domain.server.*;
+import com.fastbee.framework.web.domain.server.Cpu;
+import com.fastbee.framework.web.domain.server.Jvm;
+import com.fastbee.framework.web.domain.server.Mem;
+import com.fastbee.framework.web.domain.server.Sys;
+import com.fastbee.framework.web.domain.server.SysFile;
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.CentralProcessor.TickType;
@@ -13,11 +21,6 @@ import oshi.software.os.OSFileStore;
 import oshi.software.os.OperatingSystem;
 import oshi.util.Util;
 
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
 /**
  * 服务器相关信息
  *

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Jvm.java

@@ -1,11 +1,9 @@
 package com.fastbee.framework.web.domain.server;
 
-
+import java.lang.management.ManagementFactory;
 import com.fastbee.common.utils.Arith;
 import com.fastbee.common.utils.DateUtils;
 
-import java.lang.management.ManagementFactory;
-
 /**
  * JVM相关信息
  *

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Mem.java

@@ -1,6 +1,5 @@
 package com.fastbee.framework.web.domain.server;
 
-
 import com.fastbee.common.utils.Arith;
 
 /**

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/exception/GlobalExceptionHandler.java

@@ -1,6 +1,6 @@
 package com.fastbee.framework.web.exception;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/service/SysLoginService.java

@@ -26,7 +26,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 登录校验方法

springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/service/TokenService.java

@@ -1,8 +1,21 @@
 package com.fastbee.framework.web.service;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import com.fastbee.common.core.domain.entity.SysUser;
+import com.fastbee.system.domain.SysClient;
+import com.fastbee.system.service.ISysClientService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
 import com.fastbee.common.constant.CacheConstants;
 import com.fastbee.common.constant.Constants;
-import com.fastbee.common.core.domain.entity.SysUser;
 import com.fastbee.common.core.domain.model.LoginUser;
 import com.fastbee.common.core.redis.RedisCache;
 import com.fastbee.common.utils.ServletUtils;
@@ -10,24 +23,10 @@ import com.fastbee.common.utils.StringUtils;
 import com.fastbee.common.utils.ip.AddressUtils;
 import com.fastbee.common.utils.ip.IpUtils;
 import com.fastbee.common.utils.uuid.IdUtils;
-import com.fastbee.system.domain.SysClient;
-import com.fastbee.system.service.ISysClientService;
 import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 
 /**
  * token验证处理

springboot/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author gsb

springboot/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/listen/DeviceOtherListen.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author gsb

springboot/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/service/impl/DeviceOtherMsgHandler.java

@@ -6,10 +6,9 @@ import com.fastbee.mq.model.ReportDataBo;
 import com.fastbee.mq.service.IDataHandler;
 import com.fastbee.mq.service.IMqttMessagePublish;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author gsb

springboot/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/service/impl/FunctionInvokeImpl.java

@@ -1,25 +1,16 @@
 package com.fastbee.mq.service.impl;
 
-import com.fastbee.common.core.mq.DeviceReplyBo;
 import com.fastbee.common.core.mq.InvokeReqDto;
 import com.fastbee.common.core.mq.MQSendMessageBo;
-import com.fastbee.common.core.mq.MessageReplyBo;
-import com.fastbee.common.core.protocol.modbus.ModbusCode;
-import com.fastbee.common.core.redis.RedisCache;
-import com.fastbee.common.core.redis.RedisKeyBuilder;
 import com.fastbee.common.enums.ThingsModelType;
 import com.fastbee.common.utils.bean.BeanUtils;
 import com.fastbee.iot.util.SnowflakeIdWorker;
-import com.fastbee.mq.redischannel.producer.MessageProducer;
 import com.fastbee.mq.service.IFunctionInvoke;
 import com.fastbee.mq.service.IMqttMessagePublish;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author gsb

springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/StartBoot.java

@@ -10,7 +10,7 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 启动类

springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/subscribeCallback.java

@@ -13,7 +13,7 @@ import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Objects;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/CategoryController.java

@@ -1,13 +1,9 @@
 package com.fastbee.data.controller;
 
-import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
-import com.fastbee.common.core.domain.entity.SysRole;
-import com.fastbee.common.core.domain.entity.SysUser;
 import com.fastbee.common.core.page.TableDataInfo;
-import com.fastbee.iot.model.IdAndName;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceJobController.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java

@@ -1,13 +1,8 @@
 package com.fastbee.data.controller;
 
-import com.fastbee.common.annotation.Log;
 import com.fastbee.common.core.controller.BaseController;
-import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.page.TableDataInfo;
-import com.fastbee.common.enums.BusinessType;
-import com.fastbee.common.utils.poi.ExcelUtil;
 import com.fastbee.iot.domain.DeviceLog;
-import com.fastbee.iot.model.HistoryModel;
 import com.fastbee.iot.model.MonitorModel;
 import com.fastbee.iot.service.IDeviceLogService;
 import io.swagger.annotations.Api;
@@ -16,9 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备日志Controller

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/EventLogController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.fastbee.iot.domain.EventLog;
 import io.swagger.annotations.Api;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/FunctionLogController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/GroupController.java

@@ -1,10 +1,8 @@
 package com.fastbee.data.controller;
 
-import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
-import com.fastbee.iot.domain.DeviceGroup;
 import com.fastbee.iot.model.DeviceGroupInput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/NewsCategoryController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.fastbee.iot.model.IdAndName;
 import io.swagger.annotations.Api;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/NewsController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.fastbee.iot.model.CategoryNews;
 import io.swagger.annotations.Api;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/OauthClientDetailsController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ProductAuthorizeController.java

@@ -1,12 +1,11 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.fastbee.iot.model.ProductAuthorizeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ProductController.java

@@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/SceneController.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ScriptController.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/SocialLoginController.java

@@ -11,8 +11,8 @@ import me.zhyd.oauth.model.AuthCallback;
 import org.springframework.beans.factory.annotation.Autowired;
 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 java.io.IOException;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/SocialPlatformController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ThingsModelController.java

@@ -5,7 +5,6 @@ import com.fastbee.common.core.controller.BaseController;
 import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.page.TableDataInfo;
 import com.fastbee.common.enums.BusinessType;
-import com.fastbee.common.utils.StringUtils;
 import com.fastbee.common.utils.poi.ExcelUtil;
 import com.fastbee.iot.domain.ThingsModel;
 import com.fastbee.iot.model.ImportThingsModelInput;
@@ -19,8 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import java.util.Arrays;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ThingsModelTemplateController.java

@@ -1,12 +1,8 @@
 package com.fastbee.data.controller;
 
-import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
-import com.fastbee.common.core.domain.entity.SysRole;
-import com.fastbee.common.core.domain.entity.SysUser;
-import com.fastbee.iot.domain.ThingsModel;
 import com.fastbee.iot.domain.VarTemp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ToolController.java

@@ -44,9 +44,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-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.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/dashBoard/DashBoardController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 首页面板和大屏数据

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/MediaServerController.java

@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/SipDeviceChannelController.java

@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/SipDeviceController.java

@@ -17,7 +17,7 @@ import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/netty/NettyManagerController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/protocol/ProtocolController.java

@@ -1,7 +1,7 @@
 package com.fastbee.data.controller.protocol;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/runtime/DeviceRuntimeController.java

@@ -5,7 +5,6 @@ import com.fastbee.common.core.controller.BaseController;
 import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.mq.InvokeReqDto;
 import com.fastbee.common.core.page.TableDataInfo;
-import com.fastbee.common.core.redis.RedisCache;
 import com.fastbee.common.enums.ThingsModelType;
 import com.fastbee.common.exception.ServiceException;
 import com.fastbee.common.utils.StringUtils;
@@ -19,10 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备运行时数据controller

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/wechat/WeChatController.java

@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-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;
 
 /**