diff --git a/Backend/pom.xml b/Backend/pom.xml index 47e8b22..81acfe6 100644 --- a/Backend/pom.xml +++ b/Backend/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.2 + 3.2.2 com.wonder @@ -14,14 +14,13 @@ 0.0.1-SNAPSHOT bi-backend - 1.8 + 21 org.springframework.boot spring-boot-starter-amqp - 2.7.2 @@ -55,7 +54,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.2.2 + 3.0.3 @@ -111,6 +110,7 @@ mysql mysql-connector-java + 8.0.33 runtime diff --git a/Backend/src/main/java/com/wonder/bi/aop/AuthInterceptor.java b/Backend/src/main/java/com/wonder/bi/aop/AuthInterceptor.java index fbd9da5..fe12f59 100644 --- a/Backend/src/main/java/com/wonder/bi/aop/AuthInterceptor.java +++ b/Backend/src/main/java/com/wonder/bi/aop/AuthInterceptor.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/aop/LogInterceptor.java b/Backend/src/main/java/com/wonder/bi/aop/LogInterceptor.java index b31a24f..cfbebaa 100644 --- a/Backend/src/main/java/com/wonder/bi/aop/LogInterceptor.java +++ b/Backend/src/main/java/com/wonder/bi/aop/LogInterceptor.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageConsumer.java b/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageConsumer.java index 5d4be09..6cb3f04 100644 --- a/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageConsumer.java +++ b/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageConsumer.java @@ -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 diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageProducer.java b/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageProducer.java index c5c4f7b..9395ed2 100644 --- a/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageProducer.java +++ b/Backend/src/main/java/com/wonder/bi/bizmq/BiMessageProducer.java @@ -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 { diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java b/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java index eb57187..d77563c 100644 --- a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java +++ b/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java @@ -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 diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageProducer.java b/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageProducer.java index ccba796..0caad48 100644 --- a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageProducer.java +++ b/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageProducer.java @@ -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 { diff --git a/Backend/src/main/java/com/wonder/bi/config/OssClientConfig.java b/Backend/src/main/java/com/wonder/bi/config/OssClientConfig.java index 9b9f94b..fae6908 100644 --- a/Backend/src/main/java/com/wonder/bi/config/OssClientConfig.java +++ b/Backend/src/main/java/com/wonder/bi/config/OssClientConfig.java @@ -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") diff --git a/Backend/src/main/java/com/wonder/bi/controller/ChartController.java b/Backend/src/main/java/com/wonder/bi/controller/ChartController.java index 16cc9e2..45ac461 100644 --- a/Backend/src/main/java/com/wonder/bi/controller/ChartController.java +++ b/Backend/src/main/java/com/wonder/bi/controller/ChartController.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/controller/FileController.java b/Backend/src/main/java/com/wonder/bi/controller/FileController.java index 37ca1ca..f315835 100644 --- a/Backend/src/main/java/com/wonder/bi/controller/FileController.java +++ b/Backend/src/main/java/com/wonder/bi/controller/FileController.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/controller/QueueController.java b/Backend/src/main/java/com/wonder/bi/controller/QueueController.java index 6318e56..65cee76 100644 --- a/Backend/src/main/java/com/wonder/bi/controller/QueueController.java +++ b/Backend/src/main/java/com/wonder/bi/controller/QueueController.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/controller/UserController.java b/Backend/src/main/java/com/wonder/bi/controller/UserController.java index b68097a..6672e41 100644 --- a/Backend/src/main/java/com/wonder/bi/controller/UserController.java +++ b/Backend/src/main/java/com/wonder/bi/controller/UserController.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/manager/OssManager.java b/Backend/src/main/java/com/wonder/bi/manager/OssManager.java index 45a88e0..53d3db1 100644 --- a/Backend/src/main/java/com/wonder/bi/manager/OssManager.java +++ b/Backend/src/main/java/com/wonder/bi/manager/OssManager.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/manager/RedisLimiterManager.java b/Backend/src/main/java/com/wonder/bi/manager/RedisLimiterManager.java index b449726..d1024e4 100644 --- a/Backend/src/main/java/com/wonder/bi/manager/RedisLimiterManager.java +++ b/Backend/src/main/java/com/wonder/bi/manager/RedisLimiterManager.java @@ -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 限流基础服务的(提供了通用的能力) diff --git a/Backend/src/main/java/com/wonder/bi/service/UserService.java b/Backend/src/main/java/com/wonder/bi/service/UserService.java index f390c9f..e06a18a 100644 --- a/Backend/src/main/java/com/wonder/bi/service/UserService.java +++ b/Backend/src/main/java/com/wonder/bi/service/UserService.java @@ -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; + /** * 用户服务 diff --git a/Backend/src/main/java/com/wonder/bi/service/impl/UserServiceImpl.java b/Backend/src/main/java/com/wonder/bi/service/impl/UserServiceImpl.java index 4220a07..bfffc5f 100644 --- a/Backend/src/main/java/com/wonder/bi/service/impl/UserServiceImpl.java +++ b/Backend/src/main/java/com/wonder/bi/service/impl/UserServiceImpl.java @@ -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; diff --git a/Backend/src/main/java/com/wonder/bi/utils/NetUtils.java b/Backend/src/main/java/com/wonder/bi/utils/NetUtils.java index be1be2d..5f429ab 100644 --- a/Backend/src/main/java/com/wonder/bi/utils/NetUtils.java +++ b/Backend/src/main/java/com/wonder/bi/utils/NetUtils.java @@ -1,7 +1,9 @@ package com.wonder.bi.utils; +import jakarta.servlet.http.HttpServletRequest; + import java.net.InetAddress; -import javax.servlet.http.HttpServletRequest; + /** * 网络工具类