1、升级至springboot3

.idea/misc.xml

@@ -9,7 +9,7 @@
     </option>
     <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

application/pom.xml

@@ -14,8 +14,8 @@
     </parent>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
@@ -52,10 +52,6 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -63,7 +59,7 @@
         <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
         <!-- Sa-Token 整合 Redis （使用 jdk 默认序列化方式） -->
         <dependency>
@@ -101,7 +97,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.2.5.RELEASE</version>
                 <executions>
                     <execution>
                         <goals>

application/src/main/java/com/ctsi/Application.java

@@ -10,12 +10,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication(scanBasePackages = {"com.ctsi.*"})
 @MapperScan(basePackages = {"com.ctsi"}, annotationClass = Mapper.class)
 @EnableTransactionManagement
-@EnableSwagger2
 public class Application {
     private static final Logger log = LoggerFactory.getLogger(Application.class);
     private static final String SWAGGER_PAGE = "swagger-ui/index.html";

application/src/main/java/com/ctsi/Auth/web/login.java

@@ -3,8 +3,8 @@ package com.ctsi.Auth.web;
 import cn.dev33.satoken.stp.StpUtil;
 import com.ctsi.Auth.entity.PO.CaptchaPO;
 import com.ctsi.Auth.entity.PO.TokenInfoPO;
-import com.ctsi.Auth.entity.VO.UserForm;
 import com.ctsi.Auth.entity.PO.UserInfoPO;
+import com.ctsi.Auth.entity.VO.UserForm;
 import com.ctsi.Enum.ErrorCodeEnum;
 import com.ctsi.System.SysMenu.entity.PO.SysMenuSearchPO;
 import com.ctsi.System.SysMenu.service.SysMenuService;
@@ -18,13 +18,13 @@ import com.ctsi.utils.PasswordEncoderUtil;
 import com.ctsi.utils.RedisUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.List;

application/src/main/java/com/ctsi/config/SwaggerConfig.java

@@ -1,63 +0,0 @@
-package com.ctsi.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@Configuration
-@EnableOpenApi
-public class SwaggerConfig {
-
-    @Bean
-    public Docket api() {
-        return new Docket(DocumentationType.OAS_30)
-                .select()
-                .paths(PathSelectors.any())
-                .build()
-                .securitySchemes(securitySchemes())
-                .securityContexts(Collections.singletonList(securityContext()))
-                .apiInfo(apiInfo());
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("GeneralFrame Documentation")
-                .description("API documentation for GeneralFrame")
-                .version("1.0.0")
-                .build();
-    }
-
-    private List<SecurityScheme> securitySchemes() {
-        List<SecurityScheme> apiKeyList= new ArrayList<>();
-        //注意，这里应对应登录token鉴权对应的k-v
-        apiKeyList.add(new ApiKey("token", "token", "header"));
-        return apiKeyList;
-    }
-    /**
-     * 这里设置 swagger2 认证的安全上下文
-     */
-    private SecurityContext securityContext() {
-        return SecurityContext.builder()
-                .securityReferences(Collections.singletonList(new SecurityReference("token", scopes())))
-                .build();
-    }
-
-    /**
-     * 这里是写允许认证的scope
-     */
-    private AuthorizationScope[] scopes() {
-        return new AuthorizationScope[]{
-                new AuthorizationScope("web", "All scope is trusted!")
-        };
-    }
-}

application/src/main/resources/application-dev.yml

@@ -6,28 +6,25 @@ spring:
     username: root
     password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver
-  # redis
-  redis:
-    database: 1
-    # Redis服务器地址
-    host: 222.186.144.74
-    password: Geek@135#
-    # Redis服务器连接端口
-    port: 60101
-    # Redis服务器连接密码（默认为空）
-    # password:
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池最大连接数
-        max-active: 200
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-        # 连接池中的最大空闲连接
-        max-idle: 10
-        # 连接池中的最小空闲连接
-        min-idle: 0
+  data:
+    # redis
+    redis:
+      host: 222.186.144.74
+      database: 1
+      password: Geek@135#
+      port: 60101
+      # 连接超时时间
+      timeout: 10s
+      jedis:
+        pool:
+          # 连接池最大连接数
+          max-active: 200
+          # 连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+          # 连接池中的最大空闲连接
+          max-idle: 10
+          # 连接池中的最小空闲连接
+          min-idle: 0
 # 服务器端口
 server:
   port: 60006
@@ -36,10 +33,6 @@ logging:
   config: classpath:logback-spring.xml
   level:
     root: info
-# swagger开关
-springfox:
-  documentation:
-    auto-startup: true #false关闭swagger文档 true打开swagger
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token:
   # token 名称（同时也是 cookie 名称）

application/src/main/resources/application-prod.yml

@@ -6,28 +6,25 @@ spring:
     username: root
     password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver
-  # redis
-  redis:
-    database: 1
-    # Redis服务器地址
-    host: 222.186.144.74
-    password: Geek@135#
-    # Redis服务器连接端口
-    port: 60101
-    # Redis服务器连接密码（默认为空）
-    # password:
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池最大连接数
-        max-active: 200
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-        # 连接池中的最大空闲连接
-        max-idle: 10
-        # 连接池中的最小空闲连接
-        min-idle: 0
+  data:
+    # redis
+    redis:
+      host: 222.186.144.74
+      database: 1
+      password: Geek@135#
+      port: 60101
+      # 连接超时时间
+      timeout: 10s
+      jedis:
+        pool:
+          # 连接池最大连接数
+          max-active: 200
+          # 连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+          # 连接池中的最大空闲连接
+          max-idle: 10
+          # 连接池中的最小空闲连接
+          min-idle: 0
 # 服务器端口
 server:
   port: 60006
@@ -36,10 +33,6 @@ logging:
   config: classpath:logback-spring.xml
   level:
     root: info
-# swagger开关
-springfox:
-  documentation:
-    auto-startup: false #false关闭swagger文档 true打开swagger
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token:
   # token 名称（同时也是 cookie 名称）

application/src/main/resources/application-test.yml

@@ -6,28 +6,25 @@ spring:
     username: root
     password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver
-  # redis
-  redis:
-    database: 1
-    # Redis服务器地址
-    host: 222.186.144.74
-    password: Geek@135#
-    # Redis服务器连接端口
-    port: 60101
-    # Redis服务器连接密码（默认为空）
-    # password:
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池最大连接数
-        max-active: 200
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-        # 连接池中的最大空闲连接
-        max-idle: 10
-        # 连接池中的最小空闲连接
-        min-idle: 0
+  data:
+    # redis
+    redis:
+      host: 222.186.144.74
+      database: 1
+      password: Geek@135#
+      port: 60101
+      # 连接超时时间
+      timeout: 10s
+      jedis:
+        pool:
+          # 连接池最大连接数
+          max-active: 200
+          # 连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+          # 连接池中的最大空闲连接
+          max-idle: 10
+          # 连接池中的最小空闲连接
+          min-idle: 0
 # 服务器端口
 server:
   port: 60006
@@ -36,10 +33,6 @@ logging:
   config: classpath:logback-spring.xml
   level:
     root: info
-# swagger开关
-springfox:
-  documentation:
-    auto-startup: true #false关闭swagger文档 true打开swagger
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token:
   # token 名称（同时也是 cookie 名称）

core/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>core</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>

core/src/main/java/com/ctsi/System/Password/password.java

@@ -5,13 +5,12 @@ import com.ctsi.System.SysUser.service.SysUserService;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.PostMapping;
 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;
-
 @Api(tags = "密码")
 @RestController
 @RequestMapping(value = "/api/system")

core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java

@@ -7,12 +7,11 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 字典表;(sys_dic)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java

@@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysDic.entity.SysDic;
 import com.ctsi.System.SysDic.mapper.SysDicMapper;
 import com.ctsi.System.SysDic.service.SysDicService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * 字典表;(sys_dic)表服务实现类
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java

@@ -9,11 +9,11 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**

core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java

@@ -12,9 +12,9 @@ import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
 import com.ctsi.System.SysDicItem.mapper.SysDicItemMapper;
 import com.ctsi.System.SysDicItem.service.SysDicItemService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 /**

core/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java

@@ -9,12 +9,11 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 菜单;(sys_menu)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java

@@ -11,9 +11,9 @@ import com.ctsi.System.SysMenu.service.SysMenuService;
 import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 import com.ctsi.System.SysUserRole.entity.SysUserRole;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 /**

core/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java

@@ -9,12 +9,11 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 部门信息表;(sys_org)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -9,9 +9,9 @@ import com.ctsi.System.SysOrg.entity.SysOrg;
 import com.ctsi.System.SysOrg.mapper.SysOrgMapper;
 import com.ctsi.System.SysOrg.service.SysOrgService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 /**

core/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java

@@ -11,12 +11,11 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 角色表;(sys_role)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java

@@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysRole.entity.SysRole;
 import com.ctsi.System.SysRole.mapper.SysRoleMapper;
 import com.ctsi.System.SysRole.service.SysRoleService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * 角色表;(sys_role)表服务实现类
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysRoleMenu/controller/SysRoleMenuController.java

@@ -6,12 +6,11 @@ import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 角色菜单表;(sys_role_menu)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java

@@ -9,9 +9,9 @@ import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
 import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 import com.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper;
 import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 

core/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java

@@ -18,14 +18,13 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 用户表;(sys_user)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java

@@ -22,11 +22,11 @@ import com.ctsi.utils.ApiResult;
 import com.ctsi.utils.PasswordEncoderUtil;
 import com.ctsi.utils.PasswordUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**

core/src/main/java/com/ctsi/System/SysUserDetail/controller/SysUserDetailController.java

@@ -6,12 +6,11 @@ import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 用户信息表;(sys_user_detail)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
 import com.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper;
 import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * 用户信息表;(sys_user_detail)表服务实现类
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUserOrg/controller/SysUserOrgController.java

@@ -6,12 +6,11 @@ import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 用户部门表;(sys_user_org)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java

@@ -7,10 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
 import com.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper;
 import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * 用户部门表;(sys_user_org)表服务实现类
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUserRole/controller/SysUserRoleController.java

@@ -6,12 +6,11 @@ import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 用户角色表;(sys_user_role)表控制层
  * @author : machaoyi

core/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -12,9 +12,9 @@ import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
 import com.ctsi.System.SysUserRole.mapper.SysUserRoleMapper;
 import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 

core/src/main/java/com/ctsi/utils/RedisUtil.java

@@ -1,11 +1,11 @@
 package com.ctsi.utils;
 
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.concurrent.TimeUnit;
 
 @Component

pom.xml

@@ -16,7 +16,7 @@
     <name>myframe</name>
     <description>我的框架</description>
     <properties>
-        <org.springframework.boot-version>2.7.0</org.springframework.boot-version>
+        <org.springframework.boot-version>3.2.0</org.springframework.boot-version>
         <org.projectlombok.lombok-version>1.18.26</org.projectlombok.lombok-version>
         <cn.hutool.version>5.8.25</cn.hutool.version>
         <cn.dev33-version>1.37.0</cn.dev33-version>
@@ -48,7 +48,7 @@
             <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
             <dependency>
                 <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <artifactId>sa-token-spring-boot3-starter</artifactId>
                 <version>${cn.dev33-version}</version>
             </dependency>
             <!-- Sa-Token 整合 Redis （使用 jdk 默认序列化方式） -->
@@ -59,7 +59,7 @@
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${com.baomidou-version}</version>
             </dependency>
             <dependency>
@@ -67,11 +67,6 @@
                 <artifactId>mybatis-plus-join-boot-starter</artifactId>
                 <version>${com.github.yulichang-version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${io.springfox-version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

work/pom.xml

@@ -13,8 +13,8 @@
     </parent>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java

@@ -8,13 +8,12 @@ import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import com.ctsi.work.WorkAddr.service.WorkAddrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
  /**
  * 打卡地址表;(work_addr)表控制层
  * @author : machaoyi

work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java

@@ -6,9 +6,9 @@ import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.Max;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import java.io.Serializable;
 import java.util.Date;
 

work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java

@@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import com.ctsi.work.WorkAddr.mapper.WorkAddrMapper;
 import com.ctsi.work.WorkAddr.service.WorkAddrService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * 打卡地址表;(work_addr)表服务实现类
  * @author : machaoyi

work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java

@@ -14,12 +14,12 @@ import com.ctsi.work.WorkClock.entity.WorkClockVO;
 import com.ctsi.work.WorkClock.service.WorkClockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -13,9 +13,9 @@ import com.ctsi.work.WorkClock.entity.WorkClockPO;
 import com.ctsi.work.WorkClock.mapper.WorkClockMapper;
 import com.ctsi.work.WorkClock.service.WorkClockService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;