From 07f6be51c73cf168f1059919af68e79e72f26f0c Mon Sep 17 00:00:00 2001
From: mislayming <18808893@qq.com>
Date: Wed, 11 Dec 2024 17:09:20 +0800
Subject: [PATCH] =?UTF-8?q?SpringBoot3=E5=8D=87=E7=BA=A7=20(#1947)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/centos-ci.yml               |  7 +++--
 .../authentication/adaptor/UserAdaptor.java   |  2 +-
 .../api/authentication/request/UserReq.java   |  2 +-
 .../authentication/request/UserTokenReq.java  |  3 +-
 .../authentication/service/UserService.java   |  5 ++--
 .../authentication/service/UserStrategy.java  |  5 ++--
 .../api/authentication/utils/UserHolder.java  |  5 ++--
 .../adaptor/DefaultUserAdaptor.java           |  3 +-
 .../AuthenticationInterceptor.java            |  3 +-
 .../DefaultAuthenticationInterceptor.java     |  5 ++--
 .../authentication/rest/UserController.java   |  5 ++--
 .../service/UserServiceImpl.java              |  5 ++--
 .../strategy/FakeUserStrategy.java            |  5 ++--
 .../strategy/HttpHeaderUserStrategy.java      |  5 ++--
 .../strategy/UserStrategyFactory.java         |  2 +-
 .../authentication/utils/TokenService.java    |  4 ++-
 auth/authorization/pom.xml                    |  4 +--
 .../authorization/rest/AuthController.java    |  5 ++--
 .../api/pojo/request/ChatMemoryUpdateReq.java |  3 +-
 .../api/pojo/request/KnowledgeInfoReq.java    |  3 +-
 .../persistence/dataobject/ChatContextDO.java |  2 +-
 .../impl/ChatContextRepositoryImpl.java       |  4 +--
 .../chat/server/rest/AgentController.java     |  5 ++--
 .../server/rest/ChatConfigController.java     |  5 ++--
 .../chat/server/rest/ChatController.java      |  5 ++--
 .../chat/server/rest/ChatQueryController.java |  7 ++---
 .../chat/server/rest/MemoryController.java    |  5 ++--
 .../chat/server/rest/PluginController.java    |  5 ++--
 .../resources/mapper/ChatContextMapper.xml    |  4 +--
 common/pom.xml                                | 30 +++++++++----------
 .../common/interceptor/LogInterceptor.java    |  5 ++--
 .../supersonic/common/pojo/Aggregator.java    |  3 +-
 .../tencent/supersonic/common/pojo/Order.java |  3 +-
 .../supersonic/headless/api/pojo/Param.java   |  5 ++--
 .../api/pojo/request/DictItemReq.java         |  2 +-
 .../api/pojo/request/DictSingleTaskReq.java   |  3 +-
 .../api/pojo/request/DimValueAliasReq.java    |  3 +-
 .../api/pojo/request/DimensionReq.java        |  3 +-
 .../api/pojo/request/DimensionValueReq.java   |  3 +-
 .../api/pojo/request/ItemValueReq.java        |  3 +-
 .../api/pojo/request/QueryItemReq.java        |  2 +-
 .../api/pojo/request/QueryRuleReq.java        |  3 +-
 .../api/pojo/request/SchemaItemQueryReq.java  |  5 ++--
 .../api/pojo/request/SqlExecuteReq.java       |  5 ++--
 .../api/pojo/request/TagBatchCreateReq.java   |  3 +-
 .../api/pojo/request/TagObjectReq.java        |  3 +-
 .../headless/api/pojo/request/TagReq.java     |  3 +-
 .../headless/api/pojo/request/TermReq.java    |  3 +-
 .../api/pojo/request/ValueTaskQueryReq.java   |  3 +-
 .../api/pojo/response/DictItemResp.java       |  3 +-
 .../api/pojo/response/QueryRuleResp.java      |  3 +-
 headless/chat/pom.xml                         |  6 ++--
 headless/core/pom.xml                         |  4 +--
 headless/server/pom.xml                       |  8 ++---
 .../server/aspect/ApiHeaderCheckAspect.java   |  3 +-
 .../facade/rest/ChatQueryApiController.java   |  5 ++--
 .../rest/DataSetQueryApiController.java       |  5 ++--
 .../rest/MetaDiscoveryApiController.java      |  5 ++--
 .../facade/rest/MetricQueryApiController.java |  5 ++--
 .../facade/rest/SqlQueryApiController.java    |  5 ++--
 .../facade/rest/TagQueryApiController.java    |  5 ++--
 .../persistence/dataobject/QueryStatDO.java   |  4 +--
 .../headless/server/rest/AppController.java   |  5 ++--
 .../server/rest/CanvasController.java         |  5 ++--
 .../server/rest/ChatModelController.java      |  5 ++--
 .../headless/server/rest/ClassController.java |  7 ++---
 .../server/rest/CollectController.java        |  5 ++--
 .../server/rest/DataSetController.java        |  5 ++--
 .../server/rest/DatabaseController.java       |  5 ++--
 .../server/rest/DimensionController.java      |  5 ++--
 .../server/rest/DomainController.java         |  5 ++--
 .../server/rest/KnowledgeController.java      |  7 ++---
 .../server/rest/MetricController.java         |  5 ++--
 .../headless/server/rest/ModelController.java |  5 ++--
 .../server/rest/QueryRuleController.java      |  5 ++--
 .../server/rest/SchemaController.java         |  5 ++--
 .../headless/server/rest/TagController.java   |  7 ++---
 .../server/rest/TagObjectController.java      |  5 ++--
 .../headless/server/rest/TermController.java  |  5 ++--
 .../server/service/DownloadService.java       |  3 +-
 .../service/impl/DownloadServiceImpl.java     |  3 +-
 .../src/main/resources/mapper/StatMapper.xml  |  4 +--
 launchers/chat/pom.xml                        |  4 +--
 launchers/common/pom.xml                      |  6 ++--
 .../supersonic/config/RestTemplateConfig.java | 23 +++++++++-----
 .../supersonic/web/ErrorPageConfig.java       | 27 ++++++++++++++++-
 .../com/tencent/supersonic/web/WebConfig.java |  8 +++--
 launchers/standalone/pom.xml                  |  9 ++++--
 .../src/main/resources/db/schema-h2-demo.sql  | 10 +++----
 .../src/main/resources/db/schema-h2.sql       |  4 +--
 pom.xml                                       | 30 ++++++++++++-------
 91 files changed, 246 insertions(+), 253 deletions(-)

diff --git a/.github/workflows/centos-ci.yml b/.github/workflows/centos-ci.yml
index 467d6147a..e58373c9d 100644
--- a/.github/workflows/centos-ci.yml
+++ b/.github/workflows/centos-ci.yml
@@ -37,9 +37,9 @@ jobs:
 
       - name: Install Maven with retry
         run: |
-            for i in {1..5}; do
+          for i in {1..5}; do
               dnf install -y maven && break || sleep 15
-            done
+          done
 
       - name: Verify Java and Maven installation
         run: |
@@ -57,4 +57,5 @@ jobs:
         run: mvn -B package --file pom.xml
 
       - name: Test with Maven
-        run: mvn test
\ No newline at end of file
+        run: mvn test
+
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java
index b5767d7e6..888bb87af 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java
@@ -1,11 +1,11 @@
 package com.tencent.supersonic.auth.api.authentication.adaptor;
 
-import javax.servlet.http.HttpServletRequest;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserToken;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.List;
 import java.util.Set;
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
index bc4b96b91..60557f9c8 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
@@ -1,7 +1,7 @@
 package com.tencent.supersonic.auth.api.authentication.request;
 
-import javax.validation.constraints.NotBlank;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserTokenReq.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserTokenReq.java
index 5c04d47bd..72a3a10ff 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserTokenReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserTokenReq.java
@@ -1,7 +1,6 @@
 package com.tencent.supersonic.auth.api.authentication.request;
 
-import javax.validation.constraints.NotBlank;
-
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java
index 368059b6b..2073349a8 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java
@@ -1,12 +1,13 @@
 package com.tencent.supersonic.auth.api.authentication.service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
 
 import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserToken;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
 import java.util.Set;
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java
index 0ddb6567a..c9168b929 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.auth.api.authentication.service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface UserStrategy {
 
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java
index 9d34baa28..d18eac452 100644
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java
@@ -1,13 +1,12 @@
 package com.tencent.supersonic.auth.api.authentication.utils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
 import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import com.tencent.supersonic.common.util.ContextUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.util.CollectionUtils;
 
 public final class UserHolder {
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
index cb134e5a3..fb54432a5 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
@@ -1,7 +1,5 @@
 package com.tencent.supersonic.auth.authentication.adaptor;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
@@ -16,6 +14,7 @@ import com.tencent.supersonic.auth.authentication.utils.TokenService;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.util.AESEncryptionUtil;
 import com.tencent.supersonic.common.util.ContextUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java
index e34b69e0a..4f95c6943 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java
@@ -1,12 +1,11 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
 import com.tencent.supersonic.auth.authentication.utils.TokenService;
 import com.tencent.supersonic.common.util.S2ThreadContext;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.connector.RequestFacade;
 import org.apache.commons.lang3.StringUtils;
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
index 385c390fc..033fe7a6a 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
@@ -14,6 +11,8 @@ import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
 import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.method.HandlerMethod;
 
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
index 3f7076acd..0f8854f10 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.auth.authentication.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserToken;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.api.authentication.request.UserTokenReq;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java
index a10978b0c..3805f1d0a 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.auth.authentication.service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserToken;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
@@ -12,6 +9,8 @@ import com.tencent.supersonic.auth.authentication.utils.ComponentFactory;
 import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.service.SystemConfigService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java
index 8008e2c24..9cb2fa51c 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java
@@ -1,10 +1,9 @@
 package com.tencent.supersonic.auth.authentication.strategy;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java
index 9d274964b..11a4bb2c8 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java
@@ -1,13 +1,12 @@
 package com.tencent.supersonic.auth.authentication.strategy;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
 import com.tencent.supersonic.auth.authentication.utils.TokenService;
 import com.tencent.supersonic.common.pojo.User;
 import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java
index 59e6db441..a35c94f68 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java
@@ -1,10 +1,10 @@
 package com.tencent.supersonic.auth.authentication.strategy;
 
-import javax.annotation.PostConstruct;
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
+import jakarta.annotation.PostConstruct;
 import lombok.Data;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/TokenService.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/TokenService.java
index e4e568de3..a8b249602 100644
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/TokenService.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/TokenService.java
@@ -1,7 +1,8 @@
 package com.tencent.supersonic.auth.authentication.utils;
 
+
+
 import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.http.HttpServletRequest;
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
@@ -9,6 +10,7 @@ import com.tencent.supersonic.common.pojo.exception.AccessException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
diff --git a/auth/authorization/pom.xml b/auth/authorization/pom.xml
index 96823320f..e7ca3f789 100644
--- a/auth/authorization/pom.xml
+++ b/auth/authorization/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>auth-authorization</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java
index f04a5a732..0e00b5911 100644
--- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java
+++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.auth.authorization.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
 import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq;
 import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResourceResp;
 import com.tencent.supersonic.auth.api.authorization.service.AuthService;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java
index 7309e3275..948b2e66b 100644
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeInfoReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeInfoReq.java
index f15e6db3f..618d9f9e5 100644
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeInfoReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeInfoReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /** information about dictionary about the model */
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatContextDO.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatContextDO.java
index 294c5eb75..438145884 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatContextDO.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatContextDO.java
@@ -16,7 +16,7 @@ public class ChatContextDO implements Serializable {
     private Integer chatId;
     private Instant modifiedAt;
     @TableField("query_user")
-    private String user;
+    private String queryUser;
     private String queryText;
     private String semanticParse;
 }
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatContextRepositoryImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatContextRepositoryImpl.java
index 4a67990f2..25aac4a11 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatContextRepositoryImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/impl/ChatContextRepositoryImpl.java
@@ -41,7 +41,7 @@ public class ChatContextRepositoryImpl implements ChatContextRepository {
     private ChatContext cast(ChatContextDO contextDO) {
         ChatContext chatContext = new ChatContext();
         chatContext.setChatId(contextDO.getChatId());
-        chatContext.setUser(contextDO.getUser());
+        chatContext.setUser(contextDO.getQueryUser());
         chatContext.setQueryText(contextDO.getQueryText());
         if (contextDO.getSemanticParse() != null && !contextDO.getSemanticParse().isEmpty()) {
             SemanticParseInfo semanticParseInfo =
@@ -55,7 +55,7 @@ public class ChatContextRepositoryImpl implements ChatContextRepository {
         ChatContextDO chatContextDO = new ChatContextDO();
         chatContextDO.setChatId(chatContext.getChatId());
         chatContextDO.setQueryText(chatContext.getQueryText());
-        chatContextDO.setUser(chatContext.getUser());
+        chatContextDO.setQueryUser(chatContext.getUser());
         if (chatContext.getParseInfo() != null) {
             Gson g = new Gson();
             chatContextDO.setSemanticParse(g.toJson(chatContext.getParseInfo()));
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
index ff3e01b18..8179e723b 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.agent.AgentToolType;
 import com.tencent.supersonic.chat.server.service.AgentService;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java
index 70db92e9e..22f6a6906 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;
@@ -14,6 +11,8 @@ import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.DataSetSchema;
 import com.tencent.supersonic.headless.api.pojo.response.ItemResp;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java
index ecbb8680f..8c756f545 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;
@@ -10,6 +7,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResp;
 import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp;
 import com.tencent.supersonic.chat.server.persistence.dataobject.ChatDO;
 import com.tencent.supersonic.chat.server.service.ChatManageService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java
index d3c3f2010..d606ec2c3 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java
@@ -1,9 +1,5 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
@@ -14,6 +10,9 @@ import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java
index ab9c19b6b..fa8860da3 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
@@ -13,6 +10,8 @@ import com.tencent.supersonic.chat.server.pojo.ChatMemory;
 import com.tencent.supersonic.chat.server.service.MemoryService;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java
index 552961602..33c9991c4 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.chat.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.PluginQueryReq;
 import com.tencent.supersonic.chat.server.plugin.ChatPlugin;
 import com.tencent.supersonic.chat.server.service.PluginService;
 import com.tencent.supersonic.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/chat/server/src/main/resources/mapper/ChatContextMapper.xml b/chat/server/src/main/resources/mapper/ChatContextMapper.xml
index b8ffa674b..987200602 100644
--- a/chat/server/src/main/resources/mapper/ChatContextMapper.xml
+++ b/chat/server/src/main/resources/mapper/ChatContextMapper.xml
@@ -9,7 +9,7 @@
                type="com.tencent.supersonic.chat.server.persistence.dataobject.ChatContextDO">
         <id column="chat_id" property="chatId"/>
         <result column="modified_at" property="modifiedAt"/>
-        <result column="user" property="user"/>
+        <result column="query_user" property="queryUser"/>
         <result column="query_text" property="queryText"/>
         <result column="semantic_parse" property="semanticParse"/>
         <!--<result column="ext_data" property="extData"/>-->
@@ -20,4 +20,4 @@
         from s2_chat_context where chat_id=#{chatId} limit 1
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/common/pom.xml b/common/pom.xml
index 6ade01fd6..c26e05dea 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,21 +31,21 @@
 
         <!--http-->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>${httpmime.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>httpclient</artifactId>
-                    <groupId>org.apache.httpcomponents</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient5.version}</version> <!-- 请确认使用最新稳定版本 -->
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.httpcomponents</groupId>-->
+<!--            <artifactId>httpmime</artifactId>-->
+<!--            <version>${httpmime.version}</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>httpclient</artifactId>-->
+<!--                    <groupId>org.apache.httpcomponents</groupId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -130,7 +130,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <version>${mybatis.plus.version}</version>
         </dependency>
 
diff --git a/common/src/main/java/com/tencent/supersonic/common/interceptor/LogInterceptor.java b/common/src/main/java/com/tencent/supersonic/common/interceptor/LogInterceptor.java
index 2c5dfb848..cf90a4a46 100644
--- a/common/src/main/java/com/tencent/supersonic/common/interceptor/LogInterceptor.java
+++ b/common/src/main/java/com/tencent/supersonic/common/interceptor/LogInterceptor.java
@@ -1,9 +1,10 @@
 package com.tencent.supersonic.common.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
 
 import com.tencent.supersonic.common.util.TraceIdUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/Aggregator.java b/common/src/main/java/com/tencent/supersonic/common/pojo/Aggregator.java
index c877ee515..61147e82e 100644
--- a/common/src/main/java/com/tencent/supersonic/common/pojo/Aggregator.java
+++ b/common/src/main/java/com/tencent/supersonic/common/pojo/Aggregator.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.common.pojo;
 
-import javax.validation.constraints.NotBlank;
-
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.util.List;
diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/Order.java b/common/src/main/java/com/tencent/supersonic/common/pojo/Order.java
index 198a7faac..d26ad2c4a 100644
--- a/common/src/main/java/com/tencent/supersonic/common/pojo/Order.java
+++ b/common/src/main/java/com/tencent/supersonic/common/pojo/Order.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.common.pojo;
 
-import javax.validation.constraints.NotBlank;
-
 import com.google.common.base.Objects;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import static com.tencent.supersonic.common.pojo.Constants.ASC_UPPER;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java
index 1068e6654..ae77bad75 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java
index f2b53aeaa..e04cd9638 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictItemReq.java
@@ -1,10 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
 
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.headless.api.pojo.ItemValueConfig;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
index 00703a8eb..f6cd4f013 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Data;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
index 1b187b7aa..839a7d3ee 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java
index 518522696..22f8f7219 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java
index 879f2c6b3..2b007fe4c 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionValueReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
index d3b6179ac..827639f6d 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java
index cdaa99510..499164379 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java
@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.Size;
 
 import com.tencent.supersonic.common.pojo.DateConf;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.util.List;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java
index ba935f634..e2ec26e69 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryRuleReq.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.ActionInfo;
 import com.tencent.supersonic.headless.api.pojo.RuleInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java
index eeef6554a..53a4a28a5 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
index 5cc530153..0c88f25c5 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.SqlVariable;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java
index e18f2d0e8..73436f31b 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagBatchCreateReq.java
@@ -1,8 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java
index ebabd7c9e..e235a6415 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagObjectReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.HashMap;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java
index bad5c03c1..590b39e81 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java
index 912d1e49a..895158be7 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TermReq.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
-
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java
index f425ff261..fc2a72d1f 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ValueTaskQueryReq.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.headless.api.pojo.request;
 
-import javax.validation.constraints.NotNull;
+
 
 import com.tencent.supersonic.common.pojo.PageBaseReq;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java
index d7f52d657..8f77e1fbe 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DictItemResp.java
@@ -1,10 +1,9 @@
 package com.tencent.supersonic.headless.api.pojo.response;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.headless.api.pojo.ItemValueConfig;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import static com.tencent.supersonic.common.pojo.Constants.UNDERLINE;
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java
index 68b88af94..3c1a18f5e 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/QueryRuleResp.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.headless.api.pojo.response;
 
-import javax.validation.constraints.NotNull;
-
 import com.tencent.supersonic.headless.api.pojo.ActionInfo;
 import com.tencent.supersonic.headless.api.pojo.RuleInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Map;
diff --git a/headless/chat/pom.xml b/headless/chat/pom.xml
index bb6acbd32..9847f0624 100644
--- a/headless/chat/pom.xml
+++ b/headless/chat/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>headless-chat</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -124,4 +124,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/headless/core/pom.xml b/headless/core/pom.xml
index 2ca0bf6c3..8f24644ff 100644
--- a/headless/core/pom.xml
+++ b/headless/core/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>headless-core</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
 
diff --git a/headless/server/pom.xml b/headless/server/pom.xml
index a45c6a5c4..99778a699 100644
--- a/headless/server/pom.xml
+++ b/headless/server/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>headless-server</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -158,7 +158,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java
index 98e3e02eb..22017a028 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java
@@ -1,13 +1,12 @@
 package com.tencent.supersonic.headless.server.aspect;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.tencent.supersonic.common.pojo.Pair;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.util.SignatureUtils;
 import com.tencent.supersonic.headless.api.pojo.enums.AppStatus;
 import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp;
 import com.tencent.supersonic.headless.server.service.AppService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java
index e45e46b85..ae943fbac 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
@@ -11,6 +8,8 @@ import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java
index e428dbf3d..141f5b6af 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryDataSetReq;
 import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.service.DataSetService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java
index a32eba325..0b8d0ddb8 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java
@@ -1,12 +1,11 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq;
 import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java
index f37e12524..ac3356c89 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq;
@@ -12,6 +9,8 @@ import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.service.DownloadService;
 import com.tencent.supersonic.headless.server.service.MetricService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java
index f8e2af71a..cb92c5f69 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.util.StringUtil;
@@ -13,6 +10,8 @@ import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java
index b44c1a0bd..84ebd4e67 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java
@@ -1,12 +1,11 @@
 package com.tencent.supersonic.headless.server.facade.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/QueryStatDO.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/QueryStatDO.java
index 4235390d7..e6c39acde 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/QueryStatDO.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/QueryStatDO.java
@@ -16,7 +16,7 @@ public class QueryStatDO {
     private Long modelId;
     private Long dataSetId;
     @TableField("query_user")
-    private String user;
+    private String queryUser;
     private String createdAt;
     /** corresponding type, such as sql, struct, etc */
     private String queryType;
@@ -28,7 +28,7 @@ public class QueryStatDO {
     private String queryStructCmd;
     @TableField("struct_cmd_md5")
     private String queryStructCmdMd5;
-    @TableField("\"sql\"")
+    @TableField("`sql`")
     private String sql;
     private String sqlMd5;
     private String queryEngine;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java
index 8a0774673..d658bf1e5 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
@@ -11,6 +8,8 @@ import com.tencent.supersonic.headless.api.pojo.request.AppReq;
 import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp;
 import com.tencent.supersonic.headless.api.pojo.response.AppResp;
 import com.tencent.supersonic.headless.server.service.AppService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java
index 71cff5a35..bd5a6a189 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.CanvasReq;
 import com.tencent.supersonic.headless.api.pojo.response.CanvasSchemaResp;
 import com.tencent.supersonic.headless.server.persistence.dataobject.CanvasDO;
 import com.tencent.supersonic.headless.server.service.CanvasService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
index bf33b3aa0..1da2eca33 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.config.ChatModel;
 import com.tencent.supersonic.common.pojo.ChatApp;
@@ -14,6 +11,8 @@ import com.tencent.supersonic.common.pojo.enums.AppModule;
 import com.tencent.supersonic.common.service.ChatModelService;
 import com.tencent.supersonic.common.util.ChatAppManager;
 import com.tencent.supersonic.headless.server.utils.ModelConfigHelper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java
index 4edb68e6b..a5de17252 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java
@@ -1,15 +1,14 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.ClassReq;
 import com.tencent.supersonic.headless.api.pojo.response.ClassResp;
 import com.tencent.supersonic.headless.server.pojo.ClassFilter;
 import com.tencent.supersonic.headless.server.service.ClassService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java
index b2c108744..082d319e4 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java
@@ -1,12 +1,11 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO;
 import com.tencent.supersonic.headless.server.service.CollectService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java
index c445766dd..3d3822da9 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.MetaFilter;
 import com.tencent.supersonic.headless.api.pojo.request.DataSetReq;
 import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
 import com.tencent.supersonic.headless.server.service.DataSetService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
index 01d7fd188..bd1bde0eb 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.DBColumn;
@@ -13,6 +10,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.pojo.DatabaseParameter;
 import com.tencent.supersonic.headless.server.service.DatabaseService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java
index a5bc8d87d..875cfaac0 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
@@ -20,6 +17,8 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.pojo.DimensionFilter;
 import com.tencent.supersonic.headless.server.service.DimensionService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java
index a015e1947..6b66d88dd 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.DomainReq;
 import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq;
 import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
 import com.tencent.supersonic.headless.server.service.DomainService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java
index e813e496b..7711101d0 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java
@@ -1,9 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
@@ -21,6 +17,9 @@ import com.tencent.supersonic.headless.server.service.DictConfService;
 import com.tencent.supersonic.headless.server.service.DictTaskService;
 import com.tencent.supersonic.headless.server.task.DictionaryReloadTask;
 import com.tencent.supersonic.headless.server.task.MetaEmbeddingTask;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java
index bb7da86ce..3568663f7 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
@@ -18,6 +15,8 @@ import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
 import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.server.pojo.MetricFilter;
 import com.tencent.supersonic.headless.server.service.MetricService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java
index e535b4c54..1acbf2a68 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java
@@ -1,8 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
@@ -17,6 +14,8 @@ import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp;
 import com.tencent.supersonic.headless.server.pojo.ModelFilter;
 import com.tencent.supersonic.headless.server.service.ModelService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java
index 1c1f28df1..ea05ad139 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryRuleFilter;
 import com.tencent.supersonic.headless.api.pojo.request.QueryRuleReq;
 import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp;
 import com.tencent.supersonic.headless.server.service.QueryRuleService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java
index 069afd995..3b320b8ca 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.server.service.SchemaService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java
index d1aa10b52..45e9fbca0 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java
@@ -1,9 +1,5 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
@@ -17,6 +13,9 @@ import com.tencent.supersonic.headless.server.persistence.dataobject.TagDO;
 import com.tencent.supersonic.headless.server.pojo.TagFilter;
 import com.tencent.supersonic.headless.server.service.TagMetaService;
 import com.tencent.supersonic.headless.server.service.TagQueryService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java
index 5ea5b8de6..d24d3db0e 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq;
 import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp;
 import com.tencent.supersonic.headless.server.pojo.TagObjectFilter;
 import com.tencent.supersonic.headless.server.service.TagObjectService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java
index 1cd40043c..5a49526bd 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java
@@ -1,14 +1,13 @@
 package com.tencent.supersonic.headless.server.rest;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
 import com.tencent.supersonic.headless.api.pojo.request.TermReq;
 import com.tencent.supersonic.headless.api.pojo.response.TermResp;
 import com.tencent.supersonic.headless.server.service.TermService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java
index 41bc5d8ee..c036112a2 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java
@@ -1,10 +1,9 @@
 package com.tencent.supersonic.headless.server.service;
 
-import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq;
 import com.tencent.supersonic.headless.api.pojo.request.DownloadMetricReq;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface DownloadService {
 
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java
index 6570b83d6..beefec3c5 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java
@@ -1,7 +1,5 @@
 package com.tencent.supersonic.headless.server.service.impl;
 
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.util.FileUtils;
@@ -32,6 +30,7 @@ import com.tencent.supersonic.headless.server.pojo.DataDownload;
 import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.service.DownloadService;
 import com.tencent.supersonic.headless.server.service.MetricService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
diff --git a/headless/server/src/main/resources/mapper/StatMapper.xml b/headless/server/src/main/resources/mapper/StatMapper.xml
index 845625898..60851ede9 100644
--- a/headless/server/src/main/resources/mapper/StatMapper.xml
+++ b/headless/server/src/main/resources/mapper/StatMapper.xml
@@ -10,7 +10,7 @@
         <result column="trace_id" property="traceId"/>
         <result column="model_id" property="modelId"/>
         <result column="data_set_id" property="dataSetId"/>
-        <result column="user" property="user"/>
+        <result column="user" property="queryUser"/>
         <result column="created_at" property="createdAt"/>
         <result column="query_type" property="queryType"/>
         <result column="query_type_back" property="queryTypeBack"/>
@@ -40,4 +40,4 @@
         <result column="query_opt_mode" property="queryOptMode"/>
     </resultMap>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/launchers/chat/pom.xml b/launchers/chat/pom.xml
index 001d98fb0..10f396b7d 100644
--- a/launchers/chat/pom.xml
+++ b/launchers/chat/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>launchers-chat</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <start-class>com.tencent.supersonic.ChatLauncher</start-class>
 
     </properties>
diff --git a/launchers/common/pom.xml b/launchers/common/pom.xml
index 235d6586a..b3a52d5f9 100644
--- a/launchers/common/pom.xml
+++ b/launchers/common/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>launchers-common</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -46,4 +46,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/launchers/common/src/main/java/com/tencent/supersonic/config/RestTemplateConfig.java b/launchers/common/src/main/java/com/tencent/supersonic/config/RestTemplateConfig.java
index b9c51b9d1..cd863c5a1 100644
--- a/launchers/common/src/main/java/com/tencent/supersonic/config/RestTemplateConfig.java
+++ b/launchers/common/src/main/java/com/tencent/supersonic/config/RestTemplateConfig.java
@@ -1,8 +1,10 @@
 package com.tencent.supersonic.config;
 
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.LaxRedirectStrategy;
+
+
+import org.apache.hc.client5.http.impl.LaxRedirectStrategy;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -16,14 +18,19 @@ public class RestTemplateConfig {
 
     @Bean
     public RestTemplate restTemplate() {
+
+        // HttpClient 5 较新版本才会有LaxRedirectStrategy, 所以我重新定义了
+        CloseableHttpClient httpClient =
+                // HttpClientBuilder.create().setRedirectStrategy(new DefaultRedirectStrategy()) //
+                // 使用宽松重定向策略
+                HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()) // 使用宽松重定向策略
+                        .build();
+
         HttpComponentsClientHttpRequestFactory httpRequestFactory =
-                new HttpComponentsClientHttpRequestFactory();
+                new HttpComponentsClientHttpRequestFactory(httpClient);
         httpRequestFactory.setConnectionRequestTimeout(2000);
         httpRequestFactory.setConnectTimeout(10000);
-        httpRequestFactory.setReadTimeout(7200000);
-        HttpClient httpClient =
-                HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
-        httpRequestFactory.setHttpClient(httpClient);
+
         RestTemplate restTemplate = new RestTemplate(httpRequestFactory);
         restTemplate.getMessageConverters().set(1,
                 new StringHttpMessageConverter(StandardCharsets.UTF_8));
diff --git a/launchers/common/src/main/java/com/tencent/supersonic/web/ErrorPageConfig.java b/launchers/common/src/main/java/com/tencent/supersonic/web/ErrorPageConfig.java
index ed25ff189..a300cc549 100644
--- a/launchers/common/src/main/java/com/tencent/supersonic/web/ErrorPageConfig.java
+++ b/launchers/common/src/main/java/com/tencent/supersonic/web/ErrorPageConfig.java
@@ -1,18 +1,43 @@
 package com.tencent.supersonic.web;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.ErrorPageRegistrar;
 import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.core.Ordered;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 
 /** error page config */
 @Component
-public class ErrorPageConfig implements ErrorPageRegistrar {
+public class ErrorPageConfig implements ErrorPageRegistrar, HandlerExceptionResolver, Ordered {
 
     @Override
     public void registerErrorPages(ErrorPageRegistry registry) {
         ErrorPage error404Page = new ErrorPage(HttpStatus.NOT_FOUND, "/webapp/index.html");
         registry.addErrorPages(error404Page);
     }
+
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE;
+    }
+
+    @Override
+    public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response,
+            Object handler, Exception ex) {
+        if (handler instanceof ResourceHttpRequestHandler
+                && ex instanceof NoResourceFoundException) {
+            ModelAndView modelAndView = new ModelAndView("/webapp/index.html");
+            response.setStatus(HttpStatus.OK.value());
+            return modelAndView;
+        }
+
+        return null;
+    }
 }
diff --git a/launchers/common/src/main/java/com/tencent/supersonic/web/WebConfig.java b/launchers/common/src/main/java/com/tencent/supersonic/web/WebConfig.java
index b6cf5fde1..18a0d6b68 100644
--- a/launchers/common/src/main/java/com/tencent/supersonic/web/WebConfig.java
+++ b/launchers/common/src/main/java/com/tencent/supersonic/web/WebConfig.java
@@ -3,18 +3,20 @@ package com.tencent.supersonic.web;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebConfig extends WebMvcConfigurerAdapter {
+public class WebConfig implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/webapp/**").addResourceLocations("classpath:/webapp/");
+
+        registry.addResourceHandler("/favicon.ico").addResourceLocations("classpath:/webapp/");
     }
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/").setViewName("forward:webapp/index.html");
+        registry.addViewController("/").setViewName("forward:/webapp/index.html");
     }
 }
diff --git a/launchers/standalone/pom.xml b/launchers/standalone/pom.xml
index 885bbe67d..7ca39e04a 100644
--- a/launchers/standalone/pom.xml
+++ b/launchers/standalone/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>launchers-standalone</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <start-class>com.tencent.supersonic.StandaloneLauncher</start-class>
     </properties>
     <dependencies>
@@ -121,6 +121,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/launchers/standalone/src/main/resources/db/schema-h2-demo.sql b/launchers/standalone/src/main/resources/db/schema-h2-demo.sql
index 97122299a..a2630dad6 100644
--- a/launchers/standalone/src/main/resources/db/schema-h2-demo.sql
+++ b/launchers/standalone/src/main/resources/db/schema-h2-demo.sql
@@ -50,8 +50,8 @@ CREATE TABLE IF NOT EXISTS `company` (
     `company_established_time` varchar(20) NOT NULL ,
     `founder` varchar(20) NOT NULL ,
     `ceo` varchar(20) NOT NULL ,
-    `annual_turnover` bigint(15)  ,
-    `employee_count` int(7) ,
+    `annual_turnover` bigint  ,
+    `employee_count` int ,
     PRIMARY KEY (`company_id`)
     );
 
@@ -61,15 +61,15 @@ CREATE TABLE IF NOT EXISTS `brand` (
     `brand_established_time` varchar(20) NOT NULL ,
     `company_id` varchar(50) NOT NULL ,
     `legal_representative` varchar(20) NOT NULL ,
-    `registered_capital` bigint(15)  ,
+    `registered_capital` bigint  ,
     PRIMARY KEY (`brand_id`)
     );
 
 CREATE TABLE IF NOT EXISTS `brand_revenue` (
     `year_time` varchar(10) NOT NULL ,
     `brand_id` varchar(50) NOT NULL ,
-    `revenue` bigint(15) NOT NULL,
-    `profit` bigint(15) NOT NULL ,
+    `revenue` bigint NOT NULL,
+    `profit` bigint NOT NULL ,
     `revenue_growth_year_on_year` double NOT NULL ,
     `profit_growth_year_on_year` double NOT NULL
     );
diff --git a/launchers/standalone/src/main/resources/db/schema-h2.sql b/launchers/standalone/src/main/resources/db/schema-h2.sql
index e3fa309e1..f8b3a9395 100644
--- a/launchers/standalone/src/main/resources/db/schema-h2.sql
+++ b/launchers/standalone/src/main/resources/db/schema-h2.sql
@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_query`
     `create_time`       TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     `query_text`          mediumtext,
     `user_name`         varchar(150)  DEFAULT NULL COMMENT '',
-    `query_state`             int(1) DEFAULT NULL,
+    `query_state`             int DEFAULT NULL,
     `chat_id`           BIGINT NOT NULL , -- context chat id
     `query_result` mediumtext NOT NULL ,
     `score`             int DEFAULT '0',
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_statistics`
     `user_name`         varchar(150)  DEFAULT NULL COMMENT '',
     `query_text`          varchar(200),
     `interface_name`         varchar(100)  DEFAULT NULL COMMENT '',
-    `cost` INT(6) NOT NULL ,
+    `cost` INT NOT NULL ,
     `type` INT NOT NULL ,
     `create_time`       TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 );
diff --git a/pom.xml b/pom.xml
index 81c9d17f5..57ffc7955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,25 +22,23 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.2</version>
+        <version>3.2.4</version>
     </parent>
 
     <properties>
         <revision>0.9.10-SNAPSHOT</revision>
-        <java.source.version>1.8</java.source.version>
-        <java.target.version>1.8</java.target.version>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <java.source.version>21</java.source.version>
+        <java.target.version>21</java.target.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <file.encoding>UTF-8</file.encoding>
         <jsqlparser.version>4.7</jsqlparser.version>
         <pagehelper.version>6.1.0</pagehelper.version>
         <pagehelper.spring.version>2.1.0</pagehelper.spring.version>
         <mybatis.version>3.5.3</mybatis.version>
-        <lombok.version>1.18.30</lombok.version>
         <guava.version>32.0.0-jre</guava.version>
         <hanlp.version>portable-1.8.3</hanlp.version>
         <hadoop.version>2.7.2</hadoop.version>
-        <jackson.version>2.11.2</jackson.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.lang3.version>3.7</commons.lang3.version>
         <org.testng.version>6.13.1</org.testng.version>
@@ -50,11 +48,13 @@
         <alibaba.druid.version>1.2.24</alibaba.druid.version>
         <mysql.connector.java.version>5.1.46</mysql.connector.java.version>
         <mybatis.plus.version>3.5.7</mybatis.plus.version>
+        <httpclient5.version>5.4.1</httpclient5.version>
+<!--        <httpcore.version>4.4.16</httpcore.version>-->
+        <httpcore5.version>5.3.1</httpcore5.version>
         <clickhouse.jdbc.version>0.4.6</clickhouse.jdbc.version>
-        <h2.version>1.4.200</h2.version>
         <fastjson.version>2.0.40</fastjson.version>
         <dozer.verson>7.0.0</dozer.verson>
-        <httpmime.version>4.5.6</httpmime.version>
+<!--        <httpmime.version>4.5.6</httpmime.version>-->
         <transmittable.version>2.12.1</transmittable.version>
         <commons.compress.version>1.26.0</commons.compress.version>
         <jetty.util.version>6.1.26</jetty.util.version>
@@ -68,7 +68,7 @@
         <poi.version>3.17</poi.version>
         <langchain4j.version>0.34.0</langchain4j.version>
         <langchain4j.embedding.version>0.27.1</langchain4j.embedding.version>
-        <postgresql.version>42.7.1</postgresql.version>
+<!--        <postgresql.version>42.7.1</postgresql.version>-->
         <st.version>4.0.8</st.version>
         <duckdb_jdbc.version>0.10.0</duckdb_jdbc.version>
         <flight-sql.version>15.0.2</flight-sql.version>
@@ -197,6 +197,16 @@
                 <artifactId>stax2-api</artifactId>
                 <version>${stax2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.connector.java.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-inline</artifactId>
+                <version>${mockito-inline.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>