♻️Refactor: SpringBoot 2.x 迁移至 SpringBoot 3.x

This commit is contained in:
2025-10-14 18:20:31 +08:00
parent 60b09cddaa
commit 9586742316
17 changed files with 38 additions and 27 deletions
+4 -4
View File
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.2</version> <version>3.2.2</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com.wonder</groupId> <groupId>com.wonder</groupId>
@@ -14,14 +14,13 @@
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>bi-backend</name> <name>bi-backend</name>
<properties> <properties>
<java.version>1.8</java.version> <java.version>21</java.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-amqp --> <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-amqp -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId> <artifactId>spring-boot-starter-amqp</artifactId>
<version>2.7.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.rabbitmq/amqp-client --> <!-- https://mvnrepository.com/artifact/com.rabbitmq/amqp-client -->
<dependency> <dependency>
@@ -55,7 +54,7 @@
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.2.2</version> <version>3.0.3</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter --> <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
<dependency> <dependency>
@@ -111,6 +110,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -6,8 +6,9 @@ import com.wonder.bi.exception.BusinessException;
import com.wonder.bi.model.entity.User; import com.wonder.bi.model.entity.User;
import com.wonder.bi.model.enums.UserRoleEnum; import com.wonder.bi.model.enums.UserRoleEnum;
import com.wonder.bi.service.UserService; import com.wonder.bi.service.UserService;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
@@ -1,7 +1,8 @@
package com.wonder.bi.aop; package com.wonder.bi.aop;
import java.util.UUID; import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
@@ -6,6 +6,7 @@ import com.wonder.bi.exception.BusinessException;
import com.wonder.bi.manager.OpenAiManager; import com.wonder.bi.manager.OpenAiManager;
import com.wonder.bi.model.entity.Chart; import com.wonder.bi.model.entity.Chart;
import com.wonder.bi.service.ChartService; import com.wonder.bi.service.ChartService;
import jakarta.annotation.Resource;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -14,7 +15,6 @@ import org.springframework.amqp.support.AmqpHeaders;
import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Header;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component @Component
@Slf4j @Slf4j
@@ -1,9 +1,10 @@
package com.wonder.bi.bizmq; package com.wonder.bi.bizmq;
import jakarta.annotation.Resource;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component @Component
public class BiMessageProducer { public class BiMessageProducer {
@@ -4,12 +4,11 @@ import com.rabbitmq.client.Channel;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.support.AmqpHeaders; import org.springframework.amqp.support.AmqpHeaders;
import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Header;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component @Component
@Slf4j @Slf4j
@@ -1,9 +1,10 @@
package com.wonder.bi.bizmq; package com.wonder.bi.bizmq;
import jakarta.annotation.Resource;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component @Component
public class MyMessageProducer { public class MyMessageProducer {
@@ -5,15 +5,13 @@ import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.common.comm.Protocol; import com.aliyun.oss.common.comm.Protocol;
import com.aliyun.oss.common.comm.SignVersion; import com.aliyun.oss.common.comm.SignVersion;
import jakarta.annotation.PostConstruct;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@Configuration @Configuration
@ConfigurationProperties(prefix = "alioss") @ConfigurationProperties(prefix = "alioss")
@@ -24,6 +24,8 @@ import com.wonder.bi.service.ChartService;
import com.wonder.bi.service.UserService; import com.wonder.bi.service.UserService;
import com.wonder.bi.utils.ExcelUtils; import com.wonder.bi.utils.ExcelUtils;
import com.wonder.bi.utils.SqlUtils; import com.wonder.bi.utils.SqlUtils;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -31,8 +33,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@@ -13,8 +13,9 @@ import com.wonder.bi.model.enums.FileUploadBizEnum;
import com.wonder.bi.service.UserService; import com.wonder.bi.service.UserService;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -1,13 +1,13 @@
package com.wonder.bi.controller; package com.wonder.bi.controller;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@@ -20,8 +20,9 @@ import com.wonder.bi.model.vo.LoginUserVO;
import com.wonder.bi.model.vo.UserVO; import com.wonder.bi.model.vo.UserVO;
import com.wonder.bi.service.UserService; import com.wonder.bi.service.UserService;
import java.util.List; import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -3,10 +3,11 @@ package com.wonder.bi.manager;
import com.aliyun.oss.OSSClient; import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.PutObjectResult; import com.aliyun.oss.model.PutObjectResult;
import com.wonder.bi.config.OssClientConfig; import com.wonder.bi.config.OssClientConfig;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.io.File; import java.io.File;
@@ -2,13 +2,14 @@ package com.wonder.bi.manager;
import com.wonder.bi.common.ErrorCode; import com.wonder.bi.common.ErrorCode;
import com.wonder.bi.exception.BusinessException; import com.wonder.bi.exception.BusinessException;
import jakarta.annotation.Resource;
import org.redisson.api.RRateLimiter; import org.redisson.api.RRateLimiter;
import org.redisson.api.RateIntervalUnit; import org.redisson.api.RateIntervalUnit;
import org.redisson.api.RateType; import org.redisson.api.RateType;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/** /**
* 专门提供 RedisLimiter 限流基础服务的(提供了通用的能力) * 专门提供 RedisLimiter 限流基础服务的(提供了通用的能力)
@@ -6,8 +6,10 @@ import com.wonder.bi.model.dto.user.UserQueryRequest;
import com.wonder.bi.model.entity.User; import com.wonder.bi.model.entity.User;
import com.wonder.bi.model.vo.LoginUserVO; import com.wonder.bi.model.vo.LoginUserVO;
import com.wonder.bi.model.vo.UserVO; import com.wonder.bi.model.vo.UserVO;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest;
/** /**
* 用户服务 * 用户服务
@@ -19,7 +19,8 @@ import com.wonder.bi.utils.SqlUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -1,7 +1,9 @@
package com.wonder.bi.utils; package com.wonder.bi.utils;
import jakarta.servlet.http.HttpServletRequest;
import java.net.InetAddress; import java.net.InetAddress;
import javax.servlet.http.HttpServletRequest;
/** /**
* 网络工具类 * 网络工具类