build: spring boot 3.0

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
     }
     environment {
         IMAGE_PREFIX = 'registry.cn-qingdao.aliyuncs.com/metersphere'
-        JAVA_HOME = '/opt/jdk-11'
+        JAVA_HOME = '/opt/jdk-17'
     }
     stages {
         stage('Preparation') {
@@ -44,7 +44,7 @@ pipeline {
             steps {
                 configFileProvider([configFile(fileId: 'metersphere-maven', targetLocation: 'settings.xml')]) {
                     sh '''#!/bin/bash -xe
-                        export JAVA_HOME=/opt/jdk-11
+                        export JAVA_HOME=/opt/jdk-17
                         export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH
                         export PATH=$JAVA_HOME/bin:$PATH
                         java -version
@@ -58,7 +58,7 @@ pipeline {
             steps {
                 configFileProvider([configFile(fileId: 'metersphere-maven', targetLocation: 'settings.xml')]) {
                     sh '''#!/bin/bash -xe
-                        export JAVA_HOME=/opt/jdk-11
+                        export JAVA_HOME=/opt/jdk-17
                         export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH
                         export PATH=$JAVA_HOME/bin:$PATH
                         java -version
@@ -83,7 +83,7 @@ pipeline {
             steps {
                 configFileProvider([configFile(fileId: 'metersphere-maven', targetLocation: 'settings.xml')]) {
                     sh '''#!/bin/bash -xe
-                        export JAVA_HOME=/opt/jdk-11
+                        export JAVA_HOME=/opt/jdk-17
                         export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH
                         export PATH=$JAVA_HOME/bin:$PATH
                         java -version

api-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk11-jre
+FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk17-jre
 
 LABEL maintainer="FIT2CLOUD <support@fit2cloud.com>"
 
@@ -21,7 +21,7 @@ RUN mv /app/jmeter /opt/
 ENV JAVA_CLASSPATH=/app:/app/lib/ms-jmeter-core.jar:/opt/jmeter/lib/ext/*:/app/lib/*
 ENV JAVA_MAIN_CLASS=io.metersphere.ApiApplication
 ENV MS_VERSION=${MS_VERSION}
-ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED"
+ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
 
 
 CMD ["/deployments/run-java.sh"]

api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseExecuteService.java

@@ -38,7 +38,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java

@@ -19,7 +19,7 @@ import org.apache.jorphan.collections.HashTree;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java

@@ -42,7 +42,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 
 @Service

api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java

@@ -46,7 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 
 @Service

api-test/backend/src/main/java/io/metersphere/api/exec/engine/KubernetesApiExec.java

@@ -61,27 +61,28 @@ public class KubernetesApiExec {
 
     private static class SimpleListener implements ExecListener {
         @Override
-        public void onOpen(Response response) {
+        public void onOpen() {
             LoggerUtil.info("The shell will remain open for 10 seconds.");
         }
 
         @Override
         public void onFailure(Throwable t, Response response) {
-            List<String> value = response.request().url().queryParameterValues("command");
+            // todo k8s 执行api变了
-            if (CollectionUtils.isNotEmpty(value) && value.size() > 2 && value.get(2).startsWith("curl")) {
+//            List<String> value = response.request().url().queryParameterValues("command");
-                String query = "{" + KubernetesApiExec.getQuery(value.get(2)) + "}";
+//            if (CollectionUtils.isNotEmpty(value) && value.size() > 2 && value.get(2).startsWith("curl")) {
-                JmeterRunRequestDTO runRequest = JSON.parseObject(query, JmeterRunRequestDTO.class);
+//                String query = "{" + KubernetesApiExec.getQuery(value.get(2)) + "}";
-                if (runRequest != null) {
+//                JmeterRunRequestDTO runRequest = JSON.parseObject(query, JmeterRunRequestDTO.class);
-                    RemakeReportService apiScenarioReportService = CommonBeanFactory.getBean(RemakeReportService.class);
+//                if (runRequest != null) {
-                    apiScenarioReportService.testEnded(runRequest, response.networkResponse().message());
+//                    RemakeReportService apiScenarioReportService = CommonBeanFactory.getBean(RemakeReportService.class);
-                } else {
+//                    apiScenarioReportService.testEnded(runRequest, response.networkResponse().message());
-                    MSException.throwException("K8S 节点执行错误：" + response.networkResponse().message());
+//                } else {
-                }
+//                    MSException.throwException("K8S 节点执行错误：" + response.networkResponse().message());
-            } else {
+//                }
-                MSException.throwException("K8S 节点执行错误：" + response.networkResponse().message());
+//            } else {
-            }
+//                MSException.throwException("K8S 节点执行错误：" + response.networkResponse().message());
-            LoggerUtil.error("K8S 节点执行错误：" + JSON.toJSONString(value));
+//            }
-            LoggerUtil.error("K8S 节点执行错误：" + response.networkResponse());
+//            LoggerUtil.error("K8S 节点执行错误：" + JSON.toJSONString(value));
+//            LoggerUtil.error("K8S 节点执行错误：" + response.networkResponse());
         }
 
         @Override

api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiEnvironmentRunningParamService.java

@@ -12,7 +12,7 @@ import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;

api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java

@@ -38,7 +38,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java

@@ -54,7 +54,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java

@@ -17,7 +17,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Map;
 
 @Service

api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java

@@ -29,7 +29,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java

@@ -42,8 +42,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 import java.util.List;
 

api-test/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java

@@ -18,7 +18,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.support.Acknowledgment;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

api-test/backend/src/main/java/io/metersphere/commons/config/KafkaConfig.java

@@ -16,7 +16,7 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
 import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 import org.springframework.kafka.listener.ContainerProperties;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/commons/utils/WebSocketUtil.java

@@ -4,8 +4,8 @@ import io.metersphere.api.dto.MsgDTO;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.websocket.RemoteEndpoint;
+import jakarta.websocket.RemoteEndpoint;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;

api-test/backend/src/main/java/io/metersphere/commons/utils/mock/MockApiUtils.java

@@ -19,7 +19,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import javax.script.ScriptEngine;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.*;

api-test/backend/src/main/java/io/metersphere/controller/ApiGraphController.java

@@ -5,7 +5,7 @@ import io.metersphere.xpack.graph.request.GraphBatchRequest;
 import io.metersphere.dto.RelationshipGraphData;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RequestMapping("/graph")
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/ApiJMeterFileController.java

@@ -11,7 +11,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.UUID;
 
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/PluginController.java

@@ -6,7 +6,7 @@ import io.metersphere.base.domain.Plugin;
 import io.metersphere.service.PluginService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/ScheduleController.java

@@ -8,7 +8,7 @@ import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.service.BaseScheduleService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 public class ScheduleController {

api-test/backend/src/main/java/io/metersphere/controller/ShareController.java

@@ -18,7 +18,7 @@ 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;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**

api-test/backend/src/main/java/io/metersphere/controller/TestCaseRelevanceApiController.java

@@ -11,7 +11,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.service.definition.ApiTestCaseService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/definition/ApiDefinitionController.java

@@ -39,7 +39,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 

api-test/backend/src/main/java/io/metersphere/controller/definition/ApiDefinitionEnvController.java

@@ -7,7 +7,7 @@ import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping(value = "/api/definition/env")

api-test/backend/src/main/java/io/metersphere/controller/definition/ApiDefinitionExecResultController.java

@@ -5,7 +5,7 @@ import io.metersphere.dto.PlanReportCaseDTO;
 import io.metersphere.service.definition.ApiDefinitionExecResultService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/controller/definition/ApiModuleController.java

@@ -13,7 +13,7 @@ import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.log.annotation.MsAuditLog;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @RequestMapping("/api/module")

api-test/backend/src/main/java/io/metersphere/controller/definition/ApiTestCaseController.java

@@ -26,7 +26,7 @@ import io.metersphere.service.scenario.ApiScenarioService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/controller/ext/ExtProjectController.java

@@ -14,7 +14,7 @@ import io.metersphere.service.ext.ExtProjectApplicationService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 

api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java

@@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;

api-test/backend/src/main/java/io/metersphere/controller/mock/MockApiController.java

@@ -7,9 +7,9 @@ import io.metersphere.service.BaseProjectService;
 import io.metersphere.service.MockConfigService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**

api-test/backend/src/main/java/io/metersphere/controller/mock/MockConfigController.java

@@ -18,7 +18,7 @@ import io.metersphere.service.definition.ApiDefinitionService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/controller/plan/ShareTestPlanApiCaseController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 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.List;
 
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/plan/ShareTestPlanApiReportController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/share")

api-test/backend/src/main/java/io/metersphere/controller/plan/ShareTestPlanScenarioCaseController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 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.List;
 
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/plan/TestPlanApiCaseController.java

@@ -22,7 +22,7 @@ import io.metersphere.service.plan.TestPlanApiCaseService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

api-test/backend/src/main/java/io/metersphere/controller/plan/TestPlanScenarioCaseController.java

@@ -23,7 +23,7 @@ import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.request.ResetOrderRequest;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

api-test/backend/src/main/java/io/metersphere/controller/remote/ApiProjectSettingController.java

@@ -4,8 +4,8 @@ import io.metersphere.service.remote.ApiProjectSettingService;
 import io.metersphere.api.dto.QueryTestPlanRequest;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping(path = {

api-test/backend/src/main/java/io/metersphere/controller/remote/CustomFunctionController.java

@@ -4,8 +4,8 @@ import io.metersphere.service.remote.CustomFunctionService;
 import io.metersphere.api.dto.CustomFunctionRequest;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @RequestMapping("/custom/func")
 @RestController

api-test/backend/src/main/java/io/metersphere/controller/remote/TestPlanController.java

@@ -6,8 +6,8 @@ import io.metersphere.service.remote.RemoteTestPlanService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 

api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioController.java

@@ -34,7 +34,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioModuleController.java

@@ -10,7 +10,7 @@ import io.metersphere.commons.constants.OperLogModule;
 import io.metersphere.log.annotation.MsAuditLog;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @RequestMapping("/api/automation/module")

api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioReportController.java

@@ -21,7 +21,7 @@ import io.metersphere.service.ShareInfoService;
 import io.metersphere.service.scenario.ApiScenarioReportService;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioRerunController.java

@@ -9,7 +9,7 @@ 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;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping(value = "/api/test/exec")

api-test/backend/src/main/java/io/metersphere/listener/ApiAppStartListener.java

@@ -18,7 +18,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Component
 public class ApiAppStartListener implements ApplicationRunner {

api-test/backend/src/main/java/io/metersphere/listener/CheckMockEnvironmentListener.java

@@ -8,7 +8,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Component
 public class CheckMockEnvironmentListener {

api-test/backend/src/main/java/io/metersphere/listener/CleanUpReportListener.java

@@ -11,7 +11,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDate;
 import java.time.ZoneId;
 

api-test/backend/src/main/java/io/metersphere/listener/InitListener.java

@@ -11,7 +11,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Component
 public class InitListener implements ApplicationRunner {

api-test/backend/src/main/java/io/metersphere/listener/ProjectCreatedListener.java

@@ -14,7 +14,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
 

api-test/backend/src/main/java/io/metersphere/listener/ProjectDeletedListener.java

@@ -15,7 +15,7 @@ import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 
 @Component

api-test/backend/src/main/java/io/metersphere/listener/TestPlanDeletedListener.java

@@ -11,7 +11,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @Component

api-test/backend/src/main/java/io/metersphere/service/ApiExecutionQueueService.java

@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/ApiGraphService.java

@@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Service
 @Transactional(rollbackFor = Exception.class)

api-test/backend/src/main/java/io/metersphere/service/ApiJMeterFileService.java

@@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.nio.charset.StandardCharsets;

api-test/backend/src/main/java/io/metersphere/service/MockConfigService.java

@@ -39,9 +39,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.xml.sax.InputSource;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayInputStream;

api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java

@@ -25,7 +25,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

api-test/backend/src/main/java/io/metersphere/service/PluginService.java

@@ -19,7 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URL;

api-test/backend/src/main/java/io/metersphere/service/RedisTemplateService.java

@@ -4,7 +4,7 @@ import io.metersphere.commons.utils.LogUtil;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.concurrent.TimeUnit;
 
 @Service

api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java

@@ -29,7 +29,7 @@ import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Service
 public class RemakeReportService {

api-test/backend/src/main/java/io/metersphere/service/ShareInfoService.java

@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/TestResultService.java

@@ -28,7 +28,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 
 @Service

api-test/backend/src/main/java/io/metersphere/service/definition/ApiCaseExecutionInfoService.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiCaseResultService.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.LinkedList;
 import java.util.Map;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionEnvService.java

@@ -17,7 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;

api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java

@@ -33,7 +33,7 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java

@@ -34,7 +34,7 @@ import org.json.JSONObject;
 import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java

@@ -73,7 +73,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.net.MalformedURLException;
 import java.util.*;
 import java.util.function.Function;

api-test/backend/src/main/java/io/metersphere/service/definition/ApiExecutionInfoService.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiModuleService.java

@@ -36,8 +36,16 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java

@@ -54,7 +54,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
+import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/definition/TcpApiParamService.java

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**

api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiScheduleService.java

@@ -29,10 +29,10 @@ import org.quartz.TriggerKey;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import jakarta.annotation.Resource;
 import java.util.stream.Collectors;
 
 @Service

api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiTaskService.java

@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

api-test/backend/src/main/java/io/metersphere/service/ext/ExtProjectApplicationService.java

@@ -26,7 +26,7 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @Service

api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java

@@ -49,7 +49,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java

@@ -52,7 +52,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/remote/ApiProjectSettingService.java

@@ -6,7 +6,7 @@ import io.metersphere.service.MicroService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Service
 @Transactional(rollbackFor = Exception.class)

api-test/backend/src/main/java/io/metersphere/service/remote/CustomFunctionService.java

@@ -7,7 +7,7 @@ import io.metersphere.commons.constants.MicroServiceName;
 import io.metersphere.service.MicroService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Service
 public class CustomFunctionService {

api-test/backend/src/main/java/io/metersphere/service/remote/RemoteTestPlanService.java

@@ -7,7 +7,7 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.service.MicroService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioExecutionInfoService.java

@@ -15,7 +15,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
 

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioModuleService.java

@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.apache.commons.collections.CollectionUtils;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReferenceIdService.java

@@ -20,7 +20,7 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportResultService.java

@@ -15,7 +15,7 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @Service

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportService.java

@@ -43,7 +43,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportStructureService.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioRerunService.java

@@ -36,7 +36,7 @@ import org.apache.commons.collections4.comparators.FixedOrderComparator;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java

@@ -77,7 +77,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;

api-test/backend/src/main/java/io/metersphere/websocket/IndexWebSocket.java

@@ -8,9 +8,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.websocket.*;
+import jakarta.websocket.*;
-import javax.websocket.server.PathParam;
+import jakarta.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpoint;
 import java.io.IOException;
 
 @Slf4j

framework/eureka/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk11-jre
+FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk17-jre
 
 LABEL maintainer="FIT2CLOUD <support@fit2cloud.com>"
 
@@ -13,7 +13,7 @@ COPY ${DEPENDENCY}/BOOT-INF/classes /app
 ENV JAVA_CLASSPATH=/app:/app/lib/*
 ENV JAVA_MAIN_CLASS=io.metersphere.eureka.EurekaApplication
 ENV MS_VERSION=${MS_VERSION}
-ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED"
+ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
 
 
 CMD ["/deployments/run-java.sh"]

framework/eureka/pom.xml

@@ -13,16 +13,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

framework/eureka/src/main/java/io/metersphere/eureka/config/SyncEurekaServer.java

@@ -1,5 +1,6 @@
 package io.metersphere.eureka.config;
 
+import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.RegExUtils;
@@ -14,7 +15,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.net.InetAddress;
 import java.net.URL;
 import java.util.ArrayList;

framework/gateway/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk11-jre
+FROM registry.cn-qingdao.aliyuncs.com/metersphere/alpine-openjdk17-jre
 
 LABEL maintainer="FIT2CLOUD <support@fit2cloud.com>"
 
@@ -24,7 +24,7 @@ COPY src/main/resources/static/*.worker.js /app/static/
 ENV JAVA_CLASSPATH=/app:/app/lib/*
 ENV JAVA_MAIN_CLASS=io.metersphere.gateway.GatewayApplication
 ENV MS_VERSION=${MS_VERSION}
-ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Dreactor.netty.pool.leasingStrategy=lifo"
+ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED -Dreactor.netty.pool.leasingStrategy=lifo"
 
 
 CMD ["/deployments/run-java.sh"]

framework/gateway/pom.xml

@@ -194,6 +194,10 @@
                     <artifactId>xz</artifactId>
                     <groupId>org.tukaani</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>springdoc-openapi-ui</artifactId>
+                    <groupId>org.springdoc</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

framework/gateway/src/main/java/io/metersphere/gateway/config/RsaConfig.java

@@ -7,7 +7,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Configuration
 public class RsaConfig implements ApplicationRunner {

framework/gateway/src/main/java/io/metersphere/gateway/controller/LdapController.java

@@ -11,7 +11,7 @@ import org.springframework.web.server.WebSession;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Locale;
 
 @RestController

framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java

@@ -26,7 +26,7 @@ import org.springframework.web.server.WebSession;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;

framework/gateway/src/main/java/io/metersphere/gateway/controller/SSOController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.reactive.result.view.Rendering;
 import org.springframework.web.server.WebSession;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Locale;
 import java.util.Optional;
 

framework/gateway/src/main/java/io/metersphere/gateway/filter/SessionFilter.java

@@ -11,7 +11,7 @@ import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Optional;
 
 @Component

framework/gateway/src/main/java/io/metersphere/gateway/log/aspect/MsLogAspect.java

@@ -20,7 +20,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.Method;
 import java.util.UUID;