[release]Release v0.9.8.

[improvement][headless] Determine if the SQL is supported by agg for more complex scenarios (#1872 )
(improvement)(knowledge) support DimValueAliasReq single (#1871 )
2025-12-10 19:51:00 +00:00 · 2024-11-01 22:40:22 +08:00 · 2024-11-01 10:37:26 +08:00 · 2024-10-31 23:52:31 +08:00 · 2024-10-31 22:46:46 +08:00 · 2024-10-31 21:48:40 +08:00
1213 changed files with 37146 additions and 30145 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@
 - "Breaking Changes" describes any changes that may break existing functionality or cause
  compatibility issues with previous versions.

+## SuperSonic [0.9.8] - 2024-11-01
+- Add LLM management module to reuse connection across agents.
+- Add ChatAPP configuration sub-module in Agent Management.
+- Add dimension value management sub-module.
+- Enhance memory management and term management sub-module.
+- Support semantic translation of complex S2SQL.
+- Introduce LLM-based semantic corrector and data interpreter.
+- Introduce new experience in Chat UI.
+
 ## SuperSonic [0.9.2] - 2024-06-01

 ### Added
--- a/21
+++ b/21
@@ -1,3 +1,23 @@
+SuperSonic is licensed under the MIT License, with the following additional conditions:
+
+1. You may provide SuperSonic to third parties as a commercial software or service. However,
+   when the following conditions are met, you must contact the producer to obtain a commercial license:
+
+a. Multi-tenant SaaS service: Unless explicitly authorized by SuperSonic in writing, you may not use the
+   SuperSonic source code to operate a multi-tenant SaaS service.
+b. LOGO and copyright information: In the process of using SuperSonic, you may not remove or modify
+   the LOGO or copyright information on the SuperSonic UI. This restriction is inapplicable to uses of
+   SuperSonic that do not involve its frontend components.
+
+Please contact jerryjzhang@tencent.com by email to inquire about licensing matters.
+
+2. As a contributor, you should agree that:
+
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+b. Your contributed code may be used for commercial purposes, including but not limited to its business operations.
+
+Terms of the MIT License:
+--------------------------------------------------------------------
 MIT License

 Copyright (c) 2023 Tencent Music Entertainment
@@ -20,6 +40,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

+END OF TERMS AND CONDITIONS


 Other dependencies and licenses:
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # SuperSonic

-SuperSonic is the next-generation BI platform that integrates **Chat BI** (powered by LLM) and **Headless BI** (powered by semantic layer) paradigms. This integration ensures that Chat BI has access to the same curated and governed semantic data models as traditional BI. Furthermore, the implementation of both paradigms benefits from the integration: 
+SuperSonic is the next-generation BI platform that unifies **Chat BI** (powered by LLM) and **Headless BI** (powered by semantic layer) paradigms. This unification ensures that Chat BI has access to the same curated and governed semantic data models as traditional BI. Furthermore, the implementation of both paradigms benefit from each other:

 - Chat BI's Text2SQL gets augmented with context-retrieval from semantic models.
 - Headless BI's query interface gets extended with natural language API.
@@ -46,9 +46,9 @@ The high-level architecture and main process flow is as follows:

 - **Schema Mapper:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against the knowledge base.

- **Semantic Parser:** understands user queries and generates semantic query statement. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
+- **Semantic Parser:** understands user queries and generates semantic query statement. It consists of a combination of rule-based and LLM-based parsers, each of which deals with specific scenarios.

- **Semantic Corrector:** checks validity of semantic query statement and performs correction and optimization if needed.
+- **Semantic Corrector:** checks validity of semantic query statement and performs correction if necessary. It consists of a combination of rule-based and LLM-based correctors, each of which deals with specific scenarios.

 - **Semantic Translator:** converts semantic query statement into SQL statement that can be executed against physical data models.

--- a/assembly/bin/supersonic-build.bat
+++ b/assembly/bin/supersonic-build.bat
@@ -40,7 +40,7 @@ if "%service%"=="webapp" (
 :buildJavaService
   set "model_name=%service%"
   echo "starting building supersonic-%model_name% service"
-   call mvn -f %projectDir% clean package -DskipTests
+   call mvn -f %projectDir% clean package -DskipTests -Dspotless.skip=true
   IF ERRORLEVEL 1 (
      ECHO Failed to build backend Java modules.
      EXIT /B 1
--- a/assembly/bin/supersonic-build.sh
+++ b/assembly/bin/supersonic-build.sh
@@ -15,7 +15,7 @@ fi
 function buildJavaService {
  model_name=$1
  echo "starting building supersonic-${model_name} service"
-  mvn -f $projectDir clean package -DskipTests
+  mvn -f $projectDir clean package -DskipTests -Dspotless.skip=true
  if [ $? -ne 0 ]; then
      echo "Failed to build backend Java modules."
      exit 1
--- 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,16 +1,16 @@
 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.User;
+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 java.util.List;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;

-/**
- * UserAdaptor defines some interfaces for obtaining user and organization information
- */
+/** UserAdaptor defines some interfaces for obtaining user and organization information */
 public interface UserAdaptor {

    List<String> getUserNames();
@@ -28,4 +28,16 @@ public interface UserAdaptor {
    List<User> getUserByOrg(String key);

    Set<String> getUserAllOrgId(String userName);
+
+    String getPassword(String userName);
+
+    void resetPassword(String userName, String password, String newPassword);
+
+    UserToken generateToken(String name, String userName, long expireTime);
+
+    void deleteUserToken(Long id);
+
+    UserToken getUserToken(Long id);
+
+    List<UserToken> getUserTokens(String userName);
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/annotation/AuthenticationIgnore.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/annotation/AuthenticationIgnore.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.auth.api.authentication.annotation;

-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -9,5 +8,4 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
 public @interface AuthenticationIgnore {
-
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.auth.api.authentication.config;

-
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -48,8 +47,7 @@ public class AuthenticationConfig {
    private Long tokenTimeout;

    public Map<String, String> getAppKeyToSecretMap() {
-        return Arrays.stream(this.tokenAppSecret.split(","))
-                .map(s -> s.split(":"))
+        return Arrays.stream(this.tokenAppSecret.split(",")).map(s -> s.split(":"))
                .collect(Collectors.toMap(e -> e[0].trim(), e -> e[1].trim()));
    }
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/constant/UserConstants.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/constant/UserConstants.java
@@ -17,5 +17,4 @@ public class UserConstants {

    public static final String TOKEN_PREFIX = "Bearer";
    public static final String INTERNAL = "internal";
-
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/Organization.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/Organization.java
@@ -23,5 +23,4 @@ public class Organization {
    private List<Organization> subOrganizations = Lists.newArrayList();

    private boolean isRoot;
-
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserToken.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserToken.java
@@ -0,0 +1,20 @@
+package com.tencent.supersonic.auth.api.authentication.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserToken {
+    private Integer id;
+    private String name;
+    private String userName;
+    private String token;
+    private Long expireTime;
+    private Date createDate;
+    private Date expireDate;
+}
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java
@@ -1,7 +1,19 @@
 package com.tencent.supersonic.auth.api.authentication.pojo;

+import com.tencent.supersonic.common.pojo.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD;

@Data
@AllArgsConstructor
@@ -9,14 +21,26 @@ public class UserWithPassword extends User {

    private String password;

-    public UserWithPassword(Long id, String name, String displayName, String email, String password, Integer isAdmin) {
+    public UserWithPassword(Long id, String name, String displayName, String email, String password,
+            Integer isAdmin) {
        super(id, name, displayName, email, isAdmin);
        this.password = password;
    }

-    public static UserWithPassword get(Long id, String name, String displayName,
-                                       String email, String password, Integer isAdmin) {
+    public static UserWithPassword get(Long id, String name, String displayName, String email,
+            String password, Integer isAdmin) {
        return new UserWithPassword(id, name, displayName, email, password, isAdmin);
    }

+    public static Map<String, Object> convert(UserWithPassword user) {
+        Map<String, Object> claims = new HashMap<>(5);
+        claims.put(TOKEN_USER_ID, user.getId());
+        claims.put(TOKEN_USER_NAME, StringUtils.isEmpty(user.getName()) ? "" : user.getName());
+        claims.put(TOKEN_USER_PASSWORD,
+                StringUtils.isEmpty(user.getPassword()) ? "" : user.getPassword());
+        claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName());
+        claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
+        claims.put(TOKEN_IS_ADMIN, user.getIsAdmin());
+        return claims;
+    }
 }
--- 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 lombok.Data;

@Data
@@ -12,6 +12,4 @@ public class UserReq {

    @NotBlank(message = "password can not be null")
    private String password;
-
-
 }
--- 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
@@ -0,0 +1,15 @@
+package com.tencent.supersonic.auth.api.authentication.request;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Data;
+
+@Data
+public class UserTokenReq {
+    @NotBlank(message = "name can not be null")
+    private String name;
+
+    @NotBlank(message = "expireTime can not be null")
+    private long expireTime;
+
+}
--- 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,17 +1,20 @@
 package com.tencent.supersonic.auth.api.authentication.service;

-import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.auth.api.authentication.request.UserReq;
-
 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 java.util.List;
 import java.util.Set;

 public interface UserService {

-    User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse);
+    User getCurrentUser(HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse);

    List<String> getUserNames();

@@ -28,4 +31,16 @@ public interface UserService {
    List<User> getUserByOrg(String key);

    List<Organization> getOrganizationTree();
+
+    String getPassword(String userName);
+
+    void resetPassword(String userName, String password, String newPassword);
+
+    UserToken generateToken(String name, String userName, long expireTime);
+
+    List<UserToken> getUserTokens(String userName);
+
+    UserToken getUserToken(Long id);
+
+    void deleteUserToken(Long id);
 }
--- 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,10 +1,10 @@
 package com.tencent.supersonic.auth.api.authentication.service;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.tencent.supersonic.common.pojo.User;
+
 public interface UserStrategy {

    boolean accept(boolean isEnableAuthentication);
@@ -12,5 +12,4 @@ public interface UserStrategy {
    User findUser(HttpServletRequest request, HttpServletResponse response);

    User findUser(String token, String appKey);
-
 }
--- 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,12 +1,13 @@
 package com.tencent.supersonic.auth.api.authentication.utils;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.common.config.SystemConfig;
-import com.tencent.supersonic.common.service.SystemConfigService;
-import com.tencent.supersonic.common.util.ContextUtils;
 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 org.springframework.util.CollectionUtils;

 public final class UserHolder {
@@ -36,5 +37,4 @@ public final class UserHolder {
        }
        return user;
    }
-
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthGroup.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthGroup.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.auth.api.authorization.pojo;

-import java.util.List;
 import lombok.Data;

+import java.util.List;
+
@Data
 public class AuthGroup {

@@ -10,18 +11,12 @@ public class AuthGroup {
    private String name;
    private Integer groupId;
    private List<AuthRule> authRules;
-    /**
-     * row permission expression
-     */
+    /** row permission expression */
    private List<String> dimensionFilters;
-    /**
-     * row permission expression description information
-     */
+    /** row permission expression description information */
    private String dimensionFilterDescription;

    private List<String> authorizedUsers;
-    /**
-     * authorization Department Id
-     */
+    /** authorization Department Id */
    private List<String> authorizedDepartmentIds;
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthRes.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthRes.java
@@ -10,8 +10,7 @@ public class AuthRes {
    private Long modelId;
    private String name;

-    public AuthRes() {
-    }
+    public AuthRes() {}

    public AuthRes(Long modelId, String name) {
        this.modelId = modelId;
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthRule.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthRule.java
@@ -1,9 +1,10 @@
 package com.tencent.supersonic.auth.api.authorization.pojo;

+import lombok.Data;
+
 import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;

@Data
 public class AuthRule {
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/DimensionFilter.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/DimensionFilter.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.auth.api.authorization.pojo;

+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;

@Data
 public class DimensionFilter {
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/AddUsersToGroupReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/AddUsersToGroupReq.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.auth.api.authorization.request;

-import java.util.List;
 import lombok.Data;

+import java.util.List;
+
@Data
 public class AddUsersToGroupReq {

--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/QueryGroupReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/QueryGroupReq.java
@@ -1,10 +1,10 @@
 package com.tencent.supersonic.auth.api.authorization.request;

-
 import com.tencent.supersonic.common.pojo.PageBaseReq;
-import java.util.List;
 import lombok.Data;

+import java.util.List;
+
@Data
 public class QueryGroupReq extends PageBaseReq {

--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/RemoveGroupReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/RemoveGroupReq.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.auth.api.authorization.request;

-import java.util.List;
 import lombok.Data;

+import java.util.List;
+
@Data
 public class RemoveGroupReq {

--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/RemoveUsersFromGroupReq.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/RemoveUsersFromGroupReq.java
@@ -1,8 +1,9 @@
 package com.tencent.supersonic.auth.api.authorization.request;

-import java.util.List;
 import lombok.Data;

+import java.util.List;
+
@Data
 public class RemoveUsersFromGroupReq {

--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java
@@ -1,9 +1,10 @@
 package com.tencent.supersonic.auth.api.authorization.service;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
 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.common.pojo.User;
+
 import java.util.List;

 public interface AuthService {
--- 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,22 +1,26 @@
 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;
 import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.auth.api.authentication.pojo.UserToken;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO;
 import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+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.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.ContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;

@@ -49,14 +53,14 @@ public class DefaultUserAdaptor implements UserAdaptor {

    @Override
    public List<Organization> getOrganizationTree() {
-        Organization superSonic = new Organization("1", "0",
-                "SuperSonic", "SuperSonic", Lists.newArrayList(), true);
-        Organization hr = new Organization("2", "1",
-                "Hr", "SuperSonic/Hr", Lists.newArrayList(), false);
-        Organization sales = new Organization("3", "1",
-                "Sales", "SuperSonic/Sales", Lists.newArrayList(), false);
-        Organization marketing = new Organization("4", "1",
-                "Marketing", "SuperSonic/Marketing", Lists.newArrayList(), false);
+        Organization superSonic =
+                new Organization("1", "0", "SuperSonic", "SuperSonic", Lists.newArrayList(), true);
+        Organization hr =
+                new Organization("2", "1", "Hr", "SuperSonic/Hr", Lists.newArrayList(), false);
+        Organization sales = new Organization("3", "1", "Sales", "SuperSonic/Sales",
+                Lists.newArrayList(), false);
+        Organization marketing = new Organization("4", "1", "Marketing", "SuperSonic/Marketing",
+                Lists.newArrayList(), false);
        List<Organization> subOrganization = Lists.newArrayList(hr, sales, marketing);
        superSonic.setSubOrganizations(subOrganization);
        return Lists.newArrayList(superSonic);
@@ -89,23 +93,85 @@ public class DefaultUserAdaptor implements UserAdaptor {

    @Override
    public String login(UserReq userReq, HttpServletRequest request) {
-        UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
-        String appKey = userTokenUtils.getAppKey(request);
+        TokenService tokenService = ContextUtils.getBean(TokenService.class);
+        String appKey = tokenService.getAppKey(request);
        return login(userReq, appKey);
    }

    @Override
    public String login(UserReq userReq, String appKey) {
-        UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
+        TokenService tokenService = ContextUtils.getBean(TokenService.class);
        try {
            UserWithPassword user = getUserWithPassword(userReq);
-            return userTokenUtils.generateToken(user, appKey);
+            return tokenService.generateToken(UserWithPassword.convert(user), appKey);
        } catch (Exception e) {
            log.error("", e);
            throw new RuntimeException("password encrypt error, please try again");
        }
    }

+    @Override
+    public String getPassword(String userName) {
+        UserDO userDO = getUser(userName);
+        if (userDO == null) {
+            throw new RuntimeException("user not exist,please register");
+        }
+        return userDO.getPassword();
+    }
+
+    @Override
+    public void resetPassword(String userName, String password, String newPassword) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        Optional<UserDO> userDOOptional = Optional.ofNullable(getUser(userName));
+
+        UserDO userDO = userDOOptional
+                .orElseThrow(() -> new RuntimeException("User does not exist, please register"));
+
+        try {
+            validateOldPassword(userDO, password);
+            updatePassword(userDO, newPassword, userRepository);
+        } catch (PasswordEncryptionException e) {
+            throw new RuntimeException("Password encryption error, please try again", e);
+        }
+    }
+
+
+    private void validateOldPassword(UserDO userDO, String password)
+            throws PasswordEncryptionException {
+        String oldPassword = encryptPassword(password, userDO.getSalt());
+        if (!userDO.getPassword().equals(oldPassword)) {
+            throw new RuntimeException("Old password is not correct, please try again");
+        }
+    }
+
+    private void updatePassword(UserDO userDO, String newPassword, UserRepository userRepository)
+            throws PasswordEncryptionException {
+        try {
+            byte[] salt = AESEncryptionUtil.generateSalt(userDO.getName());
+            userDO.setSalt(AESEncryptionUtil.getStringFromBytes(salt));
+            userDO.setPassword(AESEncryptionUtil.encrypt(newPassword, salt));
+            userRepository.updateUser(userDO);
+        } catch (Exception e) {
+            throw new PasswordEncryptionException("Error encrypting password", e);
+        }
+
+    }
+
+    private String encryptPassword(String password, String salt)
+            throws PasswordEncryptionException {
+        try {
+            return AESEncryptionUtil.encrypt(password, AESEncryptionUtil.getBytesFromString(salt));
+        } catch (Exception e) {
+            throw new PasswordEncryptionException("Error encrypting password", e);
+        }
+    }
+
+    public static class PasswordEncryptionException extends Exception {
+        public PasswordEncryptionException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
    private UserWithPassword getUserWithPassword(UserReq userReq) {
        UserDO userDO = getUser(userReq.getName());
        if (userDO == null) {
@@ -115,8 +181,9 @@ public class DefaultUserAdaptor implements UserAdaptor {
            String password = AESEncryptionUtil.encrypt(userReq.getPassword(),
                    AESEncryptionUtil.getBytesFromString(userDO.getSalt()));
            if (userDO.getPassword().equals(password)) {
-                UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
-                        userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
+                UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(),
+                        userDO.getDisplayName(), userDO.getEmail(), userDO.getPassword(),
+                        userDO.getIsAdmin());
                return user;
            } else {
                throw new RuntimeException("password not correct, please try again");
@@ -136,4 +203,69 @@ public class DefaultUserAdaptor implements UserAdaptor {
        return Sets.newHashSet();
    }

-}
+    @Override
+    public UserToken generateToken(String name, String userName, long expireTime) {
+        TokenService tokenService = ContextUtils.getBean(TokenService.class);
+        UserDO userDO = getUser(userName);
+        if (userDO == null) {
+            throw new RuntimeException("user not exist,please register");
+        }
+        UserWithPassword userWithPassword =
+                new UserWithPassword(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
+                        userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
+
+        String token =
+                tokenService.generateToken(UserWithPassword.convert(userWithPassword), expireTime);
+        UserTokenDO userTokenDO = saveUserToken(name, userName, token, expireTime);
+        return convertUserToken(userTokenDO);
+    }
+
+    @Override
+    public void deleteUserToken(Long id) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        userRepository.deleteUserToken(id);
+    }
+
+    @Override
+    public UserToken getUserToken(Long id) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        return convertUserToken(userRepository.getUserToken(id));
+    }
+
+    @Override
+    public List<UserToken> getUserTokens(String userName) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        List<UserToken> userTokens = userRepository.getUserTokenListByName(userName).stream()
+                .map(this::convertUserToken).collect(Collectors.toList());
+        return userTokens;
+    }
+
+    private UserTokenDO saveUserToken(String tokenName, String userName, String token,
+            long expireTime) {
+        UserTokenDO userTokenDO = new UserTokenDO();
+        userTokenDO.setName(tokenName);
+        userTokenDO.setUserName(userName);
+        userTokenDO.setToken(token);
+        userTokenDO.setExpireTime(expireTime);
+        userTokenDO.setCreateTime(new java.util.Date());
+        userTokenDO.setCreateBy(userName);
+        userTokenDO.setUpdateBy(userName);
+        userTokenDO.setExpireDateTime(new java.util.Date(System.currentTimeMillis() + expireTime));
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        userRepository.addUserToken(userTokenDO);
+
+        return userTokenDO;
+    }
+
+    private UserToken convertUserToken(UserTokenDO userTokenDO) {
+        UserToken userToken = new UserToken();
+        userToken.setId(userTokenDO.getId());
+        userToken.setName(userTokenDO.getName());
+        userToken.setUserName(userTokenDO.getUserName());
+        userToken.setToken(userTokenDO.getToken());
+        userToken.setExpireTime(userTokenDO.getExpireTime());
+        userToken.setCreateDate(userTokenDO.getCreateTime());
+        userToken.setExpireDate(userTokenDO.getExpireDateTime());
+        return userToken;
+    }
+}
--- 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,9 +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.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.utils.TokenService;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.connector.RequestFacade;
@@ -13,7 +15,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerInterceptor;

-import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
@@ -21,13 +22,11 @@ import java.util.List;
@Slf4j
 public abstract class AuthenticationInterceptor implements HandlerInterceptor {

-
    protected AuthenticationConfig authenticationConfig;

    protected UserServiceImpl userServiceImpl;

-    protected UserTokenUtils userTokenUtils;
-
+    protected TokenService tokenService;

    protected S2ThreadContext s2ThreadContext;

@@ -69,7 +68,8 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
        try {
            if (request instanceof StandardMultipartHttpServletRequest) {
                RequestFacade servletRequest =
-                        (RequestFacade) ((StandardMultipartHttpServletRequest) request).getRequest();
+                        (RequestFacade) ((StandardMultipartHttpServletRequest) request)
+                                .getRequest();
                Class<? extends HttpServletRequest> servletRequestClazz = servletRequest.getClass();
                Field request1 = servletRequestClazz.getDeclaredField("request");
                request1.setAccessible(true);
--- 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,32 +1,41 @@
 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.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
 import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
-import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.utils.TokenService;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.exception.AccessException;
 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 lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.method.HandlerMethod;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
 import java.lang.reflect.Method;
+import java.util.Optional;
+
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_EMAIL;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD;

@Slf4j
 public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor {

    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-            throws AccessException {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
+            Object handler) throws AccessException {
        authenticationConfig = ContextUtils.getBean(AuthenticationConfig.class);
        userServiceImpl = ContextUtils.getBean(UserServiceImpl.class);
-        userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
+        tokenService = ContextUtils.getBean(TokenService.class);
        s2ThreadContext = ContextUtils.getBean(S2ThreadContext.class);
        if (!authenticationConfig.isEnabled()) {
            setFakerUser(request);
@@ -58,8 +67,8 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
            return true;
        }

-        UserWithPassword user = userTokenUtils.getUserWithPassword(request);
-        if (StringUtils.isNotBlank(user.getName())) {
+        UserWithPassword user = getUserWithPassword(request);
+        if (user != null) {
            setContext(user.getName(), request);
            return true;
        }
@@ -67,17 +76,41 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
    }

    private void setFakerUser(HttpServletRequest request) {
-        String token = userTokenUtils.generateAdminToken(request);
+        String token = generateAdminToken(request);
        reflectSetParam(request, authenticationConfig.getTokenHttpHeaderKey(), token);
-        setContext(User.getFakeUser().getName(), request);
+        setContext(User.getDefaultUser().getName(), request);
    }

    private void setContext(String userName, HttpServletRequest request) {
        ThreadContext threadContext = ThreadContext.builder()
                .token(request.getHeader(authenticationConfig.getTokenHttpHeaderKey()))
-                .userName(userName)
-                .build();
+                .userName(userName).build();
        s2ThreadContext.set(threadContext);
    }

+    public String generateAdminToken(HttpServletRequest request) {
+        UserWithPassword admin = new UserWithPassword("admin");
+        admin.setId(1L);
+        admin.setName("admin");
+        admin.setPassword("c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT");
+        admin.setDisplayName("admin");
+        admin.setIsAdmin(1);
+        return tokenService.generateToken(UserWithPassword.convert(admin), request);
+    }
+
+    public UserWithPassword getUserWithPassword(HttpServletRequest request) {
+        final Optional<Claims> claimsOptional = tokenService.getClaims(request);
+        if (!claimsOptional.isPresent()) {
+            return null;
+        }
+        Claims claims = claimsOptional.get();
+        Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
+        String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
+        String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
+        String displayName = String.valueOf(claims.get(TOKEN_USER_DISPLAY_NAME));
+        String password = String.valueOf(claims.get(TOKEN_USER_PASSWORD));
+        Integer isAdmin = claims.get(TOKEN_IS_ADMIN) == null ? 0
+                : Integer.parseInt(claims.get(TOKEN_IS_ADMIN).toString());
+        return UserWithPassword.get(userId, userName, displayName, email, password, isAdmin);
+    }
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/InterceptorFactory.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/InterceptorFactory.java
@@ -10,12 +10,11 @@ import java.util.List;
@Configuration
 public class InterceptorFactory implements WebMvcConfigurer {

-
    private List<AuthenticationInterceptor> authenticationInterceptors;

    public InterceptorFactory() {
-        authenticationInterceptors = SpringFactoriesLoader.loadFactories(AuthenticationInterceptor.class,
-                Thread.currentThread().getContextClassLoader());
+        authenticationInterceptors = SpringFactoriesLoader.loadFactories(
+                AuthenticationInterceptor.class, Thread.currentThread().getContextClassLoader());
    }

    @Override
@@ -25,5 +24,4 @@ public class InterceptorFactory implements WebMvcConfigurer {
                    .excludePathPatterns("/", "/webapp/**", "/error");
        }
    }
-
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java
@@ -1,82 +1,52 @@
 package com.tencent.supersonic.auth.authentication.persistence.dataobject;

 public class UserDO {
-    /**
-     * 
-     */
+    /** */
    private Long id;

-    /**
-     * 
-     */
+    /** */
    private String name;

-    /**
-     * 
-     */
+    /** */
    private String password;

    private String salt;

-    /**
-     * 
-     */
+    /** */
    private String displayName;

-    /**
-     * 
-     */
+    /** */
    private String email;

-    /**
-     * 
-     */
+    /** */
    private Integer isAdmin;

-    /**
-     * 
-     * @return id 
-     */
+    /** @return id */
    public Long getId() {
        return id;
    }

-    /**
-     * 
-     * @param id 
-     */
+    /** @param id */
    public void setId(Long id) {
        this.id = id;
    }

-    /**
-     * 
-     * @return name 
-     */
+    /** @return name */
    public String getName() {
        return name;
    }

-    /**
-     * 
-     * @param name 
-     */
+    /** @param name */
    public void setName(String name) {
        this.name = name == null ? null : name.trim();
    }

-    /**
-     * 
-     * @return password 
-     */
+    /** @return password */
    public String getPassword() {
        return password;
    }

-    /**
-     * 
-     * @param password 
-     */
+    /** @param password */
    public void setPassword(String password) {
        this.password = password == null ? null : password.trim();
    }
@@ -89,51 +59,33 @@ public class UserDO {
        this.salt = salt == null ? null : salt.trim();
    }

-    /**
-     * 
-     * @return display_name 
-     */
+    /** @return display_name */
    public String getDisplayName() {
        return displayName;
    }

-    /**
-     * 
-     * @param displayName 
-     */
+    /** @param displayName */
    public void setDisplayName(String displayName) {
        this.displayName = displayName == null ? null : displayName.trim();
    }

-    /**
-     * 
-     * @return email 
-     */
+    /** @return email */
    public String getEmail() {
        return email;
    }

-    /**
-     * 
-     * @param email 
-     */
+    /** @param email */
    public void setEmail(String email) {
        this.email = email == null ? null : email.trim();
    }

-    /**
-     * 
-     * @return is_admin 
-     */
+    /** @return is_admin */
    public Integer getIsAdmin() {
        return isAdmin;
    }

-    /**
-     * 
-     * @param isAdmin 
-     */
+    /** @param isAdmin */
    public void setIsAdmin(Integer isAdmin) {
        this.isAdmin = isAdmin;
    }
-}
+}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDOExample.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDOExample.java
@@ -4,101 +4,64 @@ import java.util.ArrayList;
 import java.util.List;

 public class UserDOExample {
-    /**
-     * s2_user
-     */
+    /** s2_user */
    protected String orderByClause;

-    /**
-     * s2_user
-     */
+    /** s2_user */
    protected boolean distinct;

-    /**
-     * s2_user
-     */
+    /** s2_user */
    protected List<Criteria> oredCriteria;

-    /**
-     * s2_user
-     */
+    /** s2_user */
    protected Integer limitStart;

-    /**
-     * s2_user
-     */
+    /** s2_user */
    protected Integer limitEnd;

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public UserDOExample() {
        oredCriteria = new ArrayList<Criteria>();
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void setOrderByClause(String orderByClause) {
        this.orderByClause = orderByClause;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public String getOrderByClause() {
        return orderByClause;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void setDistinct(boolean distinct) {
        this.distinct = distinct;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public boolean isDistinct() {
        return distinct;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public List<Criteria> getOredCriteria() {
        return oredCriteria;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void or(Criteria criteria) {
        oredCriteria.add(criteria);
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public Criteria or() {
        Criteria criteria = createCriteriaInternal();
        oredCriteria.add(criteria);
        return criteria;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public Criteria createCriteria() {
        Criteria criteria = createCriteriaInternal();
        if (oredCriteria.size() == 0) {
@@ -107,60 +70,40 @@ public class UserDOExample {
        return criteria;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    protected Criteria createCriteriaInternal() {
        Criteria criteria = new Criteria();
        return criteria;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void clear() {
        oredCriteria.clear();
        orderByClause = null;
        distinct = false;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void setLimitStart(Integer limitStart) {
-        this.limitStart=limitStart;
+        this.limitStart = limitStart;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public Integer getLimitStart() {
        return limitStart;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public void setLimitEnd(Integer limitEnd) {
-        this.limitEnd=limitEnd;
+        this.limitEnd = limitEnd;
    }

-    /**
-     *
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    public Integer getLimitEnd() {
        return limitEnd;
    }

-    /**
-     * s2_user null
-     */
+    /** s2_user null */
    protected abstract static class GeneratedCriteria {
        protected List<Criterion> criteria;

@@ -195,7 +138,8 @@ public class UserDOExample {
            criteria.add(new Criterion(condition, value));
        }

-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+        protected void addCriterion(String condition, Object value1, Object value2,
+                String property) {
            if (value1 == null || value2 == null) {
                throw new RuntimeException("Between values for " + property + " cannot be null");
            }
@@ -603,9 +547,7 @@ public class UserDOExample {
        }
    }

-    /**
-     * s2_user
-     */
+    /** s2_user */
    public static class Criteria extends GeneratedCriteria {

        protected Criteria() {
@@ -613,9 +555,7 @@ public class UserDOExample {
        }
    }

-    /**
-     * s2_user null
-     */
+    /** s2_user null */
    public static class Criterion {
        private String condition;

@@ -688,7 +628,8 @@ public class UserDOExample {
            this(condition, value, null);
        }

-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+        protected Criterion(String condition, Object value, Object secondValue,
+                String typeHandler) {
            super();
            this.condition = condition;
            this.value = value;
@@ -701,4 +642,4 @@ public class UserDOExample {
            this(condition, value, secondValue, null);
        }
    }
-}
+}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserTokenDO.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserTokenDO.java
@@ -0,0 +1,25 @@
+package com.tencent.supersonic.auth.authentication.persistence.dataobject;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("s2_user_token")
+public class UserTokenDO {
+    @TableId(type = IdType.AUTO)
+    Integer id;
+    String name;
+    String userName;
+    Long expireTime;
+    String token;
+    String salt;
+    Date createTime;
+    Date updateTime;
+    String createBy;
+    String updateBy;
+    Date expireDateTime;
+}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java
@@ -1,22 +1,19 @@
 package com.tencent.supersonic.auth.authentication.persistence.mapper;

-
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
@Mapper
 public interface UserDOMapper {

-    /**
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    int insert(UserDO record);

-    /**
-     * @mbg.generated
-     */
+    /** @mbg.generated */
    List<UserDO> selectByExample(UserDOExample example);

+    void updateByPrimaryKey(UserDO userDO);
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserTokenDOMapper.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserTokenDOMapper.java
@@ -0,0 +1,11 @@
+package com.tencent.supersonic.auth.authentication.persistence.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserTokenDOMapper extends BaseMapper<UserTokenDO> {
+
+}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java
@@ -1,42 +0,0 @@
-package com.tencent.supersonic.auth.authentication.persistence.repository.impl;
-
-
-import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
-import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
-import com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.stereotype.Component;
-
-@Component
-public class UserRepositoryImpl implements UserRepository {
-
-
-    private UserDOMapper userDOMapper;
-
-
-    public UserRepositoryImpl(UserDOMapper userDOMapper) {
-        this.userDOMapper = userDOMapper;
-    }
-
-    @Override
-    public List<UserDO> getUserList() {
-        return userDOMapper.selectByExample(new UserDOExample());
-    }
-
-    @Override
-    public void addUser(UserDO userDO) {
-        userDOMapper.insert(userDO);
-    }
-
-    @Override
-    public UserDO getUser(String name) {
-        UserDOExample userDOExample = new UserDOExample();
-        userDOExample.createCriteria().andNameEqualTo(name);
-        List<UserDO> userDOS = userDOMapper.selectByExample(userDOExample);
-        Optional<UserDO> userDOOptional = userDOS.stream().findFirst();
-        return userDOOptional.orElse(null);
-    }
-
-}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/UserRepository.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/UserRepository.java
@@ -1,6 +1,8 @@
 package com.tencent.supersonic.auth.authentication.persistence.repository;

 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO;
+
 import java.util.List;

 public interface UserRepository {
@@ -9,5 +11,17 @@ public interface UserRepository {

    void addUser(UserDO userDO);

+    List<UserTokenDO> getUserTokenListByName(String userName);
+
    UserDO getUser(String name);
+
+    void updateUser(UserDO userDO);
+
+    void addUserToken(UserTokenDO userTokenDO);
+
+    UserTokenDO getUserToken(Long tokenId);
+
+    void deleteUserTokenByName(String userName);
+
+    void deleteUserToken(Long tokenId);
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java
@@ -0,0 +1,79 @@
+package com.tencent.supersonic.auth.authentication.persistence.repository.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO;
+import com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper;
+import com.tencent.supersonic.auth.authentication.persistence.mapper.UserTokenDOMapper;
+import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Optional;
+
+@Component
+public class UserRepositoryImpl implements UserRepository {
+
+    private UserDOMapper userDOMapper;
+
+    private UserTokenDOMapper userTokenDOMapper;
+
+    public UserRepositoryImpl(UserDOMapper userDOMapper, UserTokenDOMapper userTokenDOMapper) {
+        this.userDOMapper = userDOMapper;
+        this.userTokenDOMapper = userTokenDOMapper;
+    }
+
+    @Override
+    public List<UserDO> getUserList() {
+        return userDOMapper.selectByExample(new UserDOExample());
+    }
+
+    @Override
+    public void updateUser(UserDO userDO) {
+        userDOMapper.updateByPrimaryKey(userDO);
+    }
+
+    @Override
+    public void addUser(UserDO userDO) {
+        userDOMapper.insert(userDO);
+    }
+
+    @Override
+    public UserDO getUser(String name) {
+        UserDOExample userDOExample = new UserDOExample();
+        userDOExample.createCriteria().andNameEqualTo(name);
+        List<UserDO> userDOS = userDOMapper.selectByExample(userDOExample);
+        Optional<UserDO> userDOOptional = userDOS.stream().findFirst();
+        return userDOOptional.orElse(null);
+    }
+
+    @Override
+    public List<UserTokenDO> getUserTokenListByName(String userName) {
+        QueryWrapper<UserTokenDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_name", userName);
+        return userTokenDOMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public void addUserToken(UserTokenDO userTokenDO) {
+        userTokenDOMapper.insert(userTokenDO);
+    }
+
+    @Override
+    public UserTokenDO getUserToken(Long tokenId) {
+        return userTokenDOMapper.selectById(tokenId);
+    }
+
+    @Override
+    public void deleteUserTokenByName(String userName) {
+        QueryWrapper<UserTokenDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_name", userName);
+        userTokenDOMapper.delete(queryWrapper);
+    }
+
+    @Override
+    public void deleteUserToken(Long tokenId) {
+        userTokenDOMapper.deleteById(tokenId);
+    }
+}
--- 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,20 +1,23 @@
 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.User;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;

@@ -30,7 +33,8 @@ public class UserController {
    }

    @GetMapping("/getCurrentUser")
-    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+    public User getCurrentUser(HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse) {
        return userService.getCurrentUser(httpServletRequest, httpServletResponse);
    }

@@ -69,4 +73,27 @@ public class UserController {
        return userService.login(userCmd, request);
    }

+    @PostMapping("/generateToken")
+    public UserToken generateToken(@RequestBody UserTokenReq userTokenReq,
+            HttpServletRequest request, HttpServletResponse response) {
+        User user = userService.getCurrentUser(request, response);
+        return userService.generateToken(userTokenReq.getName(), user.getName(),
+                userTokenReq.getExpireTime());
+    }
+
+    @GetMapping("/getUserTokens")
+    public List<UserToken> getUserTokens(HttpServletRequest request, HttpServletResponse response) {
+        User user = userService.getCurrentUser(request, response);
+        return userService.getUserTokens(user.getName());
+    }
+
+    @GetMapping("/getUserToken")
+    public UserToken getUserToken(@RequestParam(name = "tokenId") Long tokenId) {
+        return userService.getUserToken(tokenId);
+    }
+
+    @PostMapping("/deleteUserToken")
+    public void deleteUserToken(@RequestParam(name = "tokenId") Long tokenId) {
+        userService.deleteUserToken(tokenId);
+    }
 }
--- 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,17 +1,20 @@
 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.User;
+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.service.UserService;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 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 org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
 import java.util.List;
 import java.util.Set;

@@ -25,7 +28,8 @@ public class UserServiceImpl implements UserService {
    }

    @Override
-    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+    public User getCurrentUser(HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse) {
        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
        if (user != null) {
            SystemConfig systemConfig = sysParameterService.getSystemConfig();
@@ -77,4 +81,33 @@ public class UserServiceImpl implements UserService {
        return ComponentFactory.getUserAdaptor().login(userReq, appKey);
    }

+    @Override
+    public String getPassword(String userName) {
+        return ComponentFactory.getUserAdaptor().getPassword(userName);
+    }
+
+    @Override
+    public void resetPassword(String userName, String password, String newPassword) {
+        ComponentFactory.getUserAdaptor().resetPassword(userName, password, newPassword);
+    }
+
+    @Override
+    public UserToken generateToken(String name, String userName, long expireTime) {
+        return ComponentFactory.getUserAdaptor().generateToken(name, userName, expireTime);
+    }
+
+    @Override
+    public List<UserToken> getUserTokens(String userName) {
+        return ComponentFactory.getUserAdaptor().getUserTokens(userName);
+    }
+
+    @Override
+    public UserToken getUserToken(Long id) {
+        return ComponentFactory.getUserAdaptor().getUserToken(id);
+    }
+
+    @Override
+    public void deleteUserToken(Long id) {
+        ComponentFactory.getUserAdaptor().deleteUserToken(id);
+    }
 }
--- 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,10 @@
 package com.tencent.supersonic.auth.authentication.strategy;

-
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
 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 org.springframework.stereotype.Service;

@Service
@@ -17,12 +17,11 @@ public class FakeUserStrategy implements UserStrategy {

    @Override
    public User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return User.getFakeUser();
+        return User.getDefaultUser();
    }

    @Override
    public User findUser(String token, String appKey) {
-        return User.getFakeUser();
+        return User.getDefaultUser();
    }
-
 }
--- 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,22 +1,24 @@
 package com.tencent.supersonic.auth.authentication.strategy;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 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 org.springframework.stereotype.Service;

+import java.util.Optional;

@Service
 public class HttpHeaderUserStrategy implements UserStrategy {

+    private final TokenService tokenService;

-    private final UserTokenUtils userTokenUtils;
-
-
-    public HttpHeaderUserStrategy(UserTokenUtils userTokenUtils) {
-        this.userTokenUtils = userTokenUtils;
+    public HttpHeaderUserStrategy(TokenService tokenService) {
+        this.tokenService = tokenService;
    }

    @Override
@@ -26,11 +28,33 @@ public class HttpHeaderUserStrategy implements UserStrategy {

    @Override
    public User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return userTokenUtils.getUser(request);
+        return getUser(request);
    }

    @Override
    public User findUser(String token, String appKey) {
-        return userTokenUtils.getUser(token, appKey);
+        return getUser(token, appKey);
    }
+
+    public User getUser(HttpServletRequest request) {
+        final Optional<Claims> claimsOptional = tokenService.getClaims(request);
+        return claimsOptional.map(this::getUser).orElse(User.getVisitUser());
+    }
+
+    public User getUser(String token, String appKey) {
+        final Optional<Claims> claimsOptional = tokenService.getClaims(token, appKey);
+        return claimsOptional.map(this::getUser).orElse(User.getVisitUser());
+    }
+
+    private User getUser(Claims claims) {
+        Long userId =
+                Long.parseLong(claims.getOrDefault(UserConstants.TOKEN_USER_ID, 0).toString());
+        String userName = String.valueOf(claims.get(UserConstants.TOKEN_USER_NAME));
+        String email = String.valueOf(claims.get(UserConstants.TOKEN_USER_EMAIL));
+        String displayName = String.valueOf(claims.get(UserConstants.TOKEN_USER_DISPLAY_NAME));
+        Integer isAdmin = claims.get(UserConstants.TOKEN_IS_ADMIN) == null ? 0
+                : Integer.parseInt(claims.get(UserConstants.TOKEN_IS_ADMIN).toString());
+        return User.get(userId, userName, displayName, email, isAdmin);
+    }
+
 }
--- 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,26 +1,25 @@
 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 java.util.List;
-import javax.annotation.PostConstruct;
 import lombok.Data;
 import org.springframework.context.annotation.Configuration;

+import java.util.List;

@Configuration
@Data
 public class UserStrategyFactory {

-
    private List<UserStrategy> userStrategyList;

-
    private AuthenticationConfig authenticationConfig;

-    public UserStrategyFactory(AuthenticationConfig authenticationConfig, List<UserStrategy> userStrategyList) {
+    public UserStrategyFactory(AuthenticationConfig authenticationConfig,
+            List<UserStrategy> userStrategyList) {
        this.authenticationConfig = authenticationConfig;
        this.userStrategyList = userStrategyList;
    }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/ComponentFactory.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/ComponentFactory.java
@@ -2,6 +2,7 @@ package com.tencent.supersonic.auth.authentication.utils;

 import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
 import org.springframework.core.io.support.SpringFactoriesLoader;
+
 import java.util.Objects;

 public class ComponentFactory {
@@ -16,8 +17,7 @@ public class ComponentFactory {
    }

    private static <T> T init(Class<T> factoryType) {
-        return SpringFactoriesLoader.loadFactories(factoryType,
-                Thread.currentThread().getContextClassLoader()).get(0);
+        return SpringFactoriesLoader
+                .loadFactories(factoryType, Thread.currentThread().getContextClassLoader()).get(0);
    }
-
 }
--- 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
@@ -0,0 +1,139 @@
+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;
+import com.tencent.supersonic.common.pojo.exception.AccessException;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_PREFIX;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
+
+@Slf4j
+@Component
+public class TokenService {
+
+    private AuthenticationConfig authenticationConfig;
+
+    public TokenService(AuthenticationConfig authenticationConfig) {
+        this.authenticationConfig = authenticationConfig;
+    }
+
+    public String generateToken(Map<String, Object> claims, HttpServletRequest request) {
+        String appKey = getAppKey(request);
+        long expiration = System.currentTimeMillis() + authenticationConfig.getTokenTimeout();
+        return generateToken(claims, appKey, expiration);
+    }
+
+    public String generateToken(Map<String, Object> claims, long expiration) {
+        String appKey = authenticationConfig.getTokenDefaultAppKey();
+        long exp = System.currentTimeMillis() + expiration;
+        return generateToken(claims, appKey, exp);
+    }
+
+    public String generateToken(Map<String, Object> claims, String appKey) {
+        long expiration = System.currentTimeMillis() + authenticationConfig.getTokenTimeout();
+        return toTokenString(claims, appKey, expiration);
+    }
+
+    public String generateToken(Map<String, Object> claims, String appKey, long expiration) {
+        return toTokenString(claims, appKey, expiration);
+    }
+
+    public String generateAppUserToken(HttpServletRequest request) {
+        String appName = request.getHeader("AppId");
+        if (StringUtils.isBlank(appName)) {
+            String message = "AppId is blank, get app_user failed";
+            log.warn("{}, uri: {}", message, request.getServletPath());
+            throw new AccessException(message);
+        }
+
+        UserWithPassword appUser = new UserWithPassword(appName);
+        appUser.setId(1L);
+        appUser.setName(appName);
+        appUser.setPassword("c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT");
+        appUser.setDisplayName(appName);
+        appUser.setIsAdmin(0);
+        return generateToken(UserWithPassword.convert(appUser), request);
+    }
+
+    public Optional<Claims> getClaims(HttpServletRequest request) {
+        String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
+        String appKey = getAppKey(request);
+        return getClaims(token, appKey);
+    }
+
+    private Optional<Claims> getClaims(String token, HttpServletRequest request) {
+        Optional<Claims> claims;
+        try {
+            String appKey = getAppKey(request);
+            claims = getClaims(token, appKey);
+        } catch (Exception e) {
+            throw new AccessException("parse user info from token failed :" + token);
+        }
+        return claims;
+    }
+
+    public Optional<Claims> getClaims(String token, String appKey) {
+        try {
+            String tokenSecret = getTokenSecret(appKey);
+            Claims claims =
+                    Jwts.parser().setSigningKey(tokenSecret.getBytes(StandardCharsets.UTF_8))
+                            .build().parseClaimsJws(getTokenString(token)).getBody();
+            return Optional.of(claims);
+        } catch (Exception e) {
+            log.info("can not getClaims from appKey:{} token:{}, please login", appKey, token);
+        }
+        return Optional.empty();
+    }
+
+    private static String getTokenString(String token) {
+        return token.startsWith(TOKEN_PREFIX)
+                ? token.substring(token.indexOf(TOKEN_PREFIX) + TOKEN_PREFIX.length()).trim()
+                : token.trim();
+    }
+
+    private String toTokenString(Map<String, Object> claims, String appKey, long expiration) {
+        Date expirationDate = new Date(expiration);
+        String tokenSecret = getTokenSecret(appKey);
+
+        return Jwts.builder().setClaims(claims).setSubject(claims.get(TOKEN_USER_NAME).toString())
+                .setExpiration(expirationDate)
+                .signWith(new SecretKeySpec(tokenSecret.getBytes(StandardCharsets.UTF_8),
+                        SignatureAlgorithm.HS512.getJcaName()), SignatureAlgorithm.HS512)
+                .compact();
+    }
+
+    private String getTokenSecret(String appKey) {
+        Map<String, String> appKeyToSecretMap = authenticationConfig.getAppKeyToSecretMap();
+        String secret = appKeyToSecretMap.get(appKey);
+        if (StringUtils.isBlank(secret)) {
+            throw new AccessException("get secret from appKey failed :" + appKey);
+        }
+        return secret;
+    }
+
+    public String getAppKey(HttpServletRequest request) {
+        String appKey = request.getHeader(authenticationConfig.getTokenHttpHeaderAppKey());
+        if (StringUtils.isBlank(appKey)) {
+            appKey = authenticationConfig.getTokenDefaultAppKey();
+        }
+        return appKey;
+    }
+
+    public String getDefaultAppKey() {
+        return authenticationConfig.getTokenDefaultAppKey();
+    }
+}
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java
@@ -1,170 +0,0 @@
-package com.tencent.supersonic.auth.authentication.utils;
-
-import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
-import com.tencent.supersonic.common.pojo.exception.AccessException;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.http.HttpServletRequest;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_PREFIX;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_EMAIL;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD;
-
-@Slf4j
-@Component
-public class UserTokenUtils {
-
-    private AuthenticationConfig authenticationConfig;
-
-    public UserTokenUtils(AuthenticationConfig authenticationConfig) {
-        this.authenticationConfig = authenticationConfig;
-    }
-
-    public String generateToken(UserWithPassword user, HttpServletRequest request) {
-        String appKey = getAppKey(request);
-        return generateToken(user, appKey);
-    }
-
-    public String generateToken(UserWithPassword user, String appKey) {
-        Map<String, Object> claims = new HashMap<>(5);
-        claims.put(TOKEN_USER_ID, user.getId());
-        claims.put(TOKEN_USER_NAME, StringUtils.isEmpty(user.getName()) ? "" : user.getName());
-        claims.put(TOKEN_USER_PASSWORD, StringUtils.isEmpty(user.getPassword()) ? "" : user.getPassword());
-        claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName());
-        claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
-        claims.put(TOKEN_IS_ADMIN, user.getIsAdmin());
-        return generate(claims, appKey);
-    }
-
-    public String generateAdminToken(HttpServletRequest request) {
-        UserWithPassword admin = new UserWithPassword("admin");
-        admin.setId(1L);
-        admin.setName("admin");
-        admin.setPassword("c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT");
-        admin.setDisplayName("admin");
-        admin.setIsAdmin(1);
-        return generateToken(admin, request);
-    }
-
-    public User getUser(HttpServletRequest request) {
-        String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
-        final Claims claims = getClaims(token, request);
-        return getUser(claims);
-    }
-
-    public User getUser(String token, String appKey) {
-        final Claims claims = getClaims(token, appKey);
-        return getUser(claims);
-    }
-
-    private User getUser(Claims claims) {
-        Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
-        String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
-        String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
-        String displayName = String.valueOf(claims.get(TOKEN_USER_DISPLAY_NAME));
-        Integer isAdmin = claims.get(TOKEN_IS_ADMIN) == null
-                ? 0 : Integer.parseInt(claims.get(TOKEN_IS_ADMIN).toString());
-        return User.get(userId, userName, displayName, email, isAdmin);
-    }
-
-    public UserWithPassword getUserWithPassword(HttpServletRequest request) {
-        String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
-        if (StringUtils.isBlank(token)) {
-            String message = "token is blank, get user failed";
-            log.warn("{}, uri: {}", message, request.getServletPath());
-            throw new AccessException(message);
-        }
-        final Claims claims = getClaims(token, request);
-        Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
-        String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
-        String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
-        String displayName = String.valueOf(claims.get(TOKEN_USER_DISPLAY_NAME));
-        String password = String.valueOf(claims.get(TOKEN_USER_PASSWORD));
-        Integer isAdmin = claims.get(TOKEN_IS_ADMIN) == null
-                ? 0 : Integer.parseInt(claims.get(TOKEN_IS_ADMIN).toString());
-        return UserWithPassword.get(userId, userName, displayName, email, password, isAdmin);
-    }
-
-    private Claims getClaims(String token, HttpServletRequest request) {
-        Claims claims;
-        try {
-            String appKey = getAppKey(request);
-            claims = getClaims(token, appKey);
-        } catch (Exception e) {
-            throw new AccessException("parse user info from token failed :" + token);
-        }
-        return claims;
-    }
-
-    private Claims getClaims(String token, String appKey) {
-        Claims claims;
-        try {
-            String tokenSecret = getTokenSecret(appKey);
-            claims = Jwts.parser()
-                    .setSigningKey(tokenSecret.getBytes(StandardCharsets.UTF_8))
-                    .build().parseClaimsJws(getTokenString(token)).getBody();
-        } catch (Exception e) {
-            log.error("getClaims", e);
-            throw new AccessException("parse user info from token failed :" + token);
-        }
-        return claims;
-    }
-
-    private static String getTokenString(String token) {
-        return token.startsWith(TOKEN_PREFIX) ? token.substring(token.indexOf(TOKEN_PREFIX)
-                + TOKEN_PREFIX.length()).trim() : token.trim();
-    }
-
-    private String generate(Map<String, Object> claims, String appKey) {
-        return toTokenString(claims, appKey);
-    }
-
-    private String toTokenString(Map<String, Object> claims, String appKey) {
-        Long tokenTimeout = authenticationConfig.getTokenTimeout();
-        long expiration = Long.parseLong(claims.get(TOKEN_CREATE_TIME) + "") + tokenTimeout;
-        Date expirationDate = new Date(expiration);
-        String tokenSecret = getTokenSecret(appKey);
-
-        return Jwts.builder()
-                .setClaims(claims)
-                .setSubject(claims.get(TOKEN_USER_NAME).toString())
-                .setExpiration(expirationDate)
-                .signWith(new SecretKeySpec(tokenSecret.getBytes(StandardCharsets.UTF_8),
-                        SignatureAlgorithm.HS512.getJcaName()), SignatureAlgorithm.HS512)
-                .compact();
-    }
-
-    private String getTokenSecret(String appKey) {
-        Map<String, String> appKeyToSecretMap = authenticationConfig.getAppKeyToSecretMap();
-        String secret = appKeyToSecretMap.get(appKey);
-        if (StringUtils.isBlank(secret)) {
-            throw new AccessException("get secret from appKey failed :" + appKey);
-        }
-        return secret;
-    }
-
-    public String getAppKey(HttpServletRequest request) {
-        String appKey = request.getHeader(authenticationConfig.getTokenHttpHeaderAppKey());
-        if (StringUtils.isBlank(appKey)) {
-            appKey = authenticationConfig.getTokenDefaultAppKey();
-        }
-        return appKey;
-    }
-}
--- a/auth/authentication/src/main/resources/mapper/UserDOMapper.xml
+++ b/auth/authentication/src/main/resources/mapper/UserDOMapper.xml
@@ -122,4 +122,29 @@
      <include refid="Example_Where_Clause" />
    </if>
  </select>
+
+  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+    update s2_user
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null">
+        salt = #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="displayName != null">
+        display_name = #{displayName,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="isAdmin != null">
+        is_admin = #{isAdmin,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>
--- a/auth/authentication/src/main/resources/mapper/UserTokenDOMapper.xml
+++ b/auth/authentication/src/main/resources/mapper/UserTokenDOMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tencent.supersonic.auth.authentication.persistence.mapper.UserTokenDOMapper">
+  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO">
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="token" jdbcType="VARCHAR" property="token" />
+    <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+
+
+
+</mapper>
--- 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,14 @@
 package com.tencent.supersonic.auth.authorization.rest;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+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.auth.api.authorization.pojo.AuthGroup;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.tencent.supersonic.common.pojo.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.List;
+
@RestController
@RequestMapping("/api/auth")
@Slf4j
@@ -34,9 +36,7 @@ public class AuthController {
        return authService.queryAuthGroups(modelId, groupId);
    }

-    /**
-     * 新建权限组
-     */
+    /** 新建权限组 */
    @PostMapping("/createGroup")
    public void newAuthGroup(@RequestBody AuthGroup group) {
        group.setGroupId(null);
@@ -69,8 +69,7 @@ public class AuthController {
     */
    @PostMapping("/queryAuthorizedRes")
    public AuthorizedResourceResp queryAuthorizedResources(@RequestBody QueryAuthResReq req,
-                                                           HttpServletRequest request,
-                                                           HttpServletResponse response) {
+            HttpServletRequest request, HttpServletResponse response) {
        User user = UserHolder.findUser(request, response);
        return authService.queryAuthorizedResources(req, user);
    }
--- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java
+++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java
@@ -1,7 +1,6 @@
 package com.tencent.supersonic.auth.authorization.service;

 import com.google.gson.Gson;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes;
@@ -10,6 +9,7 @@ import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -30,16 +30,17 @@ public class AuthServiceImpl implements AuthService {

    private UserService userService;

-    public AuthServiceImpl(JdbcTemplate jdbcTemplate,
-                           UserService userService) {
+    public AuthServiceImpl(JdbcTemplate jdbcTemplate, UserService userService) {
        this.jdbcTemplate = jdbcTemplate;
        this.userService = userService;
    }

    private List<AuthGroup> load() {
-        List<String> rows = jdbcTemplate.queryForList("select config from s2_auth_groups", String.class);
+        List<String> rows =
+                jdbcTemplate.queryForList("select config from s2_auth_groups", String.class);
        Gson g = new Gson();
-        return rows.stream().map(row -> g.fromJson(row, AuthGroup.class)).collect(Collectors.toList());
+        return rows.stream().map(row -> g.fromJson(row, AuthGroup.class))
+                .collect(Collectors.toList());
    }

    @Override
@@ -61,11 +62,11 @@ public class AuthServiceImpl implements AuthService {
                nextGroupId = obj + 1;
            }
            group.setGroupId(nextGroupId);
-            jdbcTemplate.update("insert into s2_auth_groups (group_id, config) values (?, ?);", nextGroupId,
-                    g.toJson(group));
+            jdbcTemplate.update("insert into s2_auth_groups (group_id, config) values (?, ?);",
+                    nextGroupId, g.toJson(group));
        } else {
-            jdbcTemplate.update("update s2_auth_groups set config = ? where group_id = ?;", g.toJson(group),
-                    group.getGroupId());
+            jdbcTemplate.update("update s2_auth_groups set config = ? where group_id = ?;",
+                    g.toJson(group), group.getGroupId());
        }
    }

@@ -80,10 +81,11 @@ public class AuthServiceImpl implements AuthService {
            return new AuthorizedResourceResp();
        }
        Set<String> userOrgIds = userService.getUserAllOrgId(user.getName());
-        List<AuthGroup> groups = getAuthGroups(req.getModelIds(), user.getName(), new ArrayList<>(userOrgIds));
+        List<AuthGroup> groups =
+                getAuthGroups(req.getModelIds(), user.getName(), new ArrayList<>(userOrgIds));
        AuthorizedResourceResp resource = new AuthorizedResourceResp();
-        Map<Long, List<AuthGroup>> authGroupsByModelId = groups.stream()
-                .collect(Collectors.groupingBy(AuthGroup::getModelId));
+        Map<Long, List<AuthGroup>> authGroupsByModelId =
+                groups.stream().collect(Collectors.groupingBy(AuthGroup::getModelId));
        for (Long modelId : req.getModelIds()) {
            if (authGroupsByModelId.containsKey(modelId)) {
                List<AuthGroup> authGroups = authGroupsByModelId.get(modelId);
@@ -110,26 +112,25 @@ public class AuthServiceImpl implements AuthService {
        return resource;
    }

-    private List<AuthGroup> getAuthGroups(List<Long> modelIds, String userName, List<String> departmentIds) {
-        List<AuthGroup> groups = load().stream()
-                .filter(group -> {
-                    if (!modelIds.contains(group.getModelId())) {
-                        return false;
-                    }
-                    if (!CollectionUtils.isEmpty(group.getAuthorizedUsers())
-                            && group.getAuthorizedUsers().contains(userName)) {
-                        return true;
-                    }
-                    for (String departmentId : departmentIds) {
-                        if (!CollectionUtils.isEmpty(group.getAuthorizedDepartmentIds())
-                                && group.getAuthorizedDepartmentIds().contains(departmentId)) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }).collect(Collectors.toList());
+    private List<AuthGroup> getAuthGroups(List<Long> modelIds, String userName,
+            List<String> departmentIds) {
+        List<AuthGroup> groups = load().stream().filter(group -> {
+            if (!modelIds.contains(group.getModelId())) {
+                return false;
+            }
+            if (!CollectionUtils.isEmpty(group.getAuthorizedUsers())
+                    && group.getAuthorizedUsers().contains(userName)) {
+                return true;
+            }
+            for (String departmentId : departmentIds) {
+                if (!CollectionUtils.isEmpty(group.getAuthorizedDepartmentIds())
+                        && group.getAuthorizedDepartmentIds().contains(departmentId)) {
+                    return true;
+                }
+            }
+            return false;
+        }).collect(Collectors.toList());
        log.info("user:{} department:{} authGroups:{}", userName, departmentIds, groups);
        return groups;
    }
-
 }
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -38,9 +38,10 @@ class BatchTest:
        response = requests.post(url, headers=headers, data=json.dumps(data))
        return response.json()

-    def execute(self, query_text, queryId):
+    def execute(self, agentId, query_text, queryId):
        url = self.base_url + 'execute'
        data = {
+            'agentId': agentId,
            'queryText': query_text,
            'parseId': 1,
            'chatId': self.chatId,
@@ -75,7 +76,7 @@ def benchmark(url:str, agentId:str, chatId:str, filePath:str, userName:str):
        # 捕获异常，防止程序中断
        try:
            parse_resp = batch_test.parse(question)
-            batch_test.execute(question, parse_resp['data']['queryId'])
+            batch_test.execute(agentId, question, parse_resp['data']['queryId'])
        except Exception as e:
            print('error:', e)
            traceback.print_exc()
--- a/benchmark/requirements.txt
+++ b/benchmark/requirements.txt
@@ -1,4 +1,4 @@
-pandas==2.0.3
+pandas==2.2.2
 PyJWT==2.8.0
 requests==2.28.2

--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryReviewResult.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryReviewResult.java
@@ -1,9 +1,18 @@
 package com.tencent.supersonic.chat.api.pojo.enums;

+import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
+import org.apache.commons.lang3.StringUtils;

 public enum MemoryReviewResult {
+    POSITIVE, NEGATIVE;

-    POSITIVE,
-    NEGATIVE
-
+    public static MemoryReviewResult getMemoryReviewResult(String value) {
+        String validValue = StringUtils.trim(value);
+        for (MemoryReviewResult reviewRet : MemoryReviewResult.values()) {
+            if (StringUtils.equalsIgnoreCase(reviewRet.name(), validValue)) {
+                return reviewRet;
+            }
+        }
+        throw new InvalidArgumentException("Invalid MemoryReviewResult type:[" + value + "]");
+    }
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryStatus.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryStatus.java
@@ -1,10 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.enums;

-
 public enum MemoryStatus {
-
-    PENDING,
-    ENABLED,
-    DISABLED;
-
+    PENDING, ENABLED, DISABLED;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatAggConfigReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatAggConfigReq.java
@@ -7,18 +7,13 @@ import java.util.List;
@Data
 public class ChatAggConfigReq {

-    /**
-     * invisible dimensions/metrics
-     */
+    /** invisible dimensions/metrics */
    private ItemVisibility visibility;

-    /**
-     * information about dictionary about the model
-     */
+    /** information about dictionary about the model */
    private List<KnowledgeInfoReq> knowledgeInfos;

    private KnowledgeAdvancedConfig globalKnowledgeConfig;

    private ChatDefaultConfigReq chatDefaultConfig;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java
@@ -1,35 +1,24 @@
 package com.tencent.supersonic.chat.api.pojo.request;

 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
-
 import lombok.Data;
 import lombok.ToString;

 import java.util.List;

-/**
- * extended information command about model
- */
+/** extended information command about model */
@Data
@ToString
 public class ChatConfigBaseReq {

    private Long modelId;

-
-    /**
-     * the recommended questions about the model
-     */
+    /** the recommended questions about the model */
    private List<RecommendedQuestionReq> recommendedQuestions;

-    /**
-     *  the llm examples about the model
-     */
+    /** the llm examples about the model */
    private String llmExamples;

-    /**
-     * available status
-     */
+    /** available status */
    private StatusEnum status;
-
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigEditReqReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigEditReqReq.java
@@ -2,9 +2,8 @@ package com.tencent.supersonic.chat.api.pojo.request;

 import lombok.Data;

-
@Data
 public class ChatConfigEditReqReq extends ChatConfigBaseReq {

    private Long id;
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigFilter.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigFilter.java
@@ -4,7 +4,6 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-
@NoArgsConstructor
@Data
 public class ChatConfigFilter {
@@ -12,4 +11,4 @@ public class ChatConfigFilter {
    private Long id;
    private Long modelId;
    private StatusEnum status = StatusEnum.ONLINE;
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatDefaultConfigReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatDefaultConfigReq.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-
 import lombok.Data;

 import java.util.ArrayList;
@@ -11,6 +10,4 @@ public class ChatDefaultConfigReq {

    private List<Long> dimensionIds = new ArrayList<>();
    private List<Long> metricIds = new ArrayList<>();
-
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatDetailConfigReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatDetailConfigReq.java
@@ -7,18 +7,13 @@ import java.util.List;
@Data
 public class ChatDetailConfigReq {

-    /**
-     * invisible dimensions/metrics
-     */
+    /** invisible dimensions/metrics */
    private ItemVisibility visibility;

-    /**
-     * information about dictionary about the model
-     */
+    /** information about dictionary about the model */
    private List<KnowledgeInfoReq> knowledgeInfos;

    private KnowledgeAdvancedConfig globalKnowledgeConfig;

    private ChatDefaultConfigReq chatDefaultConfig;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,5 +18,4 @@ public class ChatExecuteReq {
    private int parseId;
    private String queryText;
    private boolean saveAnswer;
-
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryCreateReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryCreateReq.java
@@ -0,0 +1,18 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import lombok.Data;
+
+@Data
+public class ChatMemoryCreateReq {
+
+    private Integer agentId;
+
+    private String question;
+
+    private String dbSchema;
+
+    private String s2sql;
+
+    private MemoryStatus status;
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryFilter.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryFilter.java
@@ -27,4 +27,10 @@ public class ChatMemoryFilter {

    private MemoryReviewResult humanReviewRet;

+    private String sort = "desc";
+    private String orderCondition;
+
+    public boolean isAsc() {
+        return "asc".equalsIgnoreCase(sort);
+    }
 }
--- 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,15 +1,13 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-
-import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
-import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
-import com.tencent.supersonic.common.pojo.RecordInfo;
-import lombok.Data;
-
 import javax.validation.constraints.NotNull;

+import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import lombok.Data;
+
@Data
-public class ChatMemoryUpdateReq extends RecordInfo {
+public class ChatMemoryUpdateReq {

    @NotNull(message = "id不可为空")
    private Long id;
@@ -23,5 +21,4 @@ public class ChatMemoryUpdateReq extends RecordInfo {
    private MemoryReviewResult humanReviewRet;

    private String humanReviewCmt;
-
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatParseReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatParseReq.java
@@ -1,19 +1,26 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo;
+import com.tencent.supersonic.common.pojo.User;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.request.QueryFilters;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;

@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class ChatParseReq {
    private String queryText;
    private Integer chatId;
    private Integer agentId;
-    private Integer topN = 10;
+    private Long dataSetId;
    private User user;
    private QueryFilters queryFilters;
    private boolean saveAnswer = true;
-    private SchemaMapInfo mapInfo = new SchemaMapInfo();
-
+    private boolean disableLLM = false;
+    private Long queryId;
+    private SemanticParseInfo selectedParse;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java
@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
 import lombok.Data;
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/Entity.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/Entity.java
@@ -1,29 +1,22 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

-/**
- * the entity info about the model
- */
+import java.util.List;
+
+/** the entity info about the model */
@Data
@AllArgsConstructor
@ToString
@NoArgsConstructor
 public class Entity {

-    /**
-     * uniquely identifies an entity
-     */
+    /** uniquely identifies an entity */
    private Long entityId;

-    /**
-     * entity name list
-     */
+    /** entity name list */
    private List<String> names;
-
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java
@@ -6,18 +6,13 @@ import lombok.ToString;
 import java.util.ArrayList;
 import java.util.List;

-
@Data
@ToString
 public class ItemNameVisibilityInfo {

-    /**
-     * invisible dimensions
-     */
+    /** invisible dimensions */
    private List<String> blackDimNameList = new ArrayList<>();

-    /**
-     * invisible metrics
-     */
+    /** invisible metrics */
    private List<String> blackMetricNameList = new ArrayList<>();
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java
@@ -1,22 +1,18 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import java.util.ArrayList;
-import java.util.List;
 import lombok.Data;
 import lombok.ToString;

+import java.util.ArrayList;
+import java.util.List;

@Data
@ToString
 public class ItemVisibility {

-    /**
-     * invisible dimensions
-     */
+    /** invisible dimensions */
    private List<Long> blackDimIdList = new ArrayList<>();

-    /**
-     * invisible metrics
-     */
+    /** invisible metrics */
    private List<Long> blackMetricIdList = new ArrayList<>();
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeAdvancedConfig.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeAdvancedConfig.java
@@ -5,13 +5,11 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;

-/**
- * advanced knowledge config
- */
+/** advanced knowledge config */
@Data
 public class KnowledgeAdvancedConfig {

    private List<String> blackList = new ArrayList<>();
    private List<String> whiteList = new ArrayList<>();
    private List<String> ruleList = new ArrayList<>();
-}
+}
--- 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,35 +1,24 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-import com.tencent.supersonic.common.pojo.enums.TypeEnums;
-
 import javax.validation.constraints.NotNull;

+import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import lombok.Data;

-/**
- * information about dictionary about the model
- */
-
+/** information about dictionary about the model */
@Data
 public class KnowledgeInfoReq {

-    /**
-     * metricId、DimensionId、modelId
-     */
+    /** metricId、DimensionId、modelId */
    private Long itemId;

    private String bizName;
-    /**
-     * type: IntentionTypeEnum
-     * temporarily only supports dimension-related information
-     */
+    /** type: IntentionTypeEnum temporarily only supports dimension-related information */
    @NotNull
    private TypeEnums type = TypeEnums.DIMENSION;

    private Boolean searchEnable = false;

-    /**
-     * advanced knowledge config for single item
-     */
+    /** advanced knowledge config for single item */
    private KnowledgeAdvancedConfig knowledgeAdvancedConfig;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageMemoryReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageMemoryReq.java
@@ -3,10 +3,8 @@ package com.tencent.supersonic.chat.api.pojo.request;
 import com.tencent.supersonic.common.pojo.PageBaseReq;
 import lombok.Data;

-
@Data
 public class PageMemoryReq extends PageBaseReq {

    private ChatMemoryFilter chatMemoryFilter = new ChatMemoryFilter();
-
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PageQueryInfoReq.java
@@ -1,6 +1,7 @@
 package com.tencent.supersonic.chat.api.pojo.request;

 import lombok.Data;
+
 import java.util.List;

@Data
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PluginQueryReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PluginQueryReq.java
@@ -1,12 +1,10 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-
 import lombok.Data;

@Data
 public class PluginQueryReq {

-
    private String name;

    private String parseMode;
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendReq.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-
 import lombok.Data;

@Data
@@ -9,5 +8,4 @@ public class RecommendReq {
    private Long modelId;

    private Long metricId;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java
@@ -12,5 +12,4 @@ import lombok.ToString;
 public class RecommendedQuestionReq {

    private String question;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.request;

-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,5 +20,4 @@ public class SimilarQueryReq {
    private Long dataSetId;

    private Integer agentId;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatAggRichConfigResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatAggRichConfigResp.java
@@ -9,18 +9,13 @@ import java.util.List;
@Data
 public class ChatAggRichConfigResp {

-    /**
-     * invisible dimensions/metrics
-     */
+    /** invisible dimensions/metrics */
    private ItemVisibilityInfo visibility;

-    /**
-     * information about dictionary about the model
-     */
+    /** information about dictionary about the model */
    private List<KnowledgeInfoReq> knowledgeInfos;

    private KnowledgeAdvancedConfig globalKnowledgeConfig;

    private ChatDefaultRichConfigResp chatDefaultConfig;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigResp.java
@@ -4,12 +4,11 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatDetailConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+import lombok.Data;

 import java.util.Date;
 import java.util.List;

-import lombok.Data;
-
@Data
 public class ChatConfigResp {

@@ -25,13 +24,11 @@ public class ChatConfigResp {

    private String llmExamples;

-    /**
-     * available status
-     */
+    /** available status */
    private StatusEnum statusEnum;

    private String createdBy;
    private String updatedBy;
    private Date createdAt;
    private Date updatedAt;
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigRichResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigRichResp.java
@@ -2,11 +2,11 @@ package com.tencent.supersonic.chat.api.pojo.response;

 import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;

-import lombok.Data;
-
@Data
 public class ChatConfigRichResp {

@@ -23,9 +23,7 @@ public class ChatConfigRichResp {

    private List<RecommendedQuestionReq> recommendedQuestions;

-    /**
-     * available status
-     */
+    /** available status */
    private StatusEnum statusEnum;

    private String createdBy;
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDefaultRichConfigResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDefaultRichConfigResp.java
@@ -1,9 +1,8 @@
 package com.tencent.supersonic.chat.api.pojo.response;

-
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.common.pojo.Constants;
+import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeMode;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import lombok.Data;

 import java.util.List;
@@ -14,18 +13,11 @@ public class ChatDefaultRichConfigResp {
    private List<SchemaElement> dimensions;
    private List<SchemaElement> metrics;

-
-    /**
-     * default time span unit
-     */
+    /** default time span unit */
    private Integer unit = 1;

-    /**
-     * default time type:
-     * DAY, WEEK, MONTH, YEAR
-     */
-    private String period = Constants.DAY;
+    /** default time type: DAY, WEEK, MONTH, YEAR */
+    private DatePeriodEnum period = DatePeriodEnum.DAY;

    private TimeMode timeMode;
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDetailRichConfigResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDetailRichConfigResp.java
@@ -9,19 +9,13 @@ import java.util.List;
@Data
 public class ChatDetailRichConfigResp {

-    /**
-     * invisible dimensions/metrics
-     */
+    /** invisible dimensions/metrics */
    private ItemVisibilityInfo visibility;

-    /**
-     * information about dictionary about the model
-     */
+    /** information about dictionary about the model */
    private List<KnowledgeInfoReq> knowledgeInfos;

    private KnowledgeAdvancedConfig globalKnowledgeConfig;

    private ChatDefaultRichConfigResp chatDefaultConfig;
-
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatModelTypeResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatModelTypeResp.java
@@ -0,0 +1,16 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatModelTypeResp {
+    private String type;
+    private String name;
+    private String description;
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatParseResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatParseResp.java
@@ -0,0 +1,26 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.pojo.Text2SQLExemplar;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
+import com.tencent.supersonic.headless.api.pojo.response.ParseTimeCostResp;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChatParseResp {
+
+    private Long queryId;
+    private ParseResp.ParseState state = ParseResp.ParseState.PENDING;
+    private String errorMsg;
+    private List<SemanticParseInfo> selectedParses = Lists.newArrayList();
+    private ParseTimeCostResp parseTimeCost = new ParseTimeCostResp();
+    private List<Text2SQLExemplar> usedExemplars;
+
+    public ChatParseResp(Long queryId) {
+        this.queryId = queryId;
+    }
+
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java
@@ -27,4 +27,4 @@ public class DictLatestTaskResp {
    private Date createdAt;

    private Long elapsedMs;
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/EntityRichInfoResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/EntityRichInfoResp.java
@@ -1,15 +1,13 @@
 package com.tencent.supersonic.chat.api.pojo.response;

 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import lombok.Data;

 import java.util.List;
-import lombok.Data;

@Data
 public class EntityRichInfoResp {
-    /**
-     *  entity alias
-     */
+    /** entity alias */
    private List<String> names;

    private SchemaElement dimItem;
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ItemVisibilityInfo.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ItemVisibilityInfo.java
@@ -1,8 +1,8 @@
 package com.tencent.supersonic.chat.api.pojo.response;

-import java.util.List;
 import lombok.Data;

+import java.util.List;

@Data
 public class ItemVisibilityInfo {
@@ -11,4 +11,4 @@ public class ItemVisibilityInfo {
    private List<Long> blackMetricIdList;
    private List<Long> whiteDimIdList;
    private List<Long> whiteMetricIdList;
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
@@ -3,10 +3,10 @@ package com.tencent.supersonic.chat.api.pojo.response;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.response.ParseTimeCostResp;
 import lombok.Data;
+
 import java.util.Date;
 import java.util.List;

-
@Data
 public class QueryResp {

@@ -20,5 +20,4 @@ public class QueryResp {
    private List<SemanticParseInfo> parseInfos;
    private List<SimilarQueryRecallResp> similarQueries;
    private ParseTimeCostResp parseTimeCost = new ParseTimeCostResp();
-
-}
+}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java
@@ -24,8 +24,10 @@ public class QueryResult {
    private Object response;
    private List<Map<String, Object>> queryResults;
    private String textResult;
+    private String textSummary;
    private Long queryTimeCost;
    private EntityInfo entityInfo;
    private List<SchemaElement> recommendedDimensions;
    private AggregateInfo aggregateInfo;
+    private String errorMsg;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ShowCaseResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ShowCaseResp.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.response;

-
 import lombok.Data;

 import java.util.List;
@@ -14,5 +13,4 @@ public class ShowCaseResp {
    private int pageSize;

    private int current;
-
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.api.pojo.response;

-
 import lombok.Builder;
 import lombok.Data;

@@ -11,5 +10,4 @@ public class SimilarQueryRecallResp {
    private Long queryId;

    private String queryText;
-
-}
+}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java
@@ -1,80 +1,73 @@
 package com.tencent.supersonic.chat.server.agent;

-
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.tencent.supersonic.common.config.PromptConfig;
-import com.tencent.supersonic.common.config.VisualConfig;
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
+import com.tencent.supersonic.chat.server.memory.MemoryReviewTask;
+import com.tencent.supersonic.common.pojo.ChatApp;
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;

 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;

@Data
 public class Agent extends RecordInfo {

+    private static final int ONLINE_STATUS = 1;
+    private static final int OFFLINE_STATUS = 0;
+    private static final int ENABLED = 1;
+    private static final int DISABLED = 0;
+
    private Integer id;
-    private Integer enableSearch;
-    private Integer enableMemoryReview;
    private String name;
    private String description;
-
-    /**
-     * 0 offline, 1 online
-     */
-    private Integer status;
+    /** 0 offline, 1 online */
+    private Integer status = ONLINE_STATUS;
    private List<String> examples;
-    private String agentConfig;
-    private ChatModelConfig modelConfig;
-    private PromptConfig promptConfig;
-    private MultiTurnConfig multiTurnConfig;
+    private Integer enableSearch = ENABLED;
+    private Integer enableFeedback = DISABLED;
+    private String toolConfig;
+    private Map<String, ChatApp> chatAppConfig = Collections.emptyMap();
    private VisualConfig visualConfig;

    public List<String> getTools(AgentToolType type) {
-        Map map = JSONObject.parseObject(agentConfig, Map.class);
+        Map<String, Object> map = JSONObject.parseObject(toolConfig, Map.class);
        if (CollectionUtils.isEmpty(map) || map.get("tools") == null) {
-            return Lists.newArrayList();
+            return Collections.emptyList();
        }
-        List<Map> toolList = (List) map.get("tools");
+        List<Map<String, Object>> toolList = (List<Map<String, Object>>) map.get("tools");
        return toolList.stream()
-                .filter(tool -> {
-                            if (Objects.isNull(type)) {
-                                return true;
-                            }
-                            return type.name().equals(tool.get("type"));
-                        }
-                )
-                .map(JSONObject::toJSONString)
-                .collect(Collectors.toList());
+                .filter(tool -> type == null || type.name().equals(tool.get("type")))
+                .map(JSONObject::toJSONString).collect(Collectors.toList());
    }

    public boolean enableSearch() {
-        return enableSearch != null && enableSearch == 1;
+        return enableSearch == ENABLED;
+    }
+
+    public boolean enableFeedback() {
+        return enableFeedback == ENABLED;
    }

    public boolean enableMemoryReview() {
-        return enableMemoryReview != null && enableMemoryReview == 1;
+        ChatApp memoryReviewApp = chatAppConfig.get(MemoryReviewTask.APP_KEY);
+        return memoryReviewApp != null && memoryReviewApp.isEnable();
    }

    public static boolean containsAllModel(Set<Long> detectViewIds) {
        return !CollectionUtils.isEmpty(detectViewIds) && detectViewIds.contains(-1L);
    }

-    public List<NL2SQLTool> getParserTools(AgentToolType agentToolType) {
+    public List<DatasetTool> getParserTools(AgentToolType agentToolType) {
        List<String> tools = this.getTools(agentToolType);
        if (CollectionUtils.isEmpty(tools)) {
-            return Lists.newArrayList();
+            return Collections.emptyList();
        }
-        return tools.stream().map(tool -> JSONObject.parseObject(tool, NL2SQLTool.class))
+        return tools.stream().map(tool -> JSONObject.parseObject(tool, DatasetTool.class))
                .collect(Collectors.toList());
    }

@@ -82,48 +75,34 @@ public class Agent extends RecordInfo {
        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.PLUGIN));
    }

-    public boolean containsLLMParserTool() {
-        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_LLM));
-    }
-
-    public boolean containsRuleTool() {
-        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_RULE));
-    }
-
-    public boolean containsNL2SQLTool() {
-        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_LLM))
-                || !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_RULE));
+    public boolean containsDatasetTool() {
+        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.DATASET));
    }

    public boolean containsAnyTool() {
-        Map map = JSONObject.parseObject(agentConfig, Map.class);
+        Map<String, Object> map = JSONObject.parseObject(toolConfig, Map.class);
        if (CollectionUtils.isEmpty(map)) {
            return false;
        }
-        List<Map> toolList = (List) map.get("tools");
-        if (CollectionUtils.isEmpty(toolList)) {
-            return false;
-        }
-
-        return true;
+        List<Map<String, Object>> toolList = (List<Map<String, Object>>) map.get("tools");
+        return !CollectionUtils.isEmpty(toolList);
    }

    public Set<Long> getDataSetIds() {
        Set<Long> dataSetIds = getDataSetIds(null);
        if (containsAllModel(dataSetIds)) {
-            return Sets.newHashSet();
+            return Collections.emptySet();
        }
        return dataSetIds;
    }

    public Set<Long> getDataSetIds(AgentToolType agentToolType) {
-        List<NL2SQLTool> commonAgentTools = getParserTools(agentToolType);
+        List<DatasetTool> commonAgentTools = getParserTools(agentToolType);
        if (CollectionUtils.isEmpty(commonAgentTools)) {
-            return new HashSet<>();
+            return Collections.emptySet();
        }
-        return commonAgentTools.stream().map(NL2SQLTool::getDataSetIds)
-                .filter(modelIds -> !CollectionUtils.isEmpty(modelIds))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toSet());
+        return commonAgentTools.stream().map(DatasetTool::getDataSetIds)
+                .filter(dataSetIds -> !CollectionUtils.isEmpty(dataSetIds))
+                .flatMap(Collection::stream).collect(Collectors.toSet());
    }
 }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentToolType.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentToolType.java
@@ -4,11 +4,9 @@ import java.util.HashMap;
 import java.util.Map;

 public enum AgentToolType {
-    NL2SQL_RULE("基于规则Text-to-SQL"),
-    NL2SQL_LLM("基于大模型Text-to-SQL"),
-    PLUGIN("第三方插件");
+    DATASET("Text2SQL数据集"), PLUGIN("第三方插件");

-    private String title;
+    private final String title;

    AgentToolType(String title) {
        this.title = title;
@@ -16,10 +14,8 @@ public enum AgentToolType {

    public static Map<AgentToolType, String> getToolTypes() {
        Map<AgentToolType, String> map = new HashMap<>();
-        map.put(NL2SQL_RULE, NL2SQL_RULE.title);
-        map.put(NL2SQL_LLM, NL2SQL_LLM.title);
+        map.put(DATASET, DATASET.title);
        map.put(PLUGIN, PLUGIN.title);
        return map;
    }
-
 }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/DatasetTool.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/DatasetTool.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.server.agent;

-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,8 +9,8 @@ import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class NL2SQLTool extends AgentTool {
+public class DatasetTool extends AgentTool {

-    protected List<Long> dataSetIds;
-
-}
+    private List<Long> dataSetIds;
+    private List<String> exampleQuestions;
+}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/LLMParserTool.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/LLMParserTool.java
@@ -1,12 +0,0 @@
-package com.tencent.supersonic.chat.server.agent;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LLMParserTool extends NL2SQLTool {
-
-    private List<String> exampleQuestions;
-
-}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/MultiTurnConfig.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/MultiTurnConfig.java
@@ -1,15 +0,0 @@
-package com.tencent.supersonic.chat.server.agent;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class MultiTurnConfig {
-
-    private boolean enableMultiTurn;
-
-}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/PluginTool.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/PluginTool.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.server.agent;

-
 import lombok.Data;

 import java.util.List;
@@ -9,5 +8,4 @@ import java.util.List;
 public class PluginTool extends AgentTool {

    private List<Long> plugins;
-
-}
+}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/RuleParserTool.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/RuleParserTool.java
@@ -1,21 +0,0 @@
-package com.tencent.supersonic.chat.server.agent;
-
-
-import lombok.Data;
-import org.apache.commons.collections.CollectionUtils;
-
-import java.util.List;
-
-@Data
-public class RuleParserTool extends NL2SQLTool {
-
-
-    private List<String> queryModes;
-
-    private List<String> queryTypes;
-
-    public boolean isContainsAllModel() {
-        return CollectionUtils.isNotEmpty(dataSetIds) && dataSetIds.contains(-1L);
-    }
-
-}
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentConfig.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentConfig.java
@@ -4,14 +4,13 @@ import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import java.util.List;

+import java.util.List;

@Data
@NoArgsConstructor
@AllArgsConstructor
-public class AgentConfig {
-
-    List<AgentTool> tools = Lists.newArrayList();
+public class ToolConfig {

+    private List<AgentTool> tools = Lists.newArrayList();
 }
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/VisualConfig.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/VisualConfig.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.config;
+package com.tencent.supersonic.chat.server.agent;

 import lombok.Data;

@@ -8,5 +8,4 @@ public class VisualConfig {
    private boolean enableSimpleMode;

    private boolean showDebugInfo;
-
 }
--- a/Show More
+++ b/Show More