wonder/open-bi-refactor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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