[opt](headless)Model update should not delete/update metrics/dimensions, use dedicated metric/dimension management.

[feature](headless)Add request user to data events.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -11,59 +11,28 @@ body:
         If it is an idea or help wanted, please go to:
         [Github Discussion](https://github.com/tencentmusic/supersonic/discussions)
 
-  - type: checkboxes
+  - type: input
+    id: version
     attributes:
-      label: Search before asking
-      description: >
-        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
-        whether the same issue was reported already.
-      options:
-        - label: >
-            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
-            issues.
-          required: true
+      label: SuperSonic version
+      description: Please tell us which version you are using.
+      placeholder: "0.9.8"
+    validations:
+      required: true
 
-  - type: textarea
+  - type: input
+    id: organization
     attributes:
-      label: Version
-      description: What is the current version
-      placeholder: >
-        Please provide the version you are using.
-        If it is the trunk version, please input commit id.
+      label: Your organization
+      description: Please tell us your organization so that we can provide you better support and advice.
+      placeholder: "TME..."
     validations:
       required: true
 
   - type: textarea
     attributes:
-      label: What's Wrong?
-      description: Describe the bug.
-      placeholder: >
-        Describe the specific problem, the more detailed the better.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: What You Expected?
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: How to Reproduce?
-      placeholder: >
-        Please try to give reproducing steps to facilitate quick location of the problem.
-
-        - What actions were performed
-        - Table building statement
-        - Import statement
-        - Cluster information: number of nodes, configuration, etc.
-
-        If it is hard to reproduce, please also explain the general scene.
-
-  - type: textarea
-    attributes:
-      label: Anything Else?
+      label: Description
+      description: Describe the bug you met.
 
   - type: checkboxes
     attributes:
@@ -74,16 +43,6 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
-  - type: checkboxes
-    attributes:
-      label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
-      options:
-        - label: >
-            I agree to follow this project's
-            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
-          required: true
-
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/enhancement_request.yml

@@ -8,30 +8,20 @@ body:
     attributes:
       value: |
         Thank you very much for your good enhancement for SuperSonic.
-  - type: checkboxes
-    attributes:
-      label: Search before asking
-      description: >
-        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
-        whether the same issue was reported already.
-      options:
-        - label: >
-            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
-            issues.
-          required: true
 
   - type: textarea
     attributes:
       label: Description
       description: Describe the enhancement what you want, including motivation if it exists.
 
-  - type: textarea
+  - type: input
+    id: organization
     attributes:
-      label: Solution
-      placeholder: >
-        Add overview of proposed solution. 
-
-        Add related materials like links if they exist.
+      label: Your organization
+      description: Please tell us your organization so that we can provide you better support and advice.
+      placeholder: "TME..."
+    validations:
+      required: true
 
   - type: checkboxes
     attributes:
@@ -42,16 +32,6 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
-  - type: checkboxes
-    attributes:
-      label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
-      options:
-        - label: >
-            I agree to follow this project's
-            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
-          required: true
-
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -8,33 +8,19 @@ body:
       value: |
         Thank you very much for your good ideas and suggestions for SuperSonic
 
-  - type: checkboxes
-    attributes:
-      label: Search before asking
-      description: >
-        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
-        whether the same issue was reported already.
-      options:
-        - label: >
-            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
-            issues.
-          required: true
-
   - type: textarea
     attributes:
       label: Description
       description: Describe your ideas and needs.
 
-  - type: textarea
+  - type: input
+    id: organization
     attributes:
-      label: Use case
-      placeholder: >
-        What problem does this feature mainly solve, or what scenarios it is suitable for.
-
-  - type: textarea
-    attributes:
-      label: Related issues
-      description: Is there currently another issue associated with this?
+      label: Your organization
+      description: Please tell us your organization so that we can provide you better support and advice.
+      placeholder: "TME..."
+    validations:
+      required: true
 
   - type: checkboxes
     attributes:
@@ -45,16 +31,4 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
-  - type: checkboxes
-    attributes:
-      label: Code of Conduct
-      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
-      options:
-        - label: >
-            I agree to follow this project's
-            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
-          required: true
 
-  - type: markdown
-    attributes:
-      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/question_request.yml

@@ -8,6 +8,7 @@ body:
       value: |
         ## Ask a Question about SuperSonic
         Please provide a detailed description of your question or the clarification you seek regarding the SuperSonic project.
+
   - type: textarea
     id: describe-question
     attributes:
@@ -16,43 +17,12 @@ body:
       placeholder: "Type your question here..."
     validations:
       required: true
-  - type: textarea
-    id: additional-context
+
+  - type: input
+    id: organization
     attributes:
-      label: Provide any additional context or information
-      description: If your question is related to a specific part of the SuperSonic project or if you have already looked through certain documentation, please provide that information here.
-      placeholder: "Add context here..."
+      label: Your organization
+      description: Please tell us your organization so that we can provide you better support and advice.
+      placeholder: "TME..."
     validations:
-      required: false
-  - type: textarea
-    id: tried-to-resolve
-    attributes:
-      label: What have you tried to resolve your question
-      description: Let us know what you have done to try and understand or resolve your question. This can help us provide you with the most useful guidance.
-      placeholder: "I've already tried..."
-    validations:
-      required: false
-  - type: textarea
-    id: environment
-    attributes:
-      label: Your environment
-      description: Share details about your environment to help us reproduce the issue. Include your operating system, version of SuperSonic, and any other relevant details.
-      placeholder: "OS, SuperSonic version, etc..."
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots-logs
-    attributes:
-      label: Screenshots or Logs
-      description: If applicable, add screenshots or logs to help explain your problem.
-      placeholder: "Paste your logs or attach screenshots here..."
-    validations:
-      required: false
-  - type: textarea
-    id: additional-information
-    attributes:
-      label: Additional information
-      description: Add any other context or details you think might be helpful for understanding your question.
-      placeholder: "Any other information..."
-    validations:
-      required: false
+      required: true

.github/workflows/centos-ci.yml

@@ -11,39 +11,36 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/centos/centos:stream8  # 使用 CentOS Stream 8 容器
+      image: almalinux:9  # maven >=3.6.3
 
     strategy:
       matrix:
-        java-version: [8, 11, 21]  # 定义要测试的JDK版本
+        java-version: [21]  # 定义要测试的JDK版本
 
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'adopt'
+
       - name: Reset DNF repositories
         run: |
-          cd /etc/yum.repos.d/
-          sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-          sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+          sed -e 's|^mirrorlist=|#mirrorlist=|g' \
+            -e 's|^# baseurl=https://repo.almalinux.org|baseurl=https://mirrors.aliyun.com|g' \
+            /etc/yum.repos.d/almalinux*.repo
+
 
       - name: Update DNF package index
         run: dnf makecache
 
-      - name: Install Java and Maven with retry
+      - name: Install Maven with retry
         run: |
-          if [ ${{ matrix.java-version }} -eq 8 ]; then
-            for i in {1..5}; do
-              dnf install -y java-1.8.0-openjdk-devel maven && break || sleep 15
-            done
-          elif [ ${{ matrix.java-version }} -eq 11 ]; then
-            for i in {1..5}; do
-              dnf install -y java-11-openjdk-devel maven && break || sleep 15
-            done
-          elif [ ${{ matrix.java-version }} -eq 21 ]; then
-            for i in {1..5}; do
-              dnf install -y java-21-openjdk-devel maven && break || sleep 15
-            done
-          fi
+          for i in {1..5}; do
+              dnf install -y maven && break || sleep 15
+          done
 
       - name: Verify Java and Maven installation
         run: |
@@ -51,7 +48,7 @@ jobs:
           mvn -version
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -62,3 +59,4 @@ jobs:
 
       - name: Test with Maven
         run: mvn test
+

.github/workflows/docker-publish.yml

@@ -0,0 +1,32 @@
+name: Docker Publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version of the Docker image'
+        required: true
+        default: 'latest'
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and publish Docker image
+        run: |
+          VERSION=${{ github.event.inputs.version }}
+          chmod +x docker/docker-build-publish.sh
+          sh docker/docker-build-publish.sh $VERSION

.github/workflows/mac-ci.yml

@@ -14,24 +14,30 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [8, 11, 21]  # Define the JDK versions to test
+        java-version: [21]  # Define the JDK versions to test
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/Library/Caches/Maven  # macOS Maven cache path
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install cmake
+          brew install gcc
+
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 

.github/workflows/ubuntu-ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [8, 11, 21]  # 定义要测试的JDK版本
+        java-version: [21]  # 定义要测试的JDK版本
 
     steps:
       - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
           distribution: 'adopt'
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/windows-ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [8, 11, 21]  # Add JDK 21 to the matrix
+        java-version: [21]  # Add JDK 21 to the matrix
 
     steps:
       - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
           distribution: 'adopt'  # You might need to change this if 'adopt' doesn't support JDK 21
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~\.m2  # Windows uses a backslash for paths
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.gitignore

@@ -20,3 +20,5 @@ chm_db/
 __pycache__/
 /dict
 assembly/build/*-SNAPSHOT
+**/node_modules/
+benchmark/res/

CHANGELOG.md

@@ -3,6 +3,214 @@
 - All notable changes to this project will be documented in this file.
 - "Breaking Changes" describes any changes that may break existing functionality or cause
   compatibility issues with previous versions.
+## SuperSonic [1.0.0] - 2025-08-05
+
+### 重大特性变更 / Major Features
+
+#### 多数据库支持扩展 / Multi-Database Support
+- **Oracle数据库支持**: 新增Oracle数据库引擎类型及适配器 ([8eeed87ba](https://github.com/tencentmusic/supersonic/commit/8eeed87ba) by supersonicbi)
+- **StarRocks支持**: 支持StarRocks和多catalog功能 ([33268bf3d](https://github.com/tencentmusic/supersonic/commit/33268bf3d) by zyclove)
+- **SAP HANA支持**: 新增SAP HANA数据库适配支持 ([2e28a4c7a](https://github.com/tencentmusic/supersonic/commit/2e28a4c7a) by wwsheng009)
+- **DuckDB支持**: 支持DuckDB数据库 ([a058dc8b6](https://github.com/tencentmusic/supersonic/commit/a058dc8b6) by jerryjzhang)
+- **Kyuubi支持**: 支持Kyuubi Presto Trino ([5e3bafb95](https://github.com/tencentmusic/supersonic/commit/5e3bafb95) by zyclove)
+- **OpenSearch支持**: 新增OpenSearch支持 ([d942d35c9](https://github.com/tencentmusic/supersonic/commit/d942d35c9) by zyclove)
+
+#### 智能问答增强 / AI-Enhanced Query Processing
+- **LLM纠错器**: 新增LLM物理SQL纠错器 ([f899d23b6](https://github.com/tencentmusic/supersonic/commit/f899d23b6) by 柯慕灵)
+- **记忆管理**: Agent记忆管理启用few-shot优先机制 ([fae9118c2](https://github.com/tencentmusic/supersonic/commit/fae9118c2) by feelshana)
+- **结构化查询**: 支持struct查询中的offset子句 ([d2a43a99c](https://github.com/tencentmusic/supersonic/commit/d2a43a99c) by jerryjzhang)
+- **向量召回优化**: 优化嵌入向量召回机制 ([8c6ae6252](https://github.com/tencentmusic/supersonic/commit/8c6ae6252) by lexluo09)
+
+#### 权限管理系统 / Permission Management
+- **Agent权限**: 支持agent级别的权限管理 ([b5aa6e046](https://github.com/tencentmusic/supersonic/commit/b5aa6e046) by jerryjzhang)
+- **用户管理**: 支持用户删除功能 ([1c9cf788c](https://github.com/tencentmusic/supersonic/commit/1c9cf788c) by supersonicbi)
+- **鉴权优化**: 全面优化鉴权与召回机制 ([1faf84e37](https://github.com/tencentmusic/supersonic/commit/1faf84e37), [7e6639df8](https://github.com/tencentmusic/supersonic/commit/7e6639df8) by guilinlewis)
+
+### 架构升级 / Architecture Upgrades
+
+#### 核心框架升级 / Core Framework Upgrades
+- **SpringBoot 3升级**: 完成SpringBoot 3.x升级 ([07f6be51c](https://github.com/tencentmusic/supersonic/commit/07f6be51c) by mislayming)
+- **依赖升级**: 升级依赖包并修复安全漏洞 ([232a20227](https://github.com/tencentmusic/supersonic/commit/232a20227) by beat4ocean)
+- **LangChain4j更新**: 替换已废弃的LangChain4j APIs ([acffc03c7](https://github.com/tencentmusic/supersonic/commit/acffc03c7) by beat4ocean)
+- **Swagger升级**: 使用SpringDoc支持Swagger在Spring 3.x ([758d170bb](https://github.com/tencentmusic/supersonic/commit/758d170bb) by jerryjzhang)
+
+#### 许可证变更 / License Changes
+- **Apache 2.0**: 从MIT更改为Apache 2.0许可证 ([0aa002882](https://github.com/tencentmusic/supersonic/commit/0aa002882) by jerryjzhang)
+
+### 性能优化 / Performance Improvements
+
+#### 系统性能 / System Performance
+- **GC优化**: 实现Generational ZGC ([3fc1ec42b](https://github.com/tencentmusic/supersonic/commit/3fc1ec42b) by beat4ocean)
+- **Docker优化**: 减少Docker镜像体积 ([614917ba7](https://github.com/tencentmusic/supersonic/commit/614917ba7) by kino)
+- **并行处理**: 嵌入向量并行执行优化 ([8c6ae6252](https://github.com/tencentmusic/supersonic/commit/8c6ae6252) by lexluo09)
+- **记忆评估**: 记忆评估性能优化 ([524ec38ed](https://github.com/tencentmusic/supersonic/commit/524ec38ed) by yudong)
+- **多平台构建**: 支持Docker多平台构建 ([da6d28c18](https://github.com/tencentmusic/supersonic/commit/da6d28c18) by jerryjzhang)
+
+#### 数据处理优化 / Data Processing Optimization
+- **日期格式**: 支持更多日期字符串格式 ([2b13866c0](https://github.com/tencentmusic/supersonic/commit/2b13866c0) by supersonicbi)
+- **SQL优化**: 优化SQL生成和执行性能 ([0ab764329](https://github.com/tencentmusic/supersonic/commit/0ab764329) by jerryjzhang)
+- **模型关联**: 优化模型关联查询性能 ([47c2595fb](https://github.com/tencentmusic/supersonic/commit/47c2595fb) by Willy-J)
+
+### 功能增强 / Feature Enhancements
+
+#### 前端界面优化 / Frontend Improvements
+- **图表导出**: 消息支持导出图表图片 ([ce9ae1c0c](https://github.com/tencentmusic/supersonic/commit/ce9ae1c0c) by pisces)
+- **路由重构**: 重构语义建模路由交互 ([82c63a7f2](https://github.com/tencentmusic/supersonic/commit/82c63a7f2) by tristanliu)
+- **权限界面**: 统一助理权限设置交互界面 ([46d64d78f](https://github.com/tencentmusic/supersonic/commit/46d64d78f) by tristanliu)
+- **图表优化**: 优化ChatMsg图表条件 ([06fb6ba74](https://github.com/tencentmusic/supersonic/commit/06fb6ba74) by FredTsang)
+- **数据格式**: 提取formatByDataFormatType()方法 ([9ffdba956](https://github.com/tencentmusic/supersonic/commit/9ffdba956) by FredTsang)
+
+#### 开发体验 / Developer Experience
+- **构建脚本**: 优化Web应用构建脚本 ([baae7f74b](https://github.com/tencentmusic/supersonic/commit/baae7f74b) by zyclove)
+- **GitHub Actions**: 优化GitHub Actions镜像推送 ([6a4458a57](https://github.com/tencentmusic/supersonic/commit/6a4458a57) by lexluo09)
+- **基准测试**: 改进基准测试，增加解析结果分析 ([97710a90c](https://github.com/tencentmusic/supersonic/commit/97710a90c) by Antgeek)
+
+### Bug修复 / Bug Fixes
+
+#### 核心功能修复 / Core Function Fixes
+- **插件功能**: 修复插件功能无法调用/结果被NL2SQL覆盖问题 ([c75233e37](https://github.com/tencentmusic/supersonic/commit/c75233e37) by QJ_wonder)
+- **维度别名**: 修复映射阶段维度值别名不生效问题 ([785bda6cd](https://github.com/tencentmusic/supersonic/commit/785bda6cd) by feelshana)
+- **模型字段**: 修复模型字段更新问题 ([6bd897084](https://github.com/tencentmusic/supersonic/commit/6bd897084) by WDEP)
+- **多轮对话**: 修复headless中字段查询及多轮对话使用问题 ([be0447ae1](https://github.com/tencentmusic/supersonic/commit/be0447ae1) by QJ_wonder)
+
+#### NPE异常修复 / NPE Exception Fixes
+- **聊天查询**: 修复EmbeddingMatchStrategy.detectByBatch() NPE异常 ([6d907b6ad](https://github.com/tencentmusic/supersonic/commit/6d907b6ad) by wangyong)
+- **文件处理**: 修复FileHandlerImpl.convert2Resp() 维度值数据行首字符为空格异常 ([da172a030](https://github.com/tencentmusic/supersonic/commit/da172a030) by wangyong)
+- **头部服务**: 修复多处headless NPE问题 ([79a44b27e](https://github.com/tencentmusic/supersonic/commit/79a44b27e) by jerryjzhang)
+- **解析信息**: 修复getParseInfo中的NPE ([dce9a8a58](https://github.com/tencentmusic/supersonic/commit/dce9a8a58) by supersonicbi)
+
+#### SQL兼容性修复 / SQL Compatibility Fixes
+- **SQL处理**: 修复SQL前后换行符导致的语句结尾";"删除问题 ([55ac3d1aa](https://github.com/tencentmusic/supersonic/commit/55ac3d1aa) by wangyong)
+- **查询别名**: DictUtils.constructQuerySqlReq针对sql query增加别名 ([042791762](https://github.com/tencentmusic/supersonic/commit/042791762) by andybj0228)
+- **SQL变量**: 支持SQL脚本变量替换 ([0709575cd](https://github.com/tencentmusic/supersonic/commit/0709575cd) by wanglongqiang)
+
+#### 前端Bug修复 / Frontend Bug Fixes
+- **UI样式**: 修复问答对话右侧历史对话模块样式异常 ([c33a85b58](https://github.com/tencentmusic/supersonic/commit/c33a85b58) by wangyong)
+- **推荐维度**: 修复页面不显示推荐下钻维度问题 ([62b9db679](https://github.com/tencentmusic/supersonic/commit/62b9db679) by WDEP)
+- **图表显示**: 修复饼图显示条件问题 ([1b8cd7f0d](https://github.com/tencentmusic/supersonic/commit/1b8cd7f0d) by WDEP)
+- **负数支持**: 支持负数显示 ([2552e2ae4](https://github.com/tencentmusic/supersonic/commit/2552e2ae4) by FredTsang)
+- **百分比显示**: 支持bar图needMultiply100显示正确百分比值 ([8abfc923a](https://github.com/tencentmusic/supersonic/commit/8abfc923a) by coosir)
+- **TypeScript错误**: 修复前端TypeScript错误 ([5585b9e22](https://github.com/tencentmusic/supersonic/commit/5585b9e22) by poncheen)
+
+#### 系统兼容性修复 / System Compatibility Fixes
+- **Windows脚本**: 修复Windows daemon.bat路径配置问题 ([e5a41765b](https://github.com/tencentmusic/supersonic/commit/e5a41765b) by 柯慕灵)
+- **字符编码**: 将utf8编码修改为utf8mb4,解决字符问题 ([2e81b190a](https://github.com/tencentmusic/supersonic/commit/2e81b190a) by Kun Gu)
+- **记忆缓存**: 修复记忆管理中因缓存无法存储的问题 ([81cd60d2d](https://github.com/tencentmusic/supersonic/commit/81cd60d2d) by guilinlewis)
+- **Mac兼容**: 降级djl库以支持Mac Intel机器 ([bf3213e8f](https://github.com/tencentmusic/supersonic/commit/bf3213e8f) by jerryjzhang)
+
+### 数据管理优化 / Data Management Improvements
+
+#### 维度指标管理 / Dimension & Metric Management
+- **维度检索**: 修复维度和指标检索及百分比显示问题 ([d8fe2ed2b](https://github.com/tencentmusic/supersonic/commit/d8fe2ed2b) by 木鱼和尚)
+- **查询导出**: 基于queryColumns导出数据 ([11d1264d3](https://github.com/tencentmusic/supersonic/commit/11d1264d3) by FredTsang)
+- **表格排序**: 移除表格defaultSortOrder ([32675387d](https://github.com/tencentmusic/supersonic/commit/32675387d) by FredTsang)
+- **维度搜索**: 修复维度搜索带key查询范围超出问题 ([269f146c1](https://github.com/tencentmusic/supersonic/commit/269f146c1) by wangyong)
+
+### 测试和质量保证 / Testing & Quality Assurance
+
+#### 单元测试 / Unit Testing
+- **测试修复**: 修复单元测试用例 ([91e4b51ef](https://github.com/tencentmusic/supersonic/commit/91e4b51ef) by jerryjzhang)
+- **模型测试**: 修复ModelCreateForm.tsx错误 ([d2aa73b85](https://github.com/tencentmusic/supersonic/commit/d2aa73b85) by Antgeek)
+
+### 重要变更说明 / Breaking Changes
+
+#### 升级注意事项 / Upgrade Notes
+1. **SpringBoot 3升级**: 可能需要更新依赖配置和代码适配
+2. **许可证变更**: 从MIT变更为Apache 2.0，请注意法律合规
+3. **API接口调整**: 部分API接口为支持新功能进行了调整
+4. **数据库兼容**: 新增多种数据库支持，配置方式有所变化
+
+### 完整提交统计 / Commit Statistics
+- **总提交数**: 419个提交
+- **主要贡献者**: 
+  - jerryjzhang: 158次提交
+  - supersonicbi: 22次提交
+  - zyclove: 20次提交
+  - beat4ocean: 15次提交
+  - guilinlewis: 11次提交
+  - wangyong: 11次提交
+  - 其他贡献者: 182次提交
+- **涉及模块**: headless, chat, auth, common, webapp, launcher, docker
+- **时间跨度**: 2024年11月1日 - 2025年8月5日
+
+### 致谢 / Acknowledgments
+
+感谢所有为SuperSonic 1.0.0版本贡献代码、文档、测试和建议的开发者们！🎉
+
+#### 核心贡献者 / Core Contributors
+- **jerryjzhang** - 项目维护者，核心架构设计与实现
+- **supersonicbi** - 核心功能开发，多数据库支持
+- **beat4ocean** - 架构升级，依赖管理，安全优化
+- **zyclove** - 数据库适配，构建优化
+- **guilinlewis** - 鉴权系统，召回优化
+- **wangyong** - Bug修复，NPE异常处理
+
+#### 活跃贡献者 / Active Contributors
+- **WDEP** - 前端优化，图表功能
+- **FredTsang** - Chat SDK优化，数据导出
+- **feelshana** - 记忆管理，向量召回
+- **QJ_wonder** - 插件功能，多轮对话
+- **Willy-J** - 模型关联，数据库兼容
+- **iridescentpeo** - 查询优化，模型管理
+- **tristanliu** - 前端路由，权限界面
+- **mislayming** - SpringBoot 3升级
+- **Antgeek** - 基准测试，模型修复
+- **柯慕灵** - LLM纠错器，Windows脚本
+- **superhero** - 项目管理，代码审查
+
+#### 其他重要贡献者 / Other Important Contributors
+- **木鱼和尚** - 维度指标检索优化
+- **pisces** - 图表导出功能
+- **lexluo09** - 并行处理，GitHub Actions
+- **andybj0228** - SQL查询优化
+- **wanglongqiang** - SQL变量支持
+- **Hyman_bz** - StarRocks支持
+- **wwsheng009** - SAP HANA适配
+- **poncheen** - TypeScript错误修复
+- **kino** - Docker镜像优化
+- **coosir** - 前端百分比显示
+- **Kun Gu** - 字符编码优化
+- **chixiaopao** - NPE异常修复
+- **naimehao** - 核心功能修复
+- **yudong** - 记忆评估优化
+- **mroldx** - 数据库脚本更新
+- **ChPi** - 解析器性能优化
+- **Hwting** - Docker配置优化
+
+#### 特别感谢 / Special Thanks
+感谢所有提交Issue、参与讨论、提供反馈的社区用户，你们的每一个建议都让SuperSonic变得更好！
+
+#### 社区支持 / Community Support
+SuperSonic是一个开源项目，我们欢迎更多开发者加入：
+- 🔗 **GitHub**: https://github.com/tencentmusic/supersonic
+- 📖 **文档**: 详见项目README和Wiki
+- 🐛 **Issue报告**: 欢迎提交Bug和功能请求
+- 🚀 **贡献代码**: 欢迎提交Pull Request
+- 💬 **社区讨论**: 加入我们的技术交流群
+
+#### 未来展望 / Future Vision
+SuperSonic 1.0.0是一个重要的里程碑，但这只是开始。我们将继续：
+- 🌟 **持续优化性能和稳定性**
+- 🔧 **扩展更多数据库和AI模型支持**  
+- 🎨 **改善用户体验和界面设计**
+- 📚 **完善文档和最佳实践**
+- 🤝 **建设更活跃的开源社区**
+
+**让我们一起把SuperSonic做得更好！** ✨
+
+---
+
+*如果您在使用过程中遇到问题或有改进建议，欢迎随时与我们交流。每一份贡献都让SuperSonic更加强大！*
+
+
+## SuperSonic [0.9.8] - 2024-11-01
+- Add LLM management module to reuse connection across agents.
+- Add ChatAPP configuration sub-module in Agent Management.
+- Enhance dimension value management sub-module.
+- Enhance memory management and term management sub-module.
+- Enhance semantic translation of complex S2SQL.
+- Enhance user experience in Chat UI.
+- Introduce LLM-based semantic corrector and data interpreter.
 
 ## SuperSonic [0.9.2] - 2024-06-01
 

LICENSE

@@ -1,468 +1,41 @@
-MIT License
+Apache License Version 2.0
 
-Copyright (c) 2023 Tencent Music Entertainment
+Copyright (2025) The SuperSonic Project Authors.  All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+----------
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+SuperSonic is licensed under the Apache License 2.0, with the following additional conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.
+1. The commercial usage of SuperSonic:
 
+a. SuperSonic may be utilized commercially, including as a frontend and backend service without modifying the source
+code and logo.
 
+b. a commercial license must be obtained from the author if you want to develop and distribute a derivative work based
+on SuperSonic.
 
-Other dependencies and licenses:
+Please contact supersonicbi@qq.com by email to inquire about licensing matters.
 
 
-Open Source Software Licensed under the MIT License:
---------------------------------------------------------------------
-1. Mybatis-PageHelper 1.2.10
-Copyright (c) 2014-2022 abel533@gmail.com
+2. As a contributor, you should agree that:
 
-2. lombok
-Copyright (C) 2009-2021 The Project Lombok Authors.
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
 
-3. react
-Copyright (c) Facebook, Inc. and its affiliates.
+b. Your contributed code may be used for commercial purposes, including but not limited to its cloud edition.
 
-4. ant-design
-Copyright (c) 2015-present Ant UED, https://xtech.antfin.com/
+Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0.
+Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
 
-5. ant-design-pro
-Copyright (c) 2019 Alipay.inc
+----------
 
-6. @ant-design/charts
-Copyright (c) 2021 Ant Design
-
-7. @ant-design/icons
-Copyright (c) 2018-present Ant UED, https://xtech.antfin.com/
-
-8. @antv/layout
-Copyright (c) 2018 Alipay.inc
-
-9. @antv/xflow
-Copyright (c) 2021-2023 Alipay.inc
-
-10. umi
-Copyright (c) 2017-present ChenCheng (sorrycc@gmail.com)
-
-11. @umijs/route-utils
-Copyright (c) 2019-present chenshuai2144 (qixian.cs@outlook.com)
-
-12. ahooks
-Copyright (c) 2020 ahooks
-
-13. axios
-Copyright (c) 2014-present Matt Zabriskie & Collaborators
-
-14. classnames
-Copyright (c) 2018 Jed Watson
-
-15. crypto-js
-Copyright (c) 2009-2013 Jeff Mott
-Copyright (c) 2013-2016 Evan Vosberg
-
-16. immutability-helper
-Copyright (c) 2017 Moshe Kolodny
-
-17. lodash
-Copyright JS Foundation and other contributors <https://js.foundation/>
-
-18. moment
-Copyright (c) JS Foundation and other contributors
-
-19. numeral
-Copyright (c) 2016 Adam Draper
-
-20. omit.js
-Copyright (c) 2016 Benjy Cui
-
-21. rc-menu
-Copyright (c) 2014-present yiminghe
-
-22. rc-util
-Copyright (c) 2014-present yiminghe
-Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
-
-23. react-ace
-Copyright (c) 2014 James Hrisho
-
-24. react-dev-inspector
-Copyright (c) zthxxx (https://blog.zthxxx.me)
-
-25. react-lazyload
-Copyright (c) 2015 Sen Yang
-
-26. react-spinners
-Copyright (c) 2017 David Hu
-
-27.react-split-pane
-Copyright (c) 2015 tomkp
-
-28. snappyjs
-Copyright (c) 2016 Zhipeng Jia
-
-29. sql-formatter
-Copyright (c) 2016-2020 ZeroTurnaround LLC
-Copyright (c) 2020-2021 George Leslie-Waksman and other contributors
-Copyright (c) 2021-Present inferrinizzard and other contributors
-
-30. @ant-design/pro-cli
-Copyright (c) 2017-2018 Alipay
-
-31. cross-env
-Copyright (c) 2017 Kent C. Dodds
-
-32.cross-port-killer
-Copyright (c) 2017 Rafael Milewski
-
-33.detect-installer
-Copyright (c) 2019-present chenshuai2144 (qixian.cs@outlook.com)
-
-34.eslint
-Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
-
-35.express
-Copyright (c) 2009-2014 TJ Holowaychuk <tj@vision-media.ca>
-Copyright (c) 2013-2014 Roman Shtylman <shtylman+expressjs@gmail.com>
-Copyright (c) 2014-2015 Douglas Christopher Wilson <doug@somethingdoug.com>
-
-36.gh-pages
-Copyright (c) 2014 Tim Schaub
-
-37.inflect
-Copyright (C) 2020 Pavan Kumar Sunkara
-
-38.lint-staged
-Copyright (c) 2016 Andrey Okonetchnikov
-
-39.prettier
-Copyright © James Long and contributors
-
-40.stylelint
-Copyright (c) 2015 - present Maxime Thirouin, David Clark & Richard Hallows
-
-41.umi-serve
-Copyright (c) 2017-present ChenCheng (sorrycc@gmail.com)
-
-42.webpack
-Copyright JS Foundation and other contributors
-
-43.react-dnd
-Copyright (c) 2015 Dan Abramov
-
-44.react-grid-layout
-Copyright (c) 2016 Samuel Reed
-
-45.slat
-Copyright © 2016–2023, Ian Storm Taylor
-
-46.html2canvas
-Copyright (c) 2012 Niklas von Hertzen
-
-47.core-js
-Copyright (c) 2014-2020 Denis Pushkarev
-
-48.immer 4.0.2
-Copyright (c) 2017 Michel Weststrate
-
-49.redux
-Copyright (c) 2015-present Dan Abramov
-The Redux logo is dedicated to the public domain and licensed under CC0.
-
-50.redux-saga
-Copyright (c) 2015 Yassine Elouafi
-The Redux-Saga logo is dedicated to the public domain and licensed under CC0.
-
-51.ts-loader
-Copyright (c) 2015 TypeStrong
-
-52.minimist
-Files：https://github.com/minimistjs/minimist/tree/v1.2.3
-License Details：https://github.com/minimistjs/minimist/blob/main/LICENSE
-
-53.intl
-copyright (c) 2013 Andy Earnshaw
-
-
-A copy of the MIT License is included in this file.
-
-
-Open Source Software Licensed under the Apache License Version 2.0:
---------------------------------------------------------------------
-1. HanLP
-Files: https://github.com/hankcs/HanLP/tree/v1.8.3
-License Details: https://github.com/hankcs/HanLP/blob/v1.8.3/LICENSE
-
-2. mybatis
- iBATIS
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Copyright 2010 The Apache Software Foundation
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-3. guava
-Files: https://github.com/google/guava/tree/v20.0
-License Details: https://github.com/google/guava/blob/master/LICENSE
-
-4. hadoop
-This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
-
-5. Jackson
-Files: https://github.com/FasterXML/jackson-core/tree/2.11
-License Details: https://github.com/FasterXML/jackson-core/blob/2.11/LICENSE
-
-6. commons-lang
-Apache Commons Lang
-Copyright 2001-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software from the Spring Framework,
-under the Apache License 2.0 (see: StringUtils.containsWhitespace())
-
-7. testng
-Files：https://github.com/testng-team/testng/tree/6.13.1
-License Details：https://github.com/testng-team/testng/blob/6.13.1/LICENSE.txt
-
-8. jackson-dataformat-yaml
-Files：https://github.com/FasterXML/jackson-dataformat-yaml/tree/jackson-dataformat-yaml-2.8.11
-License Details：https://www.apache.org/licenses/LICENSE-2.0.txt
-
-9. druid
-Copyright 1999-2018 Alibaba Group Holding Ltd.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-10. davinci
-Licensed to Apereo under one or more contributor license
-agreements. See the NOTICE file distributed with this work
-for additional information regarding copyright ownership.
-Apereo licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file
-except in compliance with the License.  You may obtain a
-copy of the License at the following location:
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-
-11. echarts
-Apache ECharts
-Copyright 2017-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-
-12. echarts-wordcloud
-Apache ECharts
-Copyright 2017-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-
-13. carlo
-Files：https://github.com/GoogleChromeLabs/carlo
-License Details：https://github.com/GoogleChromeLabs/carlo/blob/master/LICENSE
-
-14. puppeteer-core
-Copyright 2017 Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-15. swagger-ui-react
-swagger-ui
-Copyright 2020-2021 SmartBear Software Inc.
-
-16. typescript
-files：https://github.com/microsoft/TypeScript
-License Details：https://github.com/microsoft/TypeScript/blob/main/LICENSE.txt
-
-17. io.jsonwebtoken
-Copyright (C) 2014 jsonwebtoken.io
-Files: https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1.jar
-
-
-Terms of the Apache License Version 2.0:
---------------------------------------------------------------------
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-
-Open Source Software Licensed under the Modified BSD License:
---------------------------------------------------------------------
-1. node-sha1
-Copyright © 2009, Jeff Mott. All rights reserved.
-Copyright © 2011, Paul Vorbach. All rights reserved.
-
-This project is licensed under the terms of the Modified BSD License, as follows:
--------------------------------------------------------------------
-
-Copyright (c) 2005-2023, NumPy Developers.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-Neither the name oCrypto-JS nor the names of any contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-2. ace-builds
-Copyright (c) 2010, Ajax.org B.V.
-All rights reserved.
-
-This project is licensed under the terms of the Modified BSD License, as follows:
--------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Ajax.org B.V. nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Other Open Source Software：
---------------------------------------------------------------------
-1. jsencrypt
-Files：https://github.com/travist/jsencrypt
-License Details：https://github.com/travist/jsencrypt/blob/master/LICENSE.txt
-
-
-
-

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 AI+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.
 
@@ -75,7 +75,7 @@ SuperSonic comes with sample semantic models as well as chat conversations that
 
 ## Build and Development
 
-Please refer to project [Docs](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/). 
+Please refer to project [Docs](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E6%BA%90%E7%A0%81%E7%BC%96%E8%AF%91%E9%83%A8%E7%BD%B2/). 
 
 ## WeChat Contact
 

README_CN.md

@@ -75,7 +75,7 @@ SuperSonic自带样例的语义模型和问答对话，只需以下三步即可
 
 ## 如何构建和部署
 
-请参考项目[文档](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/)。
+请参考项目[文档](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E6%BA%90%E7%A0%81%E7%BC%96%E8%AF%91%E9%83%A8%E7%BD%B2/)。
 
 ## 微信联系方式
 

README_JP.md

@@ -71,7 +71,7 @@ SuperSonicには、サンプルのセマンティックモデルとチャット
 
 ## ビルドと開発
 
-プロジェクト[ドキュメント](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/)を参照してください。
+プロジェクト[ドキュメント](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E6%BA%90%E7%A0%81%E7%BC%96%E8%AF%91%E9%83%A8%E7%BD%B2/)を参照してください。
 
 ## WeChat連絡先
 

assembly/bin/supersonic-build.bat

@@ -40,13 +40,29 @@ 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.
+      ECHO Please check Maven and Java versions are compatible.
+      ECHO Current Java: %JAVA_HOME%
+      ECHO Current Maven: %MAVEN_HOME%
       EXIT /B 1
    )
+   
+   REM extract and copy files to deployment directory
+   cd %projectDir%\launchers\%model_name%\target
+   if exist "launchers-%model_name%-%MVN_VERSION%-bin.tar.gz" (
+       echo "Extracting launchers-%model_name%-%MVN_VERSION%-bin.tar.gz..."
+       tar -xf "launchers-%model_name%-%MVN_VERSION%-bin.tar.gz"
+       if exist "launchers-%model_name%-%MVN_VERSION%" (
+           echo "Copying files to deployment directory..."
+           xcopy /E /Y "launchers-%model_name%-%MVN_VERSION%\*" "%buildDir%\supersonic-%model_name%-%MVN_VERSION%\"
+       )
+   )
+   
    copy /y %projectDir%\launchers\%model_name%\target\*.tar.gz %buildDir%\
    echo "finished building supersonic-%model_name% service"
+   cd %baseDir%
    goto :EOF
 
 
@@ -72,22 +88,55 @@ if "%service%"=="webapp" (
    cd %buildDir%
    if exist %release_dir% rmdir /s /q %release_dir%
    if exist %release_dir%.zip del %release_dir%.zip
-   mkdir %release_dir%
-   rem package webapp
-   tar xvf supersonic-webapp.tar.gz
-   move /y supersonic-webapp webapp
-   echo {"env": ""} > webapp\supersonic.config.json
-   move /y webapp %release_dir%
-   rem package java service
-   tar xvf %service_name%-bin.tar.gz
-   for /d %%D in ("%service_name%\*") do (
-       move "%%D" "%release_dir%"
+   
+   rem check if release directory already exists from buildJavaService
+   if exist %release_dir% (
+       echo "Release directory already prepared by buildJavaService"
+   ) else (
+       mkdir %release_dir%
+       
+       rem package java service
+       tar xvf %service_name%-bin.tar.gz 2>nul
+       if errorlevel 1 (
+           echo "Warning: tar command failed, trying PowerShell extraction..."
+           powershell -Command "Expand-Archive -Path '%service_name%-bin.tar.gz' -DestinationPath '.' -Force"
+       )
+       for /d %%D in ("%service_name%\*") do (
+           move "%%D" "%release_dir%"
+       )
+       rmdir /s /q %service_name% 2>nul
    )
+   
+   rem package webapp
+   if exist supersonic-webapp.tar.gz (
+       tar xvf supersonic-webapp.tar.gz 2>nul
+       if errorlevel 1 (
+           echo "Warning: tar command failed, trying PowerShell extraction..."
+           powershell -Command "Expand-Archive -Path 'supersonic-webapp.tar.gz' -DestinationPath '.' -Force"
+       )
+       move /y supersonic-webapp webapp
+       echo {"env": ""} > webapp\supersonic.config.json
+       move /y webapp %release_dir%
+       del supersonic-webapp.tar.gz 2>nul
+   )
+   
+   rem verify deployment structure
+   if exist "%release_dir%\lib\launchers-%model_name%-%MVN_VERSION%.jar" (
+       echo "Deployment structure verified successfully"
+   ) else (
+       echo "Warning: Main jar file not found in deployment structure"
+       echo "Expected: %release_dir%\lib\launchers-%model_name%-%MVN_VERSION%.jar"
+   )
+   
    rem generate zip file
-   powershell Compress-Archive -Path %release_dir% -DestinationPath %release_dir%.zip
-   del %service_name%-bin.tar.gz
-   del supersonic-webapp.tar.gz
-   rmdir /s /q %service_name%
+   powershell -Command "Compress-Archive -Path '%release_dir%' -DestinationPath '%release_dir%.zip' -Force"
+   if errorlevel 1 (
+       echo "Warning: PowerShell compression failed, release directory still available: %release_dir%"
+   ) else (
+       echo "Successfully created release package: %release_dir%.zip"
+   )
+   
+   del %service_name%-bin.tar.gz 2>nul
    echo "finished packaging supersonic release"
    goto :EOF
 

assembly/bin/supersonic-build.sh

@@ -4,7 +4,13 @@ sbinDir=$(cd "$(dirname "$0")"; pwd)
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
 cd $projectDir
-MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version | grep -e '^[^\[]')
+
+MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | grep -v '^\[' | sed -n '/^[0-9]/p')
+if [ -z "$MVN_VERSION" ]; then
+  echo "Failed to retrieve Maven project version."
+  exit 1
+fi
+echo "Maven project version: $MVN_VERSION"
 
 cd $baseDir
 service=$1
@@ -15,7 +21,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
@@ -29,12 +35,17 @@ function buildWebapp {
   chmod +x $projectDir/webapp/start-fe-prod.sh
   cd $projectDir/webapp
   sh ./start-fe-prod.sh
-  cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
   # check build result
   if [ $? -ne 0 ]; then
       echo "Failed to build frontend webapp."
       exit 1
   fi
+  cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
+  # check build result
+  if [ $? -ne 0 ]; then
+      echo "Failed to get supersonic webapp package."
+      exit 1
+  fi
   echo "finished building supersonic webapp"
 }
 
@@ -50,6 +61,11 @@ function packageRelease {
   # package webapp
   tar xvf supersonic-webapp.tar.gz
   mv supersonic-webapp webapp
+  # check webapp build result
+  if [ $? -ne 0 ]; then
+      echo "Failed to get supersonic webapp package."
+      exit 1
+  fi
   json='{"env": "''"}'
   echo $json > webapp/supersonic.config.json
   mv webapp $release_dir/

assembly/bin/supersonic-daemon.bat

@@ -4,6 +4,7 @@ chcp 65001
 
 set "sbinDir=%~dp0"
 call %sbinDir%/supersonic-common.bat %*
+call %sbinDir%/supersonic-env.bat %*
 
 set "command=%~1"
 set "service=%~2"
@@ -14,12 +15,14 @@ if "%service%"=="" (
 )
 
 if "%profile%"=="" (
-   set "profile=local"
+   set "profile=%S2_DB_TYPE%"
 )
 
 set "model_name=%service%"
 
-cd %baseDir%
+REM fix path configuration - point to the correct release package directory
+set "releaseDir=%buildDir%\supersonic-%service%-1.0.0-SNAPSHOT"
+cd %releaseDir%
 
 if "%command%"=="restart" (
    call :stop
@@ -49,19 +52,58 @@ if "%command%"=="restart" (
 
 :runJavaService
    echo 'java service starting, see logs in logs/'
-   set "libDir=%baseDir%\lib"
-   set "confDir=%baseDir%\conf"
-   set "webDir=%baseDir%\webapp"
-   set "logDir=%baseDir%\logs"
-   set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%"
-   set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Xms1024m -Xmx1024m -cp %CLASSPATH% %MAIN_CLASS%"
+   echo 'Using release directory: %releaseDir%'
+   
+   REM use release package directory as base path
+   set "libDir=%releaseDir%\lib"
+   set "confDir=%releaseDir%\conf"
+   set "webDir=%releaseDir%\webapp"
+   set "logDir=%releaseDir%\logs"
+   
+   REM fix variable name matching problem
+   set "CLASSPATH=%releaseDir%;%webDir%;%libDir%\*;%confDir%"
+   set "MAIN_CLASS=%main_class%"
+   
+   REM add port configuration
+   set "property=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Dserver.port=9080"
+   set "java_command=%property% -Xms1024m -Xmx2048m -cp "%CLASSPATH%" %MAIN_CLASS%"
+   
    if not exist %logDir% mkdir %logDir%
-   start /B java %java-command% >nul 2>&1
-   timeout /t 10 >nul
+   
+   REM check if the main jar file exists
+   if not exist "%libDir%\launchers-standalone-1.0.0-SNAPSHOT.jar" (
+       echo "Error: Main jar file not found in %libDir%"
+       echo "Please make sure the application has been built and packaged correctly."
+       goto :EOF
+   )
+   
+   echo 'Main Class: %MAIN_CLASS%'
+   echo 'Profile: %profile%'
+   echo 'Starting Java service...'
+   
+   REM start service and save logs
+   start /B java %java_command% > "%logDir%\supersonic.log" 2>&1
+   timeout /t 15 >nul
+   
+   REM check service status
+   netstat -an | findstr ":9080" >nul
+   if errorlevel 1 (
+       echo "Warning: Port 9080 is not listening"
+       echo "Please check the log file: %logDir%\supersonic.log"
+       if exist "%logDir%\supersonic.log" (
+           echo "Recent log entries:"
+           powershell -Command "Get-Content '%logDir%\supersonic.log' | Select-Object -Last 10"
+       )
+   ) else (
+       echo "Service started successfully on port 9080"
+       echo "You can access the application at: http://localhost:9080"
+   )
+   
    echo 'java service started'
    goto :EOF
 
 :stopJavaService
+   echo 'Stopping Java service...'
    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
             taskkill /PID %%i /F
             echo "java service (PID = %%i) is killed."

assembly/bin/supersonic-daemon.sh

@@ -2,6 +2,7 @@
 
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 source $sbinDir/supersonic-common.sh
+source $sbinDir/supersonic-env.sh
 
 command=$1
 service=$2
@@ -12,7 +13,7 @@ if [ -z "$service"  ]; then
 fi
 
 if [ -z "$profile" ]; then
-  profile="local"
+  profile=${S2_DB_TYPE}
 fi
 
 model_name=$service
@@ -59,7 +60,8 @@ function runJavaService {
     JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
   fi
   export PATH=$JAVA_HOME/bin:$PATH
-  command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dapp_name=${local_app_name} -Xms1024m -Xmx1024m $main_class"
+  command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08
+  -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m -XX:+UseZGC -XX:+ZGenerational $main_class"
 
   mkdir -p $javaRunDir/logs
   java -Dspring.profiles.active="$profile" $command >/dev/null 2>$javaRunDir/logs/error.log &

assembly/bin/supersonic-docker-compose.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+export SUPERSONIC_VERSION=latest
+
+docker-compose -f docker-compose.yml -p supersonic up

assembly/bin/supersonic-docker-run.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+export SUPERSONIC_VERSION=latest
+
+#### Set below DB configs to connect to your own database
+# Supported DB_TYPE:  h2, mysql, postgres
+export S2_DB_TYPE=h2
+export S2_DB_HOST=
+export S2_DB_PORT=
+export S2_DB_USER=
+export S2_DB_PASSWORD=
+export S2_DB_DATABASE=
+
+docker run --rm -it -d \
+  --name supersonic_standalone \
+  -p 9080:9080 \
+  -e S2_DB_TYPE=${S2_DB_TYPE} \
+  -e S2_DB_HOST=${S2_DB_HOST} \
+  -e S2_DB_PORT=${S2_DB_PORT} \
+  -e S2_DB_USER=${S2_DB_USER} \
+  -e S2_DB_PASSWORD=${S2_DB_PASSWORD} \
+  -e S2_DB_DATABASE=${S2_DB_DATABASE} \
+  supersonicbi/supersonic:${SUPERSONIC_VERSION}

assembly/bin/supersonic-env.bat

@@ -0,0 +1,8 @@
+:: Set below DB configs to connect to your own database
+:: Supported DB_TYPE:  h2, mysql, postgres
+set "S2_DB_TYPE=h2"
+set "S2_DB_HOST="
+set "S2_DB_PORT="
+set "S2_DB_USER="
+set "S2_DB_PASSWORD="
+set "S2_DB_DATABASE="

assembly/bin/supersonic-env.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+#### Set below DB configs to connect to your own database
+# Comment out below exports to config your DB connection
+# Supported DB_TYPE:  h2, mysql, postgres
+#export S2_DB_TYPE=h2
+#export S2_DB_HOST=
+#export S2_DB_PORT=
+#export S2_DB_USER=
+#export S2_DB_PASSWORD=
+#export S2_DB_DATABASE=

auth/api/pom.xml

@@ -34,8 +34,8 @@
     </dependencies>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
 </project>

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 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 jakarta.servlet.http.HttpServletRequest;
 
 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();
@@ -21,6 +21,8 @@ public interface UserAdaptor {
 
     void register(UserReq userReq);
 
+    void deleteUser(long userId);
+
     String login(UserReq userReq, HttpServletRequest request);
 
     String login(UserReq userReq, String appKey);
@@ -28,4 +30,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);
 }

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 {
-
 }

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;
@@ -19,6 +18,9 @@ public class AuthenticationConfig {
     @Value("${s2.authentication.include.path:/api}")
     private String includePath;
 
+    @Value("${s2.authentication.strategy:http}")
+    private String strategy;
+
     @Value("${s2.authentication.enable:false}")
     private boolean enabled;
 
@@ -48,8 +50,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()));
     }
 }

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";
-
 }

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;
-
 }

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;
+}

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java

@@ -1,7 +1,20 @@
 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_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;
 
 @Data
 @AllArgsConstructor
@@ -9,14 +22,27 @@ public class UserWithPassword extends User {
 
     private String password;
 
-    public UserWithPassword(Long id, String name, String displayName, String email, String password, Integer isAdmin) {
-        super(id, name, displayName, email, isAdmin);
+    public UserWithPassword(Long id, String name, String displayName, String email, String password,
+            Integer isAdmin) {
+        super(id, name, displayName, email, isAdmin, null);
         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_EMAIL, StringUtils.isEmpty(user.getEmail()) ? "" : user.getEmail());
+        claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName());
+        claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
+        claims.put(TOKEN_IS_ADMIN, user.getIsAdmin());
+        return claims;
+    }
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.auth.api.authentication.request;
 
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data
@@ -13,5 +13,6 @@ public class UserReq {
     @NotBlank(message = "password can not be null")
     private String password;
 
-
+    @NotBlank(message = "password can not be null")
+    private String newPassword;
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserTokenReq.java

@@ -0,0 +1,14 @@
+package com.tencent.supersonic.auth.api.authentication.request;
+
+import jakarta.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;
+
+}

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java

@@ -1,17 +1,21 @@
 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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 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();
 
@@ -19,6 +23,8 @@ public interface UserService {
 
     void register(UserReq userCmd);
 
+    void deleteUser(long userId);
+
     String login(UserReq userCmd, HttpServletRequest request);
 
     String login(UserReq userCmd, String appKey);
@@ -28,4 +34,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);
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java

@@ -1,16 +1,16 @@
 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;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface UserStrategy {
 
+    String getStrategyName();
+
     boolean accept(boolean isEnableAuthentication);
 
     User findUser(HttpServletRequest request, HttpServletResponse response);
 
     User findUser(String token, String appKey);
-
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java

@@ -1,12 +1,12 @@
 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.pojo.User;
 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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.util.CollectionUtils;
 
 public final class UserHolder {
@@ -36,5 +36,4 @@ public final class UserHolder {
         }
         return user;
     }
-
 }

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;
 }

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;

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java

@@ -4,19 +4,24 @@ 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 jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -49,14 +54,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);
@@ -87,25 +92,95 @@ public class DefaultUserAdaptor implements UserAdaptor {
         userRepository.addUser(userDO);
     }
 
+    @Override
+    public void deleteUser(long userId) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        userRepository.deleteUser(userId);
+    }
+
     @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);
+            String token = tokenService.generateToken(UserWithPassword.convert(user), appKey);
+            updateLastLogin(userReq.getName());
+            return token;
         } 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 +190,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 +212,77 @@ 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());
+
+        // 使用令牌名称作为生成key ，这样可以区分正常请求和api 请求，api 的令牌失效时间很长，需考虑令牌泄露的情况
+        String token = tokenService.generateToken(UserWithPassword.convert(userWithPassword),
+                "SysDbToken:" + name, (new Date().getTime() + 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;
+    }
+
+    private void updateLastLogin(String userName) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+        UserDO userDO = userRepository.getUser(userName);
+        userDO.setLastLogin(new Timestamp(System.currentTimeMillis()));
+        userRepository.updateUser(userDO);
+    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java

@@ -1,35 +1,24 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
 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.common.util.S2ThreadContext;
+import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.authentication.utils.TokenService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.connector.RequestFacade;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.http.MimeHeaders;
 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;
 
 @Slf4j
 public abstract class AuthenticationInterceptor implements HandlerInterceptor {
 
-
     protected AuthenticationConfig authenticationConfig;
 
-    protected UserServiceImpl userServiceImpl;
+    protected UserService userService;
 
-    protected UserTokenUtils userTokenUtils;
-
-
-    protected S2ThreadContext s2ThreadContext;
+    protected TokenService tokenService;
 
     protected boolean isExcludedUri(String uri) {
         String excludePathStr = authenticationConfig.getExcludePath();
@@ -55,51 +44,4 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
         return includePaths.stream().anyMatch(uri::startsWith);
     }
 
-    protected boolean isInternalRequest(HttpServletRequest request) {
-        String internal = request.getHeader(UserConstants.INTERNAL);
-        return "true".equalsIgnoreCase(internal);
-    }
-
-    protected boolean isAppRequest(HttpServletRequest request) {
-        String appId = request.getHeader(authenticationConfig.getAppId());
-        return StringUtils.isNotBlank(appId);
-    }
-
-    protected void reflectSetParam(HttpServletRequest request, String key, String value) {
-        try {
-            if (request instanceof StandardMultipartHttpServletRequest) {
-                RequestFacade servletRequest =
-                        (RequestFacade) ((StandardMultipartHttpServletRequest) request).getRequest();
-                Class<? extends HttpServletRequest> servletRequestClazz = servletRequest.getClass();
-                Field request1 = servletRequestClazz.getDeclaredField("request");
-                request1.setAccessible(true);
-                Object o = request1.get(servletRequest);
-                Field coyoteRequest = o.getClass().getDeclaredField("coyoteRequest");
-                coyoteRequest.setAccessible(true);
-                Object o1 = coyoteRequest.get(o);
-                Field headers = o1.getClass().getDeclaredField("headers");
-                headers.setAccessible(true);
-                MimeHeaders o2 = (MimeHeaders) headers.get(o1);
-                if (o2.getValue(key) != null) {
-                    o2.setValue(key).setString(value);
-                } else {
-                    o2.addValue(key).setString(value);
-                }
-            } else {
-                Class<? extends HttpServletRequest> requestClass = request.getClass();
-                Field request1 = requestClass.getDeclaredField("request");
-                request1.setAccessible(true);
-                Object o = request1.get(request);
-                Field coyoteRequest = o.getClass().getDeclaredField("coyoteRequest");
-                coyoteRequest.setAccessible(true);
-                Object o1 = coyoteRequest.get(o);
-                Field headers = o1.getClass().getDeclaredField("headers");
-                headers.setAccessible(true);
-                MimeHeaders o2 = (MimeHeaders) headers.get(o1);
-                o2.addValue(key).setString(value);
-            }
-        } catch (Exception e) {
-            log.error("reflectSetParam error:", e);
-        }
-    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java

@@ -1,45 +1,36 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
-
 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.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.authentication.utils.TokenService;
 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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 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.*;
 
 @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);
-        s2ThreadContext = ContextUtils.getBean(S2ThreadContext.class);
+        userService = ContextUtils.getBean(UserService.class);
+        tokenService = ContextUtils.getBean(TokenService.class);
         if (!authenticationConfig.isEnabled()) {
-            setFakerUser(request);
-            return true;
-        }
-        if (isInternalRequest(request)) {
-            setFakerUser(request);
-            return true;
-        }
-        if (isAppRequest(request)) {
-            setFakerUser(request);
             return true;
         }
+
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();
@@ -58,26 +49,26 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
             return true;
         }
 
-        UserWithPassword user = userTokenUtils.getUserWithPassword(request);
-        if (StringUtils.isNotBlank(user.getName())) {
-            setContext(user.getName(), request);
+        UserWithPassword user = getUserWithPassword(request);
+        if (user != null) {
             return true;
         }
         throw new AccessException("authentication failed, please login");
     }
 
-    private void setFakerUser(HttpServletRequest request) {
-        String token = userTokenUtils.generateAdminToken(request);
-        reflectSetParam(request, authenticationConfig.getTokenHttpHeaderKey(), token);
-        setContext(User.getFakeUser().getName(), 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);
     }
-
-    private void setContext(String userName, HttpServletRequest request) {
-        ThreadContext threadContext = ThreadContext.builder()
-                .token(request.getHeader(authenticationConfig.getTokenHttpHeaderKey()))
-                .userName(userName)
-                .build();
-        s2ThreadContext.set(threadContext);
-    }
-
 }

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");
         }
     }
-
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java

@@ -1,139 +1,55 @@
 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.sql.Timestamp;
+
+@Data
+@TableName("s2_user")
 public class UserDO {
-    /**
-     * 
-     */
+
+    @TableId(type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 
-     */
+    /** */
     private String name;
 
-    /**
-     * 
-     */
+    /** */
     private String password;
 
     private String salt;
 
-    /**
-     * 
-     */
+    /** */
     private String displayName;
 
-    /**
-     * 
-     */
+    /** */
     private String email;
 
-    /**
-     * 
-     */
+    /** */
     private Integer isAdmin;
 
-    /**
-     * 
-     * @return id 
-     */
-    public Long getId() {
-        return id;
-    }
+    private Timestamp lastLogin;
 
-    /**
-     * 
-     * @param id 
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 
-     * @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 
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * 
-     * @param password 
-     */
+    /** @param password */
     public void setPassword(String password) {
         this.password = password == null ? null : password.trim();
     }
 
-    public String getSalt() {
-        return salt;
-    }
-
     public void setSalt(String salt) {
         this.salt = salt == null ? null : salt.trim();
     }
 
-    /**
-     * 
-     * @return display_name 
-     */
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    /**
-     * 
-     * @param displayName 
-     */
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName == null ? null : displayName.trim();
-    }
-
-    /**
-     * 
-     * @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 
-     */
-    public Integer getIsAdmin() {
-        return isAdmin;
-    }
-
-    /**
-     * 
-     * @param isAdmin 
-     */
-    public void setIsAdmin(Integer isAdmin) {
-        this.isAdmin = isAdmin;
-    }
 }

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;

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;
+}

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java

@@ -1,22 +1,17 @@
 package com.tencent.supersonic.auth.authentication.persistence.mapper;
 
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 {
+public interface UserDOMapper extends BaseMapper<UserDO> {
 
-    /**
-     * @mbg.generated
-     */
-    int insert(UserDO record);
-
-    /**
-     * @mbg.generated
-     */
     List<UserDO> selectByExample(UserDOExample example);
 
+    void updateByPrimaryKey(UserDO userDO);
 }

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> {
+
+}

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);
-    }
-
-}

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,21 @@ 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);
+
+    UserTokenDO getUserTokenByName(String tokenName);
+
+    void deleteUserTokenByName(String userName);
+
+    void deleteUserToken(Long tokenId);
+
+    void deleteUser(long userId);
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java

@@ -0,0 +1,91 @@
+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.lambda().eq(UserTokenDO::getUserName, 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 UserTokenDO getUserTokenByName(String tokenName) {
+        QueryWrapper<UserTokenDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(UserTokenDO::getName, tokenName);
+        return userTokenDOMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void deleteUserTokenByName(String userName) {
+        QueryWrapper<UserTokenDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(UserTokenDO::getUserName, userName);
+        userTokenDOMapper.delete(queryWrapper);
+    }
+
+    @Override
+    public void deleteUserToken(Long tokenId) {
+        userTokenDOMapper.deleteById(tokenId);
+    }
+
+    @Override
+    public void deleteUser(long userId) {
+        userDOMapper.deleteById(userId);
+    }
+}

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java

@@ -1,20 +1,16 @@
 package com.tencent.supersonic.auth.authentication.rest;
 
-
 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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;
 
@@ -30,7 +26,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);
     }
 
@@ -64,9 +61,49 @@ public class UserController {
         userService.register(userCmd);
     }
 
+    @DeleteMapping("/delete/{userId}")
+    public void delete(@PathVariable("userId") long userId, HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse) throws IllegalAccessException {
+        User user = userService.getCurrentUser(httpServletRequest, httpServletResponse);
+        if (user.getIsAdmin() != 1) {
+            throw new IllegalAccessException("only admin can delete user");
+        }
+        userService.deleteUser(userId);
+    }
+
     @PostMapping("/login")
     public String login(@RequestBody UserReq userCmd, HttpServletRequest request) {
         return userService.login(userCmd, request);
     }
 
+    @PostMapping("/resetPassword")
+    public void resetPassword(@RequestBody UserReq userCmd, HttpServletRequest request,
+            HttpServletResponse response) {
+        User user = userService.getCurrentUser(request, response);
+        userService.resetPassword(user.getName(), userCmd.getPassword(), userCmd.getNewPassword());
+    }
+
+    @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);
+    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java

@@ -1,17 +1,19 @@
 package com.tencent.supersonic.auth.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.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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 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 +27,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();
@@ -67,6 +70,11 @@ public class UserServiceImpl implements UserService {
         ComponentFactory.getUserAdaptor().register(userReq);
     }
 
+    @Override
+    public void deleteUser(long userId) {
+        ComponentFactory.getUserAdaptor().deleteUser(userId);
+    }
+
     @Override
     public String login(UserReq userReq, HttpServletRequest request) {
         return ComponentFactory.getUserAdaptor().login(userReq, request);
@@ -77,4 +85,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);
+    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java

@@ -1,15 +1,21 @@
 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.common.pojo.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 
 @Service
 public class FakeUserStrategy implements UserStrategy {
 
+    public static final String STRATEGY_NAME = "fake";
+
+    @Override
+    public String getStrategyName() {
+        return STRATEGY_NAME;
+    }
+
     @Override
     public boolean accept(boolean isEnableAuthentication) {
         return !isEnableAuthentication;
@@ -17,12 +23,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();
     }
-
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java

@@ -1,22 +1,29 @@
 package com.tencent.supersonic.auth.authentication.strategy;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+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.UserTokenUtils;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.tencent.supersonic.auth.authentication.utils.TokenService;
+import com.tencent.supersonic.common.pojo.User;
+import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
 
 @Service
 public class HttpHeaderUserStrategy implements UserStrategy {
 
+    public static final String STRATEGY_NAME = "http";
+    private final TokenService tokenService;
 
-    private final UserTokenUtils userTokenUtils;
+    public HttpHeaderUserStrategy(TokenService tokenService) {
+        this.tokenService = tokenService;
+    }
 
-
-    public HttpHeaderUserStrategy(UserTokenUtils userTokenUtils) {
-        this.userTokenUtils = userTokenUtils;
+    @Override
+    public String getStrategyName() {
+        return STRATEGY_NAME;
     }
 
     @Override
@@ -26,11 +33,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);
+    }
+
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/UserStrategyFactory.java

@@ -4,33 +4,49 @@ package com.tencent.supersonic.auth.authentication.strategy;
 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 jakarta.annotation.PostConstruct;
 import lombok.Data;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
+import java.util.Optional;
 
 @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;
     }
 
     @PostConstruct
     public void setUserStrategy() {
-        for (UserStrategy userStrategy : userStrategyList) {
-            if (userStrategy.accept(authenticationConfig.isEnabled())) {
-                UserHolder.setStrategy(userStrategy);
+
+        boolean enabled = authenticationConfig.isEnabled();
+        if (!enabled) {
+            for (UserStrategy userStrategy : userStrategyList) {
+                if (userStrategy.accept(authenticationConfig.isEnabled())) {
+                    UserHolder.setStrategy(userStrategy);
+                }
             }
+            return;
+        }
+
+        String strategy = authenticationConfig.getStrategy();
+        Optional<UserStrategy> strategyOptional = userStrategyList.stream()
+                .filter(t -> t.accept(true) && strategy.equalsIgnoreCase(t.getStrategyName()))
+                .findAny();
+
+        if (strategyOptional.isPresent()) {
+            UserHolder.setStrategy(strategyOptional.get());
+        } else {
+            throw new IllegalStateException("strategy is not found: " + strategy);
         }
     }
 }

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);
     }
-
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/TokenService.java

@@ -0,0 +1,163 @@
+package com.tencent.supersonic.auth.authentication.utils;
+
+
+
+import javax.crypto.spec.SecretKeySpec;
+
+import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
+import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserTokenDO;
+import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import com.tencent.supersonic.common.pojo.exception.AccessException;
+import com.tencent.supersonic.common.util.ContextUtils;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+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 {
+            if (StringUtils.isNotBlank(appKey) && appKey.startsWith("SysDbToken:")) {// 如果是配置的长期令牌，需校验数据库是否存在该配置
+                UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
+                UserTokenDO dbToken =
+                        userRepository.getUserTokenByName(appKey.substring("SysDbToken:".length()));
+                if (dbToken == null || !dbToken.getToken().equals(token.replace("Bearer ", ""))) {
+                    throw new AccessException("Token does not exist :" + appKey);
+                }
+            }
+            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)) {
+            if (StringUtils.isNotBlank(appKey) && appKey.startsWith("SysDbToken:")) { // 是配置的长期令牌
+                String realAppKey = appKey.substring("SysDbToken:".length());
+                String tmp =
+                        "WIaO9YRRVt+7QtpPvyWsARFngnEcbaKBk783uGFwMrbJBaochsqCH62L4Kijcb0sZCYoSsiKGV/zPml5MnZ3uQ==";
+                if (tmp.length() <= realAppKey.length()) {
+                    return realAppKey;
+                } else {
+                    return realAppKey + tmp.substring(realAppKey.length());
+                }
+            }
+            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();
+    }
+}

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;
-    }
-}

auth/authentication/src/main/resources/mapper/UserDOMapper.xml

@@ -9,6 +9,7 @@
     <result column="display_name" jdbcType="VARCHAR" property="displayName" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="is_admin" jdbcType="INTEGER" property="isAdmin" />
+    <result column="last_login" jdbcType="TIMESTAMP" property="lastLogin" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -40,7 +41,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, password, salt, display_name, email, is_admin
+    id, name, password, salt, display_name, email, is_admin, last_login
   </sql>
   <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
     select
@@ -59,14 +60,6 @@
       limit #{limitStart} , #{limitEnd}
     </if>
   </select>
-  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    insert into s2_user (id, name, password, salt,
-      display_name, email, is_admin
-      )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR},
-      #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{isAdmin,jdbcType=INTEGER}
-      )
-  </insert>
   <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -122,4 +115,32 @@
       <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>
+      <if test="lastLogin != null">
+        last_login = #{lastLogin,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>

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>

auth/authorization/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>auth-authorization</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java

@@ -1,14 +1,13 @@
 package com.tencent.supersonic.auth.authorization.rest;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
 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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +16,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 +35,7 @@ public class AuthController {
         return authService.queryAuthGroups(modelId, groupId);
     }
 
-    /**
-     * 新建权限组
-     */
+    /** 新建权限组 */
     @PostMapping("/createGroup")
     public void newAuthGroup(@RequestBody AuthGroup group) {
         group.setGroupId(null);
@@ -69,8 +68,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);
     }

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;
     }
-
 }

benchmark/benchmark.py

@@ -15,6 +15,68 @@ import requests
 import time
 import jwt
 import traceback
+import os
+from datetime import datetime
+
+
+class DataFrameAppender:
+    def __init__(self,file_name = "output"):
+        # 定义表头
+        columns = ['问题', '解析状态', '解析耗时', '执行状态', '执行耗时', '总耗时']
+        # 创建只有表头的 DataFrame
+        self.df = pd.DataFrame(columns=columns)
+        self.file_name = file_name
+
+    def append_data(self, new_data):
+        # 假设 new_data 是一维数组，将其转换为字典
+        columns = ['问题', '解析状态', '解析耗时', '执行状态', '执行耗时', '总耗时']
+        new_dict = dict(zip(columns, new_data))
+        # 使用 loc 方法追加数据
+        self.df.loc[len(self.df)] = new_dict
+    def print_analysis_result(self):
+        # 测试样例总数
+        total_samples = len(self.df)
+
+        # 解析成功数量
+        parse_success_count = (self.df['解析状态'] == '解析成功').sum()
+
+        # 执行成功数量
+        execute_success_count = (self.df['执行状态'] == '执行成功').sum()
+
+        # 解析平均耗时，保留两位小数
+        avg_parse_time = round(self.df['解析耗时'].mean(), 2)
+
+        # 执行平均耗时，保留两位小数
+        avg_execute_time = round(self.df['执行耗时'].mean(), 2)
+
+        # 总平均耗时，保留两位小数
+        avg_total_time = round(self.df['总耗时'].mean(), 2)
+
+        # 最长耗时，保留两位小数
+        max_time = round(self.df['总耗时'].max(), 2)
+
+        # 最短耗时，保留两位小数
+        min_time = round(self.df['总耗时'].min(), 2)
+
+        print(f"测试样例总数 : {total_samples}")
+        print(f"解析成功数量 : {parse_success_count}")
+        print(f"执行成功数量 : {execute_success_count}")
+        print(f"解析平均耗时 : {avg_parse_time} 秒")
+        print(f"执行平均耗时 : {avg_execute_time} 秒")
+        print(f"总平均耗时 : {avg_total_time} 秒")
+        print(f"最长耗时 : {max_time} 秒")
+        print(f"最短耗时 : {min_time} 秒")
+
+    def write_to_csv(self):
+        # 检查 data 文件夹是否存在，如果不存在则创建
+        if not os.path.exists('res'):
+            os.makedirs('res')
+        # 获取当前时间戳
+        timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
+        # 生成带时间戳的文件名
+        file_path = os.path.join('res', f'{self.file_name}_{timestamp}.csv')
+        self.df.to_csv(file_path, index=False)
+        print(f"测试结果已保存到 {file_path}")
 
 class BatchTest:
     def __init__(self, url, agentId, chatId, userName):
@@ -38,9 +100,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,
@@ -69,18 +132,35 @@ class BatchTest:
 def benchmark(url:str, agentId:str, chatId:str, filePath:str, userName:str):
     batch_test = BatchTest(url, agentId, chatId, userName)
     df = batch_test.read_question_from_csv(filePath)
+    appender = DataFrameAppender(os.path.basename(filePath))
     for index, row in df.iterrows():
         question = row['question']
         print('start to ask question:', question)
         # 捕获异常，防止程序中断
         try:
             parse_resp = batch_test.parse(question)
-            batch_test.execute(question, parse_resp['data']['queryId'])
+            parse_status = '解析失败'
+            if parse_resp.get('data').get('errorMsg') is None:
+                parse_status = '解析成功'
+            parse_cost = parse_resp.get('data').get('parseTimeCost').get('parseTime')
+            execute_resp = batch_test.execute(agentId, question, parse_resp['data']['queryId'])
+            execute_status = '执行失败'
+            execute_cost = 0
+            if parse_status == '解析成功' and execute_resp.get('data').get('errorMsg') is None:
+                execute_status = '执行成功'
+                execute_cost = execute_resp.get('data').get('queryTimeCost')
+            res = [question.replace(',', '#'),parse_status,parse_cost/1000,execute_status,execute_cost/1000,(parse_cost+execute_cost)/1000]
+            appender.append_data(res)
+
         except Exception as e:
             print('error:', e)
             traceback.print_exc()
             continue
         time.sleep(1)
+    # 打印分析结果
+    appender.print_analysis_result()
+    # 分析明细输出
+    appender.write_to_csv()
 
 if __name__ == '__main__':
 

benchmark/requirements.txt

@@ -1,4 +1,4 @@
-pandas==2.0.3
+pandas==2.2.2
 PyJWT==2.8.0
 requests==2.28.2
 

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 + "]");
+    }
 }

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;
 }

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;
-
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java

@@ -1,35 +1,23 @@
 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;
-
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigEditReqReq.java

@@ -2,7 +2,6 @@ package com.tencent.supersonic.chat.api.pojo.request;
 
 import lombok.Data;
 
-
 @Data
 public class ChatConfigEditReqReq extends ChatConfigBaseReq {
 

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 {

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<>();
-
-
 }

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;
-
 }

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;
-
 }

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;
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryDeleteReq.java

@@ -0,0 +1,19 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatMemoryDeleteReq {
+
+    private List<Long> ids;
+
+    private Integer agentId;
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryFilter.java

@@ -17,6 +17,8 @@ public class ChatMemoryFilter {
 
     private Integer agentId;
 
+    private Long queryId;
+
     private String question;
 
     private List<String> questions;
@@ -27,4 +29,10 @@ public class ChatMemoryFilter {
 
     private MemoryReviewResult humanReviewRet;
 
+    private String sort = "desc";
+    private String orderCondition;
+
+    public boolean isAsc() {
+        return "asc".equalsIgnoreCase(sort);
+    }
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java

@@ -1,15 +1,18 @@
 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 jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-
-import javax.validation.constraints.NotNull;
+import lombok.NoArgsConstructor;
 
 @Data
-public class ChatMemoryUpdateReq extends RecordInfo {
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatMemoryUpdateReq {
 
     @NotNull(message = "id不可为空")
     private Long id;
@@ -24,4 +27,7 @@ public class ChatMemoryUpdateReq extends RecordInfo {
 
     private String humanReviewCmt;
 
+    private MemoryReviewResult llmReviewRet;
+
+    private String llmReviewCmt;
 }

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;
 }

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;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/Entity.java

@@ -1,29 +0,0 @@
-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
- */
-@Data
-@AllArgsConstructor
-@ToString
-@NoArgsConstructor
-public class Entity {
-
-    /**
-     * uniquely identifies an entity
-     */
-    private Long entityId;
-
-    /**
-     * entity name list
-     */
-    private List<String> names;
-
-
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibility.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.ToString;
 
 @Data
-@ToString
 public class ItemNameVisibility {
 
     private ItemNameVisibilityInfo aggVisibilityInfo;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemNameVisibilityInfo.java

@@ -6,18 +6,12 @@ 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<>();
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ItemVisibility.java

@@ -1,22 +1,17 @@
 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<>();
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeAdvancedConfig.java

@@ -5,9 +5,7 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * advanced knowledge config
- */
+/** advanced knowledge config */
 @Data
 public class KnowledgeAdvancedConfig {
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/KnowledgeInfoReq.java

@@ -1,35 +1,23 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
-
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.constraints.NotNull;
 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;
 }

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();
-
 }

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

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;

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;
-
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/RecommendedQuestionReq.java

@@ -6,11 +6,9 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 @Data
-@ToString
 @AllArgsConstructor
 @NoArgsConstructor
 public class RecommendedQuestionReq {
 
     private String question;
-
 }

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;
-
 }

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;
-
 }