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

2025-12-17 16:36:03 +08:00 · 2025-04-27 17:56:52 +08:00
parent 5b6ec185c4
commit 4d8e1c5167
156 changed files with 528 additions and 549 deletions
--- a/springboot/fastbee-admin/pom.xml
+++ b/springboot/fastbee-admin/pom.xml
@@ -39,8 +39,9 @@

         <!-- Mysql驱动包 -->
        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql.version}</version>
        </dependency>

        <!-- 核心模块-->
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/FastBeeApplication.java
+++ b/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)
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CaptchaController.java
+++ b/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;
@@ -25,7 +25,7 @@ import com.fastbee.system.service.ISysConfigService;

 /**
 * 验证码操作处理
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "验证码操作")
@@ -40,7 +40,7 @@ public class CaptchaController

    @Autowired
    private RedisCache redisCache;
-    
+
    @Autowired
    private ISysConfigService configService;
    /**
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/common/CommonController.java
+++ b/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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,7 @@ import com.fastbee.framework.config.ServerConfig;

 /**
 * 通用请求处理
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "通用请求处理")
@@ -43,7 +43,7 @@ public class CommonController

    /**
     * 通用下载请求
-     * 
+     *
     * @param fileName 文件名称
     * @param delete 是否删除
     */
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java
+++ b/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;
@@ -25,7 +25,7 @@ import com.fastbee.system.service.ISysLogininforService;

 /**
 * 系统访问记录
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "日志管理：登录日志")
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysOperlogController.java
+++ b/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;
@@ -24,7 +24,7 @@ import com.fastbee.system.service.ISysOperLogService;

 /**
 * 操作日志记录
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "日志管理：操作日志")
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java
+++ b/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;
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictDataController.java
+++ b/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;
@@ -27,7 +27,7 @@ import com.fastbee.system.service.ISysDictTypeService;

 /**
 * 数据字典信息
- * 
+ *
 * @author ruoyi
 */
@RestController
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java
+++ b/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;
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java
+++ b/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;
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
+++ b/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;
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java
+++ b/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;

--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController.java
+++ b/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 用户测试方法
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/tool/TestController2.java
+++ b/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;
--- a/springboot/fastbee-admin/src/main/resources/application.yml
+++ b/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           # 数据读取超时时间，单位为毫秒