(feature)(headless) Add tag query api (#790)

(improvement)(project) merge master to dev-0.9

.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: supersonic CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Test with Maven
+      run: mvn test

.gitignore

@@ -14,4 +14,7 @@ assembly/runtime/*
 *.umi/
 /assembly/deploy
 /runtime
-**/.flattened-pom.xml
+**/.flattened-pom.xml
+chm_db/
+__pycache__/
+/dict

CHANGELOG.md

@@ -4,7 +4,76 @@
 - "Breaking Changes" describes any changes that may break existing functionality or cause
   compatibility issues with previous versions.
 
+## SuperSonic [0.8.6] - 2024-02-23
 
+### Added
+- support view abstraction to Headless.
+- add the Metric API to Headless and optimizing the Headless API.
+- add integration tests to Headless.
+- add TimeCorrector to Chat.
+
+## SuperSonic [0.8.4] - 2024-01-19
+
+### Added
+- support creating derived metrics.
+  - Support creating metrics using three methods: by measure, metric, and field expressions.
+- added support for postgresql data source.
+- code adjustment and abstract optimization for chat and headless.
+
+## SuperSonic [0.8.2] - 2023-12-18
+
+### Added
+- rewrite Python service with Java project, default to Java implementation.
+- support setting the SQL generation method for large models in the interface.
+- optimization of metric market experience.
+- optimization of semantic modeling canvas experience.
+- code structure adjustment and abstraction optimization for chat.
+
+## SuperSonic [0.7.5] - 2023-10-13
+
+### Added
+- add SQL generation improvement optimization, support LLM SQL, Logic SQL, and Physical SQL display.
+- add showcase functionality to support recommending similar questions.
+- add frontend modification of filtering conditions and re-querying feature.
+- support nested query functionality in semantic.
+- support switching queries between multiple parsers in the frontend.
+
+### Updated
+- optimizing the build and deployment of the project.
+- overall optimization of the SQL Corrector functionality.
+
+### Fixed
+- fix execute error on mysql <=5.7
+  
+## SuperSonic [0.7.4] - 2023-09-10
+  
+### Added
+- add llm parser config
+- add datasource agg_time option
+- add function name adaptor in clickhouse
+- add dimension and metric show in dsl
+  
+### Updated
+- update user guide doc
+- update query building of plugin in default model
+- update some core API constructs to keep naming consistency
+- update ConfigureDemo config
+- update the association mechanism so that invisible dimensions and metrics will no longer be associated
+
+### Fixed
+- fix hasAggregateFunction logic in SqlParserSelectHelper
+
+## SuperSonic [0.7.3] - 2023-08-29
+
+### Added
+- meet checkstyle code requirements
+- save parseInfo after parsing
+- add time statistics
+- add agent
+
+### Updated
+- dsl where condition is used for front-end display
+- dsl remove context inheritance
 
 ## SuperSonic [0.7.2] - 2023-08-12
 

README.md

@@ -1,61 +1,65 @@
-English | [中文](README_CN.md)
+[中文介绍](README_CN.md) | [文档中心](https://github.com/tencentmusic/supersonic/wiki)
+
+![Java CI](https://github.com/tencentmusic/supersonic/workflows/supersonic%20CI/badge.svg)
 
 # SuperSonic (超音数)
 
-**SuperSonic is an out-of-the-box yet highly extensible framework for building a data chatbot**. SuperSonic provides a chat interface that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of metrics/dimensions/entities, along with their meaning, context and relationships) on top of physical data models, and no data modification or copying is required. Meanwhile, SuperSonic is designed to be pluggable, allowing new functionalities to be added through plugins and core components to be integrated with other systems.
+**SuperSonic is the next-generation LLM-powered data analytics platform that integrates ChatBI and HeadlessBI**. SuperSonic provides a chat interface that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of entities/metrics/dimensions/tags, along with their meaning, context and relationships) on top of physical data models, and **no data modification or copying** is required. Meanwhile, SuperSonic is designed to be **highly extensible**, allowing custom functionalities to be added and configured with Java SPI.
 
 <img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
 
 ## Motivation
 
-The emergence of Large Language Model (LLM) like ChatGPT is reshaping the way information is retrieved. In the field of data analytics, both academia and industry are primarily focused on leveraging LLM to convert natural language queries into SQL queries. While some works show promising results, they are still not applicable to real-world scenarios.
+The emergence of Large Language Model (LLM) like ChatGPT is reshaping the way information is retrieved. In the field of data analytics, both academia and industry are primarily focused on leveraging LLM to convert natural language into SQL (so called Text2SQL or NL2SQL). While some approaches exhibit promising results, their **reliability** and **efficiency** are insufficient for real-world applications.  
 
-From our perspective, the key to filling the real-world gap lies in two aspects: 
+From our perspective, the key to filling the real-world gap lies in three aspects: 
-1. Utilize a combination of rule-based and model-based semantic parsers to deal with different scenarios.
+1. Integrate ChatBI with HeadlessBI encapsulating underlying data context (joins, keys, formulas, etc) to **reduce complexity**.
-2. Introduce a semantic model layer encapsulating the underlying data complexity(joins, formulas, etc) to simplify semantic parsing.
+2. Augment the LLM with schema mappers(as a kind of preprocessor) and semantic correctors(as a kind of postprocessor) to **mitigate hallucination**.
+3. Utilize rule-based schema parsers when necessary to **improve efficiency**(in terms of latency and cost).
 
-With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development of data chatbot, we decide to open source SuperSonic as an extensible framework.
+With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development of ChatBI, we decide to open source SuperSonic as an extensible framework.
 
 ## Out-of-the-box Features
 
-- Built-in graphical interface for business users to enter data queries 
+- Built-in ChatBI interface for *business users* to enter natural language queries
-- Built-in graphical interface for analytics engineers to manage semantic models
+- Built-in HeadlessBI interface for *analytics engineers* to build semantic models
+- Built-in GUI for *system administrators* to manage chat agents and third-party plugins
 - Support input auto-completion as well as query recommendation
 - Support multi-turn conversation and history context management 
-- Support three-level permission control: domain-level, column-level and row-level 
+- Support four-level permission control: domain-level, model-level, column-level and row-level
 
 ## Extensible Components
 
-The high-level architecture and main process flow is shown in below diagram:
+The high-level architecture and main process flow is as follows:
 
-<img src="./docs/images/supersonic_components.png" height="80%" width="80%" align="center"/> 
+<img src="./docs/images/supersonic_components.png" height="65%" width="65%" align="center"/> 
 
-- **Chat Interface:** accepts natural language queries and answer results with appropriate visualization charts. It supports input auto-completion as well as multi-turn conversation.
+- **Knowledge Base:** extracts schema information periodically from the semantic models and build dictionary and index to facilitate schema mapping.
 
-- **Modeling Interface:** empowers analytics engineers to visually define and maintain semantic models. The configurations related to access permission and chat conversation can also be set on the UI.
+- **Schema Mapper:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against the knowledge base.
 
-- **Schema Mapper Chain:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against a knowledge base constructed from the semantic models.
+- **Semantic Parser:** understands user queries and extracts semantic information. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
 
-- **Semantic Parser Chain:** understands user queries and extract semantic information. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
+- **Semantic Corrector:** checks validity of extracted semantic information and performs correction and optimization if needed.
 
-- **Semantic Query:** performs execution according to extracted semantic information. It generates SQL queries and executes them against physical data models.
+- **Semantic Interpreter:** performs execution according to extracted semantic information. It generates SQL statements and executes them against physical data models.
+
+- **Chat Plugin:** extends functionality with third-party tools. The LLM is going to select the most suitable one, given all configured plugins with function description and sample questions.
 
 ## Quick Demo
 
 SuperSonic comes with sample semantic models as well as chat conversations that can be used as a starting point. Please follow the steps: 
 
 - Download the latest prebuilt binary from the [release page](https://github.com/tencentmusic/supersonic/releases)
-- Run script "bin/start-standalone.sh" to start a standalone server
+- Run script "assembly/bin/supersonic-daemon.sh start" to start a standalone Java service
-- Visit http://localhost:9080 in browser to start exploration
+- Visit http://localhost:9080 in the browser to start exploration
 
-## How to Build
+## Build and Development
 
-SuperSonic can be deployed in two modes: standalone (intended for quick demo) and distributed (intended for production). 
+Please refer to project [wiki](https://github.com/tencentmusic/supersonic/wiki). 
 
-### Build for Standalone Mode 
+## WeChat Contact
- 
-Pull the source code and run script "assembly/bin/build-standalone.sh" to build a single packages.
 
-### Build for Distributed Mode 
+Please follow SuperSonic wechat official account:
 
-Pull the source code and run scripts "assembly/bin/build-chat.sh" and "assembly/bin/build-semantic.sh" separately to build packages.
+<img src="./docs/images/supersonic_wechat_oa.png" height="50%" width="50%" align="center"/> 

README_CN.md

@@ -1,59 +1,61 @@
-# 超音数（SuperSonic）
+# SuperSonic (超音数)
 
-**超音数是一个开箱即用且易于扩展的数据问答对话框架**。通过超音数的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。超音数不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，超音数被设计为可插拔式的框架，允许以插件形式来扩展新功能，或者将核心组件与其他系统集成。
+**SuperSonic融合ChatBI和HeadlessBI打造新一代的数据分析平台**。通过SuperSonic的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。SuperSonic不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，SuperSonic被设计为可插拔的框架，采用Java SPI机制来扩展定制功能。
 
 <img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
 
 ## 项目动机
 
-大型语言模型（LLMs）如ChatGPT的出现正在重塑信息检索的方式。在数据分析领域，学术界和工业界主要关注利用深度学习模型将自然语言查询转换为SQL查询。虽然一些工作显示出有前景的结果，但它们还并不适用于实际场景。
+大型语言模型（LLMs）如ChatGPT的出现正在重塑信息检索的方式。在数据分析领域，学术界和工业界主要关注利用深度学习模型将自然语言查询转换为SQL查询。虽然一些工作显示出有前景的结果，但它们的可靠性还达不到生产可用的要求。
 
-在我们看来，为了在实际场景发挥价值，有两个关键点：
+在我们看来，为了在实际场景发挥价值，有三个关键点：
-1. 将基于规则和基于模型的语义解析器相结合，发挥各自优势，以便处理不同的场景。
+1. 融合HeadlessBI，通过统一语义层封装底层数据细节（关联、键值、公式等），降低SQL生成的**复杂度**。
-2. 引入语义模型层来封装数据底层的复杂性（关联、公式等），从而简化语义解析的求解空间。
+2. 通过一前一后的模式映射器和语义修正器，来缓解LLM常见的**幻觉**现象。
+3. 设计启发式的规则，在一些特定场景提升语义解析的**效率**。
 
-为了验证上述想法，我们开发了超音数项目，并将其应用在实际的内部产品中。与此同时，我们将超音数作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
+为了验证上述想法，我们开发了SuperSonic项目，并将其应用在实际的内部产品中。与此同时，我们将SuperSonic作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
 
 ## 开箱即用的特性
 
-- 内置图形界面以便业务用户输入数据查询。
+- 内置ChatBI界面以便*业务用户*输入数据查询。
-- 内置图形界面以便分析工程师管理语义模型。
+- 内置HeadlessBI界面以便*分析工程师*构建语义模型。
+- 内置图形用户界面以便*系统管理员*管理第三方插件和对话助理。
 - 支持文本输入的联想和查询问题的推荐。
 - 支持多轮对话，根据语境自动切换上下文。
-- 支持三级权限控制：主题域级、列级、行级。
+- 支持四级权限控制：主题域级、模型级、列级、行级。
 
 ## 易于扩展的组件
 
-超音数的整体架构和主流程如下图所示：
+SuperSonic的整体架构和主流程如下图所示：
 
-<img src="./docs/images/supersonic_components.png" height="80%" width="80%" align="center"/> 
+<img src="./docs/images/supersonic_components.png" height="65%" width="65%" align="center"/> 
 
-- **问答对话界面(chat interface)**：接受用户查询并选择合适的可视化图表呈现结果，支持输入联想和多轮对话。
+- **模型知识库(Knowledge Base)：** 定期从语义模型中提取相关的模式信息，构建词典和索引，以便后续的模式映射。
 
-- **语义建模界面(modeling interface)**：使分析工程师能够通过可视化方式定义和维护语义模型，与访问权限和聊天对话相关的配置也可以在用户界面上设置。
+- **模式映射器(Schema Mapper)：** 将自然语言文本在知识库中进行匹配，为后续的语义解析提供相关信息。
 
-- **模式映射器(schema mapper chain)**：基于语义模型构建知识库，然后将自然语言文本在知识库中进行匹配，为后续的语义解析提供相关信息。
+- **语义解析器(Semantic Parser)：** 理解用户查询并抽取语义信息，其由一组基于规则和基于模型的解析器组成，每个解析器可应对不同的特定场景。
 
-- **语义解析器(semantic parser chain)**：理解用户查询并抽取语义信息，其由一组基于规则和基于模型的解析器组成，每个解析器可应对不同的特定场景。
+- **语义修正器(Semantic Corrector)：** 检查语义信息的合法性，对不合法的信息做修正和优化处理。
 
-- **语义查询(semantic query)**: 根据语义信息生成物理SQL执行查询。
+- **语义解释器(Semantic Interpreter)：** 根据语义信息生成物理SQL执行查询。
+
+- **问答插件(Chat Plugin)：** 通过第三方工具扩展功能。给定所有配置的插件及其功能描述和示例问题，大语言模型将选择最合适的插件。
 
 ## 快速体验
 
-超音数自带样例的语义模型和问答对话，只需以下三步即可快速体验：
+SuperSonic自带样例的语义模型和问答对话，只需以下三步即可快速体验：
 
 - 从[release page](https://github.com/tencentmusic/supersonic/releases)下载预先构建好的发行包
-- 运行 "bin/start-standalone.sh"启动服务
+- 运行 "assembly/bin/supersonic-daemon.sh start"启动standalone模式的Java服务
 - 在浏览器访问http://localhost:9080 开启探索
 
-## 如何构建
+## 如何构建和部署
 
-超音数可以运行在两个模式：standalone（一般用于快速演示）和distributed（一般用于生产环境）。
+请参考项目[wiki](https://github.com/tencentmusic/supersonic/wiki)。
 
-### Standalone模式构建
+## 微信联系方式
 
-下载源码包，运行脚本"assembly/bin/build-standalone.sh"，将所有服务一起编译打包
+欢迎关注微信公众号：
 
-### Distributed模式构建
+<img src="./docs/images/supersonic_wechat_oa.png" height="50%" width="50%" align="center"/> 
-
-下载源码包，分别运行脚本"assembly/bin/build-chat.sh"、"assembly/bin/build-semantic.sh"，为问答层服务和语义层服务编译打包

assembly/bin/build-chat.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#1. move package to build
-cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz
-

assembly/bin/build-ide.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-buildDir=$baseDir/build
-
-cd $baseDir/bin
-sh build-standalone.sh
-
-cd $buildDir
-tar xvf supersonic-webapp.tar.gz
-mv supersonic-webapp webapp
-mv webapp ../../launchers/standalone/target/classes

assembly/bin/build-semantic.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#1. build semantic service
-rm -fr ${buildDir}/*.tar.gz
-rm -fr dist
-
-mvn -f $baseDir/../ clean package -DskipTests
-
-#2. move package to build
-cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.tar.gz
-
-#3. build webapp
-chmod +x $baseDir/../webapp/start-fe-prod.sh
-cd ../webapp
-sh ./start-fe-prod.sh
-cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/

assembly/bin/build-standalone.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#1. build semantic chat service
-rm -fr ${buildDir}/*.tar.gz
-rm -fr dist
-
-mvn -f $baseDir/../ clean package -DskipTests
-
-#2. move package to build
-cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic.tar.gz
-
-#3. build webapp
-chmod +x $baseDir/../webapp/start-fe-prod.sh
-cd ../webapp
-sh ./start-fe-prod.sh
-cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/

assembly/bin/start-chat.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/../runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#2. package lib
-
-tar -zxvf ${buildDir}/supersonic-chat.tar.gz  -C ${runtimeDir}
-
-mv ${runtimeDir}/launchers-chat-* ${runtimeDir}/supersonic-chat
-
-tar -zxvf ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-
-mkdir -p ${runtimeDir}/supersonic-chat/webapp
-
-cp -fr  ${buildDir}/supersonic-webapp/* ${runtimeDir}/supersonic-chat/webapp
-
-rm -fr  ${buildDir}/supersonic-webapp
-
-json=$(cat ${runtimeDir}/supersonic-chat/webapp/supersonic.config.json)
-json=$(echo $json | jq '.env="chat"')
-echo $json > ${runtimeDir}/supersonic-chat/webapp/supersonic.config.json
-
-#3. start service
-#3.1 start chat service
-echo ${runtimeDir}
-sh ${runtimeDir}/supersonic-chat/bin/service.sh restart
-
-#3.2 start llm service
-sh ${runtimeDir}/supersonic-chat/llm/bin/service.sh restart
-

assembly/bin/start-semantic.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/../runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#1. clear file
-mkdir -p ${runtimeDir}
-rm -fr ${runtimeDir}/*
-
-#2. package lib
-
-tar -zxvf ${buildDir}/supersonic-semantic.tar.gz  -C ${runtimeDir}
-
-mv ${runtimeDir}/launchers-semantic-* ${runtimeDir}/supersonic-semantic
-
-tar -zxvf ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-
-mkdir -p ${runtimeDir}/supersonic-semantic/webapp
-
-cp -fr  ${buildDir}/supersonic-webapp/* ${runtimeDir}/supersonic-semantic/webapp
-
-rm -fr  ${buildDir}/supersonic-webapp
-
-
-json=$(cat ${runtimeDir}/supersonic-semantic/webapp/supersonic.config.json)
-json=$(echo $json | jq '.env="semantic"')
-echo $json > ${runtimeDir}/supersonic-semantic/webapp/supersonic.config.json
-
-#3. start service
-sh ${runtimeDir}/supersonic-semantic/bin/service.sh restart
-
-

assembly/bin/start-standalone.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(readlink -f $sbinDir/../)
-runtimeDir=$baseDir/../runtime
-buildDir=$baseDir/build
-
-cd $baseDir
-
-#1. clear file
-mkdir -p ${runtimeDir}
-rm -fr ${runtimeDir}/*
-
-#2. package lib
-
-tar -zxvf ${buildDir}/supersonic.tar.gz  -C ${runtimeDir}
-
-mv ${runtimeDir}/launchers-standalone-* ${runtimeDir}/supersonic-standalone
-
-tar -zxvf ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-
-mkdir -p ${runtimeDir}/supersonic-standalone/webapp
-
-cp -fr  ${buildDir}/supersonic-webapp/* ${runtimeDir}/supersonic-standalone/webapp
-
-rm -fr  ${buildDir}/supersonic-webapp
-
-#3. start service
-#start standalone service
-sh ${runtimeDir}/supersonic-standalone/bin/service.sh restart
-#start llm service
-sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh restart

assembly/bin/supersonic-build.bat

@@ -0,0 +1,72 @@
+@echo off
+setlocal
+chcp 65001
+set "sbinDir=%~dp0"
+set "baseDir=%~dp0.."
+set "buildDir=%baseDir%\build"
+set "runtimeDir=%baseDir%\..\runtime"
+set "pip_path=pip3"
+set "service=%~1"
+
+
+rem 1. build backend java modules
+del /q "%buildDir%\*.tar.gz" 2>NUL
+call mvn -f "%baseDir%\..\pom.xml" clean package -DskipTests
+
+IF ERRORLEVEL 1 (
+    ECHO Failed to build backend Java modules.
+    EXIT /B 1
+)
+
+rem 2. move package to build
+echo f|xcopy "%baseDir%\..\launchers\standalone\target\*.tar.gz" "%buildDir%\supersonic-standalone.tar.gz"
+
+rem 3. build frontend webapp
+cd "%baseDir%\..\webapp"
+call start-fe-prod.bat
+copy /y "%baseDir%\..\webapp\supersonic-webapp.tar.gz" "%buildDir%\"
+
+IF ERRORLEVEL 1 (
+    ECHO Failed to build frontend webapp.
+    EXIT /B 1
+)
+
+rem 4. copy webapp to java classpath
+cd "%buildDir%"
+tar -zxvf supersonic-webapp.tar.gz
+move supersonic-webapp webapp
+move webapp ..\..\launchers\standalone\target\classes
+
+rem 5. build backend python modules
+if "%service%"=="pyllm" (
+    echo "start installing python modules with pip: ${pip_path}"
+    set requirementPath="%baseDir%/../chat/python/requirements.txt"
+    %pip_path% install -r %requirementPath%
+    echo "install python modules success"
+)
+
+call :BUILD_RUNTIME
+
+:BUILD_RUNTIME
+  rem 6. reset runtime
+  IF EXIST "%runtimeDir%" (
+      echo begin to delete dir : %runtimeDir%
+      rd /s /q "%runtimeDir%"
+  ) ELSE (
+      echo %runtimeDir% does not exist, create directly
+  )
+  mkdir "%runtimeDir%"
+  tar -zxvf "%buildDir%\supersonic-standalone.tar.gz" -C "%runtimeDir%"
+  for /d %%f in ("%runtimeDir%\launchers-standalone-*") do (
+      move "%%f" "%runtimeDir%\supersonic-standalone"
+  )
+
+  rem 7. copy webapp to runtime
+  tar -zxvf "%buildDir%\supersonic-webapp.tar.gz" -C "%buildDir%"
+  if not exist "%runtimeDir%\supersonic-standalone\webapp" mkdir "%runtimeDir%\supersonic-standalone\webapp"
+  xcopy /s /e /h /y "%buildDir%\supersonic-webapp\*" "%runtimeDir%\supersonic-standalone\webapp"
+  if not exist "%runtimeDir%\supersonic-standalone\conf\webapp" mkdir "%runtimeDir%\supersonic-standalone\conf\webapp"
+  xcopy /s /e /h /y "%runtimeDir%\supersonic-standalone\webapp\*" "%runtimeDir%\supersonic-standalone\conf\webapp"
+  rd /s /q "%buildDir%\supersonic-webapp"
+
+endlocal

assembly/bin/supersonic-build.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+set -x
+sbinDir=$(cd "$(dirname "$0")"; pwd)
+chmod +x $sbinDir/supersonic-common.sh
+source $sbinDir/supersonic-common.sh
+cd $baseDir
+
+service=$1
+#1. build backend java modules
+rm -fr ${buildDir}/*.tar.gz
+rm -fr dist
+set +x
+mvn -f $baseDir/../ clean package -DskipTests
+# check build result
+if [ $? -ne 0 ]; then
+    echo "Failed to build backend Java modules."
+    exit 1
+fi
+
+#2. move package to build
+cp $baseDir/../launchers/headless/target/*.tar.gz ${buildDir}/supersonic-headless.tar.gz
+cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz
+cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic-standalone.tar.gz
+
+#3. build frontend webapp
+chmod +x $baseDir/../webapp/start-fe-prod.sh
+cd ../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
+#4. copy webapp to java classpath
+cd $buildDir
+tar xvf supersonic-webapp.tar.gz
+mv supersonic-webapp webapp
+cp -fr webapp ../../launchers/headless/target/classes
+cp -fr webapp ../../launchers/chat/target/classes
+cp -fr webapp ../../launchers/standalone/target/classes
+rm -fr  ${buildDir}/webapp
+
+#5. build backend python modules
+if [ "$service" == "pyllm" ]; then
+  echo "start installing python modules with pip: ${pip_path}"
+  requirementPath=$baseDir/../chat/python/requirements.txt
+  ${pip_path} install -r ${requirementPath}
+  echo "install python modules success"
+fi
+
+#6. reset runtime
+rm -fr $runtimeDir/supersonic*
+moveAllToRuntime
+setEnvToWeb chat
+setEnvToWeb headless

assembly/bin/supersonic-common.sh

@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+
+# environment parameters
+python_path=${PYTHON_PATH:-"python3"}
+pip_path=${PIP_PATH:-"pip3"}
+
+sbinDir=$(cd "$(dirname "$0")"; pwd)
+baseDir=$(cd "$sbinDir/.." && pwd -P)
+runtimeDir=$baseDir/../runtime
+buildDir=$baseDir/build
+
+readonly CHAT_APP_NAME="supersonic_chat"
+readonly HEADLESS_APP_NAME="supersonic_headless"
+readonly PYLLM_APP_NAME="supersonic_pyllm"
+readonly STANDALONE_APP_NAME="supersonic_standalone"
+readonly CHAT_SERVICE="chat"
+readonly HEADLESS_SERVICE="headless"
+readonly PYLLM_SERVICE="pyllm"
+readonly STANDALONE_SERVICE="standalone"
+readonly PYLLM_HOST="127.0.0.1"
+readonly PYLLM_PORT="9092"
+
+function setEnvToWeb {
+   model_name=$1
+   json='{"env": "'$model_name'"}'
+   echo $json > ${runtimeDir}/supersonic-${model_name}/webapp/supersonic.config.json
+   echo $json > $baseDir/../launchers/${model_name}/target/classes/webapp/supersonic.config.json
+}
+
+function moveToRuntime {
+  model_name=$1
+  file="${buildDir}/supersonic-${model_name}.tar.gz"
+  if [ -f "$file" ]; then
+    tar -zxvf "$file" -C ${runtimeDir}
+    mv ${runtimeDir}/launchers-${model_name}-* ${runtimeDir}/supersonic-${model_name}
+    mkdir -p ${runtimeDir}/supersonic-${model_name}/webapp
+    cp -fr ${buildDir}/webapp/* ${runtimeDir}/supersonic-${model_name}/webapp
+  else
+    echo "File $file does not exist. Skipping the move to runtime."
+  fi
+}
+
+function moveAllToRuntime {
+  mkdir -p ${runtimeDir}
+  tar xvf  ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
+  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
+
+  moveToRuntime chat
+  moveToRuntime headless
+  moveToRuntime standalone
+  rm -fr  ${buildDir}/webapp
+}
+
+# run java service
+function runJavaService {
+  javaRunDir=${runtimeDir}/supersonic-${model_name}
+  local_app_name=$1
+  libDir=$javaRunDir/lib
+  confDir=$javaRunDir/conf
+
+  CLASSPATH=""
+  CLASSPATH=$CLASSPATH:$confDir
+
+  for jarPath in $libDir/*.jar; do
+   CLASSPATH=$CLASSPATH:$jarPath
+  done
+
+  export CLASSPATH
+  export LANG="zh_CN.UTF-8"
+
+  cd $javaRunDir
+  if [[ "$JAVA_HOME" == "" ]]; then
+    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 -Xmx2048m "$main_class
+
+  mkdir -p $javaRunDir/logs
+  if [[ "$is_test" == "true" ]]; then
+    java -Dspring.profiles.active="dev" $command >/dev/null 2>$javaRunDir/logs/error.log &
+  else
+    java  $command $javaRunDir >/dev/null 2>$javaRunDir/logs/error.log &
+  fi
+}
+
+# run python service
+function runPythonService {
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
+  cd $pythonRunDir
+  nohup ${python_path} supersonic_pyllm.py  > $pythonRunDir/pyllm.log  2>&1   &
+  # add health check
+  for i in {1..10}
+  do
+    echo "pyllm health check attempt $i..."
+    response=$(curl -s http://${PYLLM_HOST}:${PYLLM_PORT}/health)
+    echo "pyllm health check response: $response"
+    status_ok="Healthy"
+    if [[ $response == *$status_ok* ]] ; then
+      echo "pyllm Health check passed."
+      break
+    else
+      if [ "$i" -eq 10 ]; then
+        echo "pyllm Health check failed after 10 attempts."
+        echo "May still downloading model files. Please check pyllm.log in runtime directory."
+      fi
+      echo "Retrying after 5 seconds..."
+      sleep 5
+    fi
+  done
+}

assembly/bin/supersonic-daemon.bat

@@ -0,0 +1,118 @@
+@echo off
+setlocal
+chcp 65001
+set "sbinDir=%~dp0"
+set "baseDir=%~dp0.."
+set "runtimeDir=%baseDir%\..\runtime"
+set "buildDir=%baseDir%\build"
+set "main_class=com.tencent.supersonic.StandaloneLauncher"
+set "python_path=python"
+set "pip_path=pip3"
+set "standalone_service=standalone"
+set "pyllm_service=pyllm"
+
+set "javaRunDir=%runtimeDir%\supersonic-standalone"
+set "pythonRunDir=%runtimeDir%\supersonic-standalone\pyllm"
+
+set "command=%~1"
+set "service=%~2"
+
+if "%service%"=="" (
+   set "service=%standalone_service%"
+)
+
+IF "%service%"=="pyllm" (
+  SET "llmProxy=PythonLLMProxy"
+)
+
+call :BUILD_RUNTIME
+
+if "%command%"=="restart" (
+   call :STOP
+   call :START
+   goto :EOF
+) else if "%command%"=="start" (
+   call :START
+   goto :EOF
+) else if "%command%"=="stop" (
+  call :STOP
+  goto :EOF
+) else if "%command%"=="reload" (
+  call :RELOAD_EXAMPLE
+  goto :EOF
+) else (
+   echo "Use command {start|stop|restart} to run."
+   goto :EOF
+)
+
+:START
+    if "%service%"=="%pyllm_service%" (
+         call :START_PYTHON
+         call :START_JAVA
+         goto :EOF
+    )
+    call :START_JAVA
+    goto :EOF
+
+:STOP
+    call :STOP_PYTHON
+    call :STOP_JAVA
+    goto :EOF
+
+:START_PYTHON
+   echo 'python service starting, see logs in pyllm/pyllm.log'
+   cd "%pythonRunDir%"
+   start /B %python_path% supersonic_pyllm.py  > %pythonRunDir%\pyllm.log 2>&1
+   timeout /t 10 >nul
+   echo 'python service started'
+   goto :EOF
+
+:START_JAVA
+  echo 'java service starting, see logs in logs/'
+   cd "%javaRunDir%"
+   if not exist "%runtimeDir%\supersonic-standalone\logs" mkdir "%runtimeDir%\supersonic-standalone\logs"
+   set "libDir=%runtimeDir%\supersonic-standalone\lib"
+   set "confDir=%runtimeDir%\supersonic-standalone\conf"
+   set "webDir=%runtimeDir%\supersonic-standalone\webapp"
+   set "classpath=%confDir%;%webDir%;%libDir%\*"
+   set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
+   start /B java %java-command% >nul 2>&1
+   timeout /t 10 >nul
+   echo 'java service started'
+   goto :EOF
+
+:STOP_PYTHON
+   for /f "tokens=2" %%i in ('tasklist ^| findstr /i "python"') do (
+           taskkill /PID %%i /F
+           echo "python service (PID = %%i) is killed."
+   )
+   goto :EOF
+
+:STOP_JAVA
+   for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
+            taskkill /PID %%i /F
+            echo "java service (PID = %%i) is killed."
+   )
+   goto :EOF
+
+:RELOAD_EXAMPLE
+   cd "%runtimeDir%\supersonic-standalone\pyllm\sql"
+   start  %python_path% examples_reload_run.py
+   goto :EOF
+
+:BUILD_RUNTIME
+  rem 6. reset runtime
+  if exist "%runtimeDir%" goto :EOF
+  mkdir "%runtimeDir%"
+  tar -zxvf "%buildDir%\supersonic-standalone.tar.gz" -C "%runtimeDir%"
+  for /d %%f in ("%runtimeDir%\launchers-standalone-*") do (
+      move "%%f" "%runtimeDir%\supersonic-standalone"
+  )
+
+  rem 7. copy webapp to runtime
+  tar -zxvf "%buildDir%\supersonic-webapp.tar.gz" -C "%buildDir%"
+  if not exist "%runtimeDir%\supersonic-standalone\webapp" mkdir "%runtimeDir%\supersonic-standalone\webapp"
+  xcopy /s /e /h /y "%buildDir%\supersonic-webapp\*" "%runtimeDir%\supersonic-standalone\webapp"
+  if not exist "%runtimeDir%\supersonic-standalone\conf\webapp" mkdir "%runtimeDir%\supersonic-standalone\conf\webapp"
+  xcopy /s /e /h /y "%runtimeDir%\supersonic-standalone\webapp\*" "%runtimeDir%\supersonic-standalone\conf\webapp"
+  rd /s /q "%buildDir%\supersonic-webapp"

assembly/bin/supersonic-daemon.sh

@@ -0,0 +1,143 @@
+#!/usr/bin/env bash
+
+set -x
+sbinDir=$(cd "$(dirname "$0")"; pwd)
+chmod +x $sbinDir/supersonic-common.sh
+source $sbinDir/supersonic-common.sh
+
+# 1.init environment parameters
+if [ ! -d "$runtimeDir" ]; then
+    echo "the runtime dir does not exist move all to runtime"
+    moveAllToRuntime
+fi
+set +x
+
+command=$1
+service=$2
+if [ -z "$service"  ]; then
+  service=${STANDALONE_SERVICE}
+fi
+
+app_name=$STANDALONE_APP_NAME
+main_class="com.tencent.supersonic.StandaloneLauncher"
+model_name=$service
+
+if [ "$service" == "pyllm" ]; then
+  model_name=${STANDALONE_SERVICE}
+  export llmProxy=PythonLLMProxy
+fi
+
+cd $baseDir
+
+# 2.set main class
+function setMainClass {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    main_class="com.tencent.supersonic.ChatLauncher"
+  elif [ "$service" == $HEADLESS_SERVICE ]; then
+    main_class="com.tencent.supersonic.HeadlessLauncher"
+  fi
+}
+setMainClass
+# 3.set app name
+function setAppName {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    app_name=$CHAT_APP_NAME
+  elif [ "$service" == $HEADLESS_SERVICE ]; then
+    app_name=$HEADLESS_APP_NAME
+  elif [ "$service" == $PYLLM_SERVICE ]; then
+    app_name=$PYLLM_APP_NAME
+  fi
+}
+setAppName
+
+function reloadExamples {
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
+  cd $pythonRunDir/sql
+  ${python_path} examples_reload_run.py
+}
+
+
+function start()
+{
+  local_app_name=$1
+  pid=$(ps aux |grep ${local_app_name} | grep -v grep | awk '{print $2}')
+  if [[ "$pid" == "" ]]; then
+    if [[ ${local_app_name} == $PYLLM_APP_NAME ]]; then
+      runPythonService ${local_app_name}
+    else
+      runJavaService ${local_app_name}
+    fi
+  else
+    echo "Process (PID = $pid) is running."
+    return 1
+  fi
+}
+
+function stop()
+{
+  pid=$(ps aux | grep $1 | grep -v grep | awk '{print $2}')
+  if [[ "$pid" == "" ]]; then
+    echo "Process $1 is not running !"
+    return 1
+  else
+    kill -9 $pid
+    echo "Process (PID = $pid) is killed !"
+    return 0
+  fi
+}
+
+function reload()
+{
+  if [[ $1 == $PYLLM_APP_NAME ]]; then
+    reloadExamples
+  fi
+}
+
+# 4. execute command operation
+case "$command" in
+  start)
+        if [ "$service" == $PYLLM_SERVICE ]; then
+          echo  "Starting $app_name"
+          start $app_name
+          echo  "Starting $STANDALONE_APP_NAME"
+          start $STANDALONE_APP_NAME
+        else
+          echo  "Starting $app_name"
+          start $app_name
+        fi
+        echo  "Start success"
+        ;;
+  stop)
+        echo  "Stopping $app_name"
+        stop $app_name
+        echo  "Stopping $PYLLM_APP_NAME"
+        stop $PYLLM_APP_NAME
+        echo  "Stop success"
+        ;;
+  reload)
+        echo  "Reloading ${app_name}"
+        reload ${app_name}
+        echo  "Reload success"
+        ;;
+  restart)
+        if [ "$service" == $PYLLM_SERVICE ]; then
+          echo  "Stopping ${app_name}"
+          stop ${app_name}
+          echo  "Stopping ${STANDALONE_APP_NAME}"
+          stop $STANDALONE_APP_NAME
+          echo  "Starting ${app_name}"
+          start ${app_name}
+          echo  "Starting ${STANDALONE_APP_NAME}"
+          start $STANDALONE_APP_NAME
+        else
+          echo  "Stopping ${app_name}"
+          stop ${app_name}
+          echo  "Starting ${app_name}"
+          start ${app_name}
+        fi
+        echo  "Restart success"
+        ;;
+  *)
+        echo "Use command {start|stop|restart} to run."
+        exit 1
+esac

assembly/build/build.xml

@@ -6,14 +6,6 @@
         <format>tar.gz</format>
     </formats>
     <fileSets>
-
-        <fileSet>
-            <directory>${project.basedir}/src/main/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <fileMode>0777</fileMode>
-            <directoryMode>0755</directoryMode>
-        </fileSet>
-
         <fileSet>
             <directory>${project.basedir}/src/main/resources</directory>
             <outputDirectory>conf</outputDirectory>
@@ -29,8 +21,8 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../../chat/core/src/main/python</directory>
+            <directory>${project.basedir}/../../chat/python</directory>
-            <outputDirectory>llm</outputDirectory>
+            <outputDirectory>pyllm</outputDirectory>
             <fileMode>0777</fileMode>
             <directoryMode>0755</directoryMode>
         </fileSet>

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java

@@ -3,9 +3,13 @@ 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.request.UserReq;
+
 import java.util.List;
 import java.util.Set;
 
+/**
+ * UserAdaptor defines some interfaces for obtaining user and organization information
+ */
 public interface UserAdaptor {
 
     List<String> getUserNames();

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java

@@ -9,18 +9,28 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class AuthenticationConfig {
 
-
     @Value("${authentication.exclude.path:XXX}")
     private String excludePath;
 
+    @Value("${authentication.include.path:/api}")
+    private String includePath;
+
     @Value("${authentication.enable:false}")
     private boolean enabled;
 
     @Value("${authentication.token.secret:secret}")
     private String tokenSecret;
 
-    @Value("${authentication.token.http.header.key:Auth}")
+    @Value("${authentication.token.http.header.key:Authorization}")
     private String tokenHttpHeaderKey;
 
+    @Value("${authentication.app.appId:appId}")
+    private String appId;
+
+    @Value("${authentication.app.timestamp:timestamp}")
+    private String timestamp;
+
+    @Value("${authentication.app.signature:signature}")
+    private String signature;
 
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/constant/UserConstants.java

@@ -12,6 +12,8 @@ public class UserConstants {
 
     public static final String TOKEN_USER_EMAIL = "token_user_email";
 
+    public static final String TOKEN_IS_ADMIN = "token_is_admin";
+
     public static final String TOKEN_ALGORITHM = "HS512";
 
     public static final String TOKEN_CREATE_TIME = "token_create_time";

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

@@ -1,10 +1,15 @@
 package com.tencent.supersonic.auth.api.authentication.pojo;
 
 import com.google.common.collect.Lists;
-import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class Organization {
 
     private String id;

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

@@ -18,17 +18,31 @@ public class User {
 
     private String email;
 
-    public static User get(Long id, String name, String displayName, String email) {
+    private Integer isAdmin;
-        return new User(id, name, displayName, email);
+
+    public static User get(Long id, String name, String displayName, String email, Integer isAdmin) {
+        return new User(id, name, displayName, email, isAdmin);
+    }
+
+    public static User get(Long id, String name) {
+        return new User(id, name, name, name, 0);
     }
 
     public static User getFakeUser() {
-        return new User(1L, "admin", "admin", "admin@email");
+        return new User(1L, "admin", "admin", "admin@email", 1);
+    }
+
+    public static User getAppUser(int appId) {
+        String name = String.format("app_%s", appId);
+        return new User(1L, name, name, "", 1);
     }
 
     public String getDisplayName() {
         return StringUtils.isBlank(displayName) ? name : displayName;
     }
 
+    public boolean isSuperAdmin() {
+        return isAdmin != null && isAdmin == 1;
+    }
 
 }

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

@@ -9,13 +9,14 @@ public class UserWithPassword extends User {
 
     private String password;
 
-    public UserWithPassword(Long id, String name, String displayName, String email, String password) {
+    public UserWithPassword(Long id, String name, String displayName, String email, String password, Integer isAdmin) {
-        super(id, name, displayName, email);
+        super(id, name, displayName, email, isAdmin);
         this.password = password;
     }
 
-    public static UserWithPassword get(Long id, String name, String displayName, String email, String password) {
+    public static UserWithPassword get(Long id, String name, String displayName,
-        return new UserWithPassword(id, name, displayName, email, password);
+                                       String email, String password, Integer isAdmin) {
+        return new UserWithPassword(id, name, displayName, email, password, isAdmin);
     }
 
 }

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

@@ -3,11 +3,16 @@ 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 java.util.List;
 import java.util.Set;
 
 public interface UserService {
 
+    User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse);
+
     List<String> getUserNames();
 
     List<User> getUserList();

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

@@ -1,6 +1,7 @@
 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;
 

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

@@ -2,6 +2,11 @@ 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.pojo.SysParameter;
+import com.tencent.supersonic.common.service.SysParameterService;
+import com.tencent.supersonic.common.util.ContextUtils;
+import org.springframework.util.CollectionUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -14,7 +19,14 @@ public final class UserHolder {
     }
 
     public static User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return REPO.findUser(request, response);
+        User user = REPO.findUser(request, response);
+        SysParameterService sysParameterService = ContextUtils.getBean(SysParameterService.class);
+        SysParameter sysParameter = sysParameterService.getSysParameter();
+        if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
+                && sysParameter.getAdmins().contains(user.getName())) {
+            user.setIsAdmin(1);
+        }
+        return user;
     }
 
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthGroup.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class AuthGroup {
 
-    private String modelId;
+    private Long modelId;
     private String name;
     private Integer groupId;
     private List<AuthRule> authRules;

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthRes.java

@@ -7,13 +7,13 @@ import lombok.ToString;
 @ToString
 public class AuthRes {
 
-    private String modelId;
+    private Long modelId;
     private String name;
 
     public AuthRes() {
     }
 
-    public AuthRes(String modelId, String name) {
+    public AuthRes(Long modelId, String name) {
         this.modelId = modelId;
         this.name = name;
     }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/QueryAuthResReq.java

@@ -1,20 +1,33 @@
 package com.tencent.supersonic.auth.api.authorization.request;
 
+import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Data;
 import lombok.ToString;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Data
 @ToString
 public class QueryAuthResReq {
 
-    private String user;
-
     private List<String> departmentIds = new ArrayList<>();
 
     private List<AuthRes> resources;
 
-    private String modelId;
+    private Long modelId;
+
+    private List<Long> modelIds;
+
+    public List<Long> getModelIds() {
+        if (!CollectionUtils.isEmpty(modelIds)) {
+            return modelIds;
+        }
+        if (modelId != null) {
+            return Lists.newArrayList(modelId);
+        }
+        return Lists.newArrayList();
+    }
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/response/AuthorizedResourceResp.java

@@ -4,6 +4,7 @@ import com.tencent.supersonic.auth.api.authorization.pojo.AuthResGrp;
 import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter;
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
 
 @Data

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java

@@ -1,18 +1,18 @@
 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 java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
 public interface AuthService {
 
     List<AuthGroup> queryAuthGroups(String domainId, Integer groupId);
 
-    void updateAuthGroup(AuthGroup group);
+    void addOrUpdateAuthGroup(AuthGroup group);
 
     void removeAuthGroup(AuthGroup group);
 
-    AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, HttpServletRequest request);
+    AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, User user);
 }

auth/authentication/pom.xml

@@ -33,12 +33,6 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-        </dependency>
-
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
@@ -52,12 +46,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
+
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-            <version>${mybatis-spring.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>

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

@@ -11,11 +11,14 @@ import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
 import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.ContextUtils;
+import org.springframework.beans.BeanUtils;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.springframework.beans.BeanUtils;
 
+/**
+ * DefaultUserAdaptor provides a default method to obtain user and organization information
+ */
 public class DefaultUserAdaptor implements UserAdaptor {
 
     private List<UserDO> getUserDOList() {
@@ -41,7 +44,17 @@ public class DefaultUserAdaptor implements UserAdaptor {
 
     @Override
     public List<Organization> getOrganizationTree() {
-        return Lists.newArrayList();
+        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);
     }
 
     private User convert(UserDO userDO) {
@@ -71,7 +84,7 @@ public class DefaultUserAdaptor implements UserAdaptor {
         }
         if (userDO.getPassword().equals(userReq.getPassword())) {
             UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
-                    userDO.getEmail(), userDO.getPassword());
+                    userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
             return userTokenUtils.generateToken(user);
         }
         throw new RuntimeException("password not correct, please try again");

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/config/TppConfig.java

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.auth.authentication.config;
-
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-public class TppConfig {
-
-    @Value(value = "${auth.app.secret:}")
-    private String appSecret;
-
-    @Value(value = "${auth.app.key:}")
-    private String appKey;
-
-    @Value(value = "${auth.oa.url:}")
-    private String tppOaUrl;
-
-}

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

@@ -5,16 +5,17 @@ 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 java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.catalina.connector.RequestFacade;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 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;
 
 
 public abstract class AuthenticationInterceptor implements HandlerInterceptor {
@@ -29,7 +30,6 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
 
     protected S2ThreadContext s2ThreadContext;
 
-
     protected boolean isExcludedUri(String uri) {
         String excludePathStr = authenticationConfig.getExcludePath();
         if (Strings.isEmpty(excludePathStr)) {
@@ -42,12 +42,27 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
         return excludePaths.stream().anyMatch(uri::startsWith);
     }
 
+    protected boolean isIncludedUri(String uri) {
+        String includePathStr = authenticationConfig.getIncludePath();
+        if (Strings.isEmpty(includePathStr)) {
+            return false;
+        }
+        List<String> includePaths = Arrays.asList(includePathStr.split(","));
+        if (CollectionUtils.isEmpty(includePaths)) {
+            return false;
+        }
+        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 {

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

@@ -10,12 +10,12 @@ 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 java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.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;
 
 @Slf4j
 public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor {
@@ -35,7 +35,10 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
             setFakerUser(request);
             return true;
         }
-
+        if (isAppRequest(request)) {
+            setFakerUser(request);
+            return true;
+        }
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();
@@ -46,6 +49,10 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
         }
 
         String uri = request.getServletPath();
+        if (!isIncludedUri(uri)) {
+            return true;
+        }
+
         if (isExcludedUri(uri)) {
             return true;
         }
@@ -72,5 +79,4 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
         s2ThreadContext.set(threadContext);
     }
 
-
 }

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

@@ -1,11 +1,12 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
-import java.util.List;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.List;
+
 @Configuration
 public class InterceptorFactory implements WebMvcConfigurer {
 

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

@@ -1,99 +1,129 @@
 package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
 public class UserDO {
-
     /**
-     *
+     * 
      */
     private Long id;
 
     /**
-     *
+     * 
      */
     private String name;
 
     /**
-     *
+     * 
      */
     private String password;
 
     /**
-     *
+     * 
      */
     private String displayName;
 
     /**
-     *
+     * 
      */
     private String email;
 
     /**
-     * @return id
+     * 
+     */
+    private Integer isAdmin;
+
+    /**
+     * 
+     * @return id 
      */
     public Long getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 
+     * @param id 
      */
     public void setId(Long id) {
         this.id = id;
     }
 
     /**
-     * @return name
+     * 
+     * @return name 
      */
     public String getName() {
         return name;
     }
 
     /**
-     * @param name
+     * 
+     * @param name 
      */
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
 
     /**
-     * @return password
+     * 
+     * @return password 
      */
     public String getPassword() {
         return password;
     }
 
     /**
-     * @param password
+     * 
+     * @param password 
      */
     public void setPassword(String password) {
         this.password = password == null ? null : password.trim();
     }
 
     /**
-     * @return display_name
+     * 
+     * @return display_name 
      */
     public String getDisplayName() {
         return displayName;
     }
 
     /**
-     * @param displayName
+     * 
+     * @param displayName 
      */
     public void setDisplayName(String displayName) {
         this.displayName = displayName == null ? null : displayName.trim();
     }
 
     /**
-     * @return email
+     * 
+     * @return email 
      */
     public String getEmail() {
         return email;
     }
 
     /**
-     * @param email
+     * 
+     * @param email 
      */
     public void setEmail(String email) {
         this.email = email == null ? null : email.trim();
     }
+
+    /**
+     * 
+     * @return is_admin 
+     */
+    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,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UserDOExample {
-
     /**
      * s2_user
      */
@@ -31,6 +30,7 @@ public class UserDOExample {
     protected Integer limitEnd;
 
     /**
+     *
      * @mbg.generated
      */
     public UserDOExample() {
@@ -38,13 +38,7 @@ public class UserDOExample {
     }
 
     /**
-     * @mbg.generated
+     *
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
      * @mbg.generated
      */
     public void setOrderByClause(String orderByClause) {
@@ -52,13 +46,15 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
-    public boolean isDistinct() {
+    public String getOrderByClause() {
-        return distinct;
+        return orderByClause;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setDistinct(boolean distinct) {
@@ -66,6 +62,15 @@ public class UserDOExample {
     }
 
     /**
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     *
      * @mbg.generated
      */
     public List<Criteria> getOredCriteria() {
@@ -73,6 +78,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void or(Criteria criteria) {
@@ -80,6 +86,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria or() {
@@ -89,6 +96,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria createCriteria() {
@@ -100,6 +108,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     protected Criteria createCriteriaInternal() {
@@ -108,6 +117,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void clear() {
@@ -117,6 +127,15 @@ public class UserDOExample {
     }
 
     /**
+     *
+     * @mbg.generated
+     */
+    public void setLimitStart(Integer limitStart) {
+        this.limitStart=limitStart;
+    }
+
+    /**
+     *
      * @mbg.generated
      */
     public Integer getLimitStart() {
@@ -124,31 +143,25 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
-    public void setLimitStart(Integer limitStart) {
+    public void setLimitEnd(Integer limitEnd) {
-        this.limitStart = limitStart;
+        this.limitEnd=limitEnd;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Integer getLimitEnd() {
         return limitEnd;
     }
 
-    /**
-     * @mbg.generated
-     */
-    public void setLimitEnd(Integer limitEnd) {
-        this.limitEnd = limitEnd;
-    }
-
     /**
      * s2_user null
      */
     protected abstract static class GeneratedCriteria {
-
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
@@ -528,6 +541,66 @@ public class UserDOExample {
             addCriterion("email not between", value1, value2, "email");
             return (Criteria) this;
         }
+
+        public Criteria andIsAdminIsNull() {
+            addCriterion("is_admin is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminIsNotNull() {
+            addCriterion("is_admin is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminEqualTo(Integer value) {
+            addCriterion("is_admin =", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotEqualTo(Integer value) {
+            addCriterion("is_admin <>", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminGreaterThan(Integer value) {
+            addCriterion("is_admin >", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_admin >=", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminLessThan(Integer value) {
+            addCriterion("is_admin <", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminLessThanOrEqualTo(Integer value) {
+            addCriterion("is_admin <=", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminIn(List<Integer> values) {
+            addCriterion("is_admin in", values, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotIn(List<Integer> values) {
+            addCriterion("is_admin not in", values, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminBetween(Integer value1, Integer value2) {
+            addCriterion("is_admin between", value1, value2, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_admin not between", value1, value2, "isAdmin");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -544,7 +617,6 @@ public class UserDOExample {
      * s2_user null
      */
     public static class Criterion {
-
         private String condition;
 
         private Object value;
@@ -561,6 +633,38 @@ public class UserDOExample {
 
         private String typeHandler;
 
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
         protected Criterion(String condition) {
             super();
             this.condition = condition;
@@ -596,37 +700,5 @@ public class UserDOExample {
         protected Criterion(String condition, Object value, Object secondValue) {
             this(condition, value, secondValue, null);
         }
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
     }
 }

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

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.auth.authentication.persistence.repository.Impl;
+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.mapper.UserDOMapper;
 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;
@@ -20,7 +20,6 @@ public class UserRepositoryImpl implements UserRepository {
         this.userDOMapper = userDOMapper;
     }
 
-
     @Override
     public List<UserDO> getUserList() {
         return userDOMapper.selectByExample(new UserDOExample());
@@ -40,5 +39,4 @@ public class UserRepositoryImpl implements UserRepository {
         return userDOOptional.orElse(null);
     }
 
-
 }

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

@@ -5,11 +5,6 @@ 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 com.tencent.supersonic.auth.api.authentication.service.UserService;
-import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
-import java.util.List;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -18,6 +13,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;
+
 @RestController
 @RequestMapping("/api/auth/user")
 @Slf4j
@@ -29,10 +29,9 @@ public class UserController {
         this.userService = userService;
     }
 
-
     @GetMapping("/getCurrentUser")
     public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
-        return UserHolder.findUser(httpServletRequest, httpServletResponse);
+        return userService.getCurrentUser(httpServletRequest, httpServletResponse);
     }
 
     @GetMapping("/getUserNames")
@@ -70,5 +69,4 @@ public class UserController {
         return userService.login(userCmd);
     }
 
-
 }

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

@@ -4,14 +4,38 @@ 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 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.pojo.SysParameter;
+import com.tencent.supersonic.common.service.SysParameterService;
+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;
-import org.springframework.stereotype.Service;
 
 @Service
 public class UserServiceImpl implements UserService {
 
+    private SysParameterService sysParameterService;
+
+    public UserServiceImpl(SysParameterService sysParameterService) {
+        this.sysParameterService = sysParameterService;
+    }
+
+    @Override
+    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
+        if (user != null) {
+            SysParameter sysParameter = sysParameterService.getSysParameter();
+            if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
+                    && sysParameter.getAdmins().contains(user.getName())) {
+                user.setIsAdmin(1);
+            }
+        }
+        return user;
+    }
 
     @Override
     public List<String> getUserNames() {

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

@@ -20,5 +20,4 @@ public class FakeUserStrategy implements UserStrategy {
         return User.getFakeUser();
     }
 
-
 }

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

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.auth.authentication.utils;
 
 import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
-import java.util.Objects;
 import org.springframework.core.io.support.SpringFactoriesLoader;
+import java.util.Objects;
 
 public class ComponentFactory {
 

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

@@ -2,6 +2,7 @@ package com.tencent.supersonic.auth.authentication.utils;
 
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_ALGORITHM;
 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_TIME_OUT;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
@@ -9,7 +10,6 @@ import static com.tencent.supersonic.auth.api.authentication.constant.UserConsta
 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;
-
 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;
@@ -22,9 +22,11 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 public class UserTokenUtils {
 
@@ -41,6 +43,7 @@ public class UserTokenUtils {
         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);
     }
 
@@ -51,10 +54,10 @@ public class UserTokenUtils {
         claims.put(TOKEN_USER_PASSWORD, "admin");
         claims.put(TOKEN_USER_DISPLAY_NAME, "admin");
         claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
+        claims.put(TOKEN_IS_ADMIN, 1);
         return generate(claims);
     }
 
-
     public User getUser(HttpServletRequest request) {
         String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
         final Claims claims = getClaims(token);
@@ -62,13 +65,17 @@ public class UserTokenUtils {
         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));
-        return User.get(userId, userName, displayName, email);
+        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)) {
-            throw new AccessException("token is blank, get user failed");
+            String message = "token is blank, get user failed";
+            log.warn("{}, uri: {}", message, request.getServletPath());
+            throw new AccessException(message);
         }
         final Claims claims = getClaims(token);
         Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
@@ -76,7 +83,9 @@ public class UserTokenUtils {
         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));
-        return UserWithPassword.get(userId, userName, displayName, email, 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) {
@@ -110,5 +119,4 @@ public class UserTokenUtils {
                 .compact();
     }
 
-
 }

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

@@ -1,159 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper">
-    <resultMap id="BaseResultMap"
+  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-            type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+    <result column="id" jdbcType="BIGINT" property="id" />
-        <id column="id" jdbcType="BIGINT" property="id"/>
+    <result column="name" jdbcType="VARCHAR" property="name" />
-        <result column="name" jdbcType="VARCHAR" property="name"/>
+    <result column="password" jdbcType="VARCHAR" property="password" />
-        <result column="password" jdbcType="VARCHAR" property="password"/>
+    <result column="display_name" jdbcType="VARCHAR" property="displayName" />
-        <result column="display_name" jdbcType="VARCHAR" property="displayName"/>
+    <result column="email" jdbcType="VARCHAR" property="email" />
-        <result column="email" jdbcType="VARCHAR" property="email"/>
+    <result column="is_admin" jdbcType="INTEGER" property="isAdmin" />
-    </resultMap>
+  </resultMap>
-    <sql id="Example_Where_Clause">
+  <sql id="Example_Where_Clause">
-        <where>
+    <where>
-            <foreach collection="oredCriteria" item="criteria" separator="or">
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
+        <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
+            <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
+              <choose>
-                                <when test="criterion.noValue">
+                <when test="criterion.noValue">
-                                    and ${criterion.condition}
+                  and ${criterion.condition}
-                                </when>
+                </when>
-                                <when test="criterion.singleValue">
+                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
+                  and ${criterion.condition} #{criterion.value}
-                                </when>
+                </when>
-                                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                    #{criterion.secondValue}
+                </when>
-                                </when>
+                <when test="criterion.listValue">
-                                <when test="criterion.listValue">
+                  and ${criterion.condition}
-                                    and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                                    <foreach close=")" collection="criterion.value" item="listItem"
+                    #{listItem}
-                                            open="(" separator=",">
+                  </foreach>
-                                        #{listItem}
+                </when>
-                                    </foreach>
+              </choose>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
             </foreach>
-        </where>
+          </trim>
-    </sql>
-    <sql id="Base_Column_List">
-        id
-        , name, password, display_name, email
-    </sql>
-    <select id="selectByExample"
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample"
-            resultMap="BaseResultMap">
-        select
-        <if test="distinct">
-            distinct
         </if>
-        <include refid="Base_Column_List"/>
+      </foreach>
-        from s2_user
+    </where>
-        <if test="_parameter != null">
+  </sql>
-            <include refid="Example_Where_Clause"/>
+  <sql id="Base_Column_List">
-        </if>
+    id, name, password, display_name, email, is_admin
-        <if test="orderByClause != null">
+  </sql>
-            order by ${orderByClause}
+  <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
-        </if>
+    select
-        <if test="limitStart != null and limitStart>=0">
+    <if test="distinct">
-            limit #{limitStart} , #{limitEnd}
+      distinct
-        </if>
+    </if>
-    </select>
+    <include refid="Base_Column_List" />
-    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    from s2_user
-        select
+    <if test="_parameter != null">
-        <include refid="Base_Column_List"/>
+      <include refid="Example_Where_Clause" />
-        from s2_user
+    </if>
-        where id = #{id,jdbcType=BIGINT}
+    <if test="orderByClause != null">
-    </select>
+      order by ${orderByClause}
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    </if>
-        delete
+    <if test="limitStart != null and limitStart>=0">
-        from s2_user
+      limit #{limitStart} , #{limitEnd}
-        where id = #{id,jdbcType=BIGINT}
+    </if>
-    </delete>
+  </select>
-    <insert id="insert"
+  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+    insert into s2_user (id, name, password, 
-        insert into s2_user (id, name, password,
+      display_name, email, is_admin
-                             display_name, email)
+      )
-        values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-                #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR})
+      #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{isAdmin,jdbcType=INTEGER}
-    </insert>
+      )
-    <insert id="insertSelective"
+  </insert>
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+  <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-        insert into s2_user
+    insert into s2_user
-        <trim prefix="(" suffix=")" suffixOverrides=",">
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
+      <if test="id != null">
-                id,
+        id,
-            </if>
+      </if>
-            <if test="name != null">
+      <if test="name != null">
-                name,
+        name,
-            </if>
+      </if>
-            <if test="password != null">
+      <if test="password != null">
-                password,
+        password,
-            </if>
+      </if>
-            <if test="displayName != null">
+      <if test="displayName != null">
-                display_name,
+        display_name,
-            </if>
+      </if>
-            <if test="email != null">
+      <if test="email != null">
-                email,
+        email,
-            </if>
+      </if>
-        </trim>
+      <if test="isAdmin != null">
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
+        is_admin,
-            <if test="id != null">
+      </if>
-                #{id,jdbcType=BIGINT},
+    </trim>
-            </if>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">
+      <if test="id != null">
-                #{name,jdbcType=VARCHAR},
+        #{id,jdbcType=BIGINT},
-            </if>
+      </if>
-            <if test="password != null">
+      <if test="name != null">
-                #{password,jdbcType=VARCHAR},
+        #{name,jdbcType=VARCHAR},
-            </if>
+      </if>
-            <if test="displayName != null">
+      <if test="password != null">
-                #{displayName,jdbcType=VARCHAR},
+        #{password,jdbcType=VARCHAR},
-            </if>
+      </if>
-            <if test="email != null">
+      <if test="displayName != null">
-                #{email,jdbcType=VARCHAR},
+        #{displayName,jdbcType=VARCHAR},
-            </if>
+      </if>
-        </trim>
+      <if test="email != null">
-    </insert>
+        #{email,jdbcType=VARCHAR},
-    <select id="countByExample"
+      </if>
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample"
+      <if test="isAdmin != null">
-            resultType="java.lang.Long">
+        #{isAdmin,jdbcType=INTEGER},
-        select count(*) from s2_user
+      </if>
-        <if test="_parameter != null">
+    </trim>
-            <include refid="Example_Where_Clause"/>
+  </insert>
-        </if>
+  <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultType="java.lang.Long">
-    </select>
+    select count(*) from s2_user
-    <update id="updateByPrimaryKeySelective"
+    <if test="_parameter != null">
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+      <include refid="Example_Where_Clause" />
-        update s2_user
+    </if>
-        <set>
+  </select>
-            <if test="name != null">
-                name = #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="password != null">
-                password = #{password,jdbcType=VARCHAR},
-            </if>
-            <if test="displayName != null">
-                display_name = #{displayName,jdbcType=VARCHAR},
-            </if>
-            <if test="email != null">
-                email = #{email,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=BIGINT}
-    </update>
-    <update id="updateByPrimaryKey"
-            parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-        update s2_user
-        set name         = #{name,jdbcType=VARCHAR},
-            password     = #{password,jdbcType=VARCHAR},
-            display_name = #{displayName,jdbcType=VARCHAR},
-            email        = #{email,jdbcType=VARCHAR}
-        where id = #{id,jdbcType=BIGINT}
-    </update>
 </mapper>

auth/authorization/pom.xml

@@ -35,10 +35,6 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
             <artifactId>auth-authentication</artifactId>
@@ -48,4 +44,4 @@
 
     </dependencies>
 
-</project>
+</project>

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

@@ -1,11 +1,14 @@
 package com.tencent.supersonic.auth.authorization.rest;
 
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
+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.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 lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +40,7 @@ public class AuthController {
     @PostMapping("/createGroup")
     public void newAuthGroup(@RequestBody AuthGroup group) {
         group.setGroupId(null);
-        authService.updateAuthGroup(group);
+        authService.addOrUpdateAuthGroup(group);
     }
 
     @PostMapping("/removeGroup")
@@ -55,19 +58,20 @@ public class AuthController {
         if (group.getGroupId() == null || group.getGroupId() == 0) {
             throw new RuntimeException("groupId is empty");
         }
-        authService.updateAuthGroup(group);
+        authService.addOrUpdateAuthGroup(group);
     }
 
     /**
      * 查询有权限访问的受限资源id
      *
      * @param req
-     * @param request
      * @return
      */
     @PostMapping("/queryAuthorizedRes")
     public AuthorizedResourceResp queryAuthorizedResources(@RequestBody QueryAuthResReq req,
-            HttpServletRequest request) {
+                                                           HttpServletRequest request,
-        return authService.queryAuthorizedResources(req, 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,28 +1,28 @@
-package com.tencent.supersonic.auth.authorization.application;
+package com.tencent.supersonic.auth.authorization.service;
 
 import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 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;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthResGrp;
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthRule;
 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 java.util.ArrayList;
+import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
-import java.util.List;
+import com.tencent.supersonic.auth.api.authorization.pojo.AuthRule;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -33,7 +33,7 @@ public class AuthServiceImpl implements AuthService {
     private UserService userService;
 
     public AuthServiceImpl(JdbcTemplate jdbcTemplate,
-            UserService userService) {
+                           UserService userService) {
         this.jdbcTemplate = jdbcTemplate;
         this.userService = userService;
     }
@@ -48,12 +48,12 @@ public class AuthServiceImpl implements AuthService {
     public List<AuthGroup> queryAuthGroups(String modelId, Integer groupId) {
         return load().stream()
                 .filter(group -> (Objects.isNull(groupId) || groupId.equals(group.getGroupId()))
-                        && modelId.equals(group.getModelId()))
+                        && modelId.equals(group.getModelId().toString()))
                 .collect(Collectors.toList());
     }
 
     @Override
-    public void updateAuthGroup(AuthGroup group) {
+    public void addOrUpdateAuthGroup(AuthGroup group) {
         Gson g = new Gson();
         if (group.getGroupId() == null) {
             int nextGroupId = 1;
@@ -76,21 +76,17 @@ public class AuthServiceImpl implements AuthService {
         jdbcTemplate.update("delete from s2_auth_groups where group_id = ?", group.getGroupId());
     }
 
-
     @Override
-    public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, HttpServletRequest request) {
+    public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, User user) {
-        Set<String> userOrgIds = userService.getUserAllOrgId(req.getUser());
+        Set<String> userOrgIds = userService.getUserAllOrgId(user.getName());
-        if (!CollectionUtils.isEmpty(userOrgIds)) {
+        List<AuthGroup> groups = getAuthGroups(req.getModelIds(), user.getName(), new ArrayList<>(userOrgIds));
-            req.setDepartmentIds(new ArrayList<>(userOrgIds));
-        }
-        List<AuthGroup> groups = getAuthGroups(req);
         AuthorizedResourceResp resource = new AuthorizedResourceResp();
-        Map<String, List<AuthGroup>> authGroupsByModelId = groups.stream()
+        Map<Long, List<AuthGroup>> authGroupsByModelId = groups.stream()
                 .collect(Collectors.groupingBy(AuthGroup::getModelId));
-        Map<String, List<AuthRes>> reqAuthRes = req.getResources().stream()
+        Map<Long, List<AuthRes>> reqAuthRes = req.getResources().stream()
                 .collect(Collectors.groupingBy(AuthRes::getModelId));
 
-        for (String modelId : reqAuthRes.keySet()) {
+        for (Long modelId : reqAuthRes.keySet()) {
             List<AuthRes> reqResourcesList = reqAuthRes.get(modelId);
             AuthResGrp rg = new AuthResGrp();
             if (authGroupsByModelId.containsKey(modelId)) {
@@ -113,8 +109,11 @@ public class AuthServiceImpl implements AuthService {
             }
         }
 
-        if (StringUtils.isNotEmpty(req.getModelId())) {
+        if (!CollectionUtils.isEmpty(req.getModelIds())) {
-            List<AuthGroup> authGroups = authGroupsByModelId.get(req.getModelId());
+            List<AuthGroup> authGroups = Lists.newArrayList();
+            for (Long modelId : authGroupsByModelId.keySet()) {
+                authGroups.addAll(authGroupsByModelId.getOrDefault(modelId, Lists.newArrayList()));
+            }
             if (!CollectionUtils.isEmpty(authGroups)) {
                 for (AuthGroup group : authGroups) {
                     if (group.getDimensionFilters() != null
@@ -130,17 +129,17 @@ public class AuthServiceImpl implements AuthService {
         return resource;
     }
 
-    private List<AuthGroup> getAuthGroups(QueryAuthResReq req) {
+    private List<AuthGroup> getAuthGroups(List<Long> modelIds, String userName, List<String> departmentIds) {
         List<AuthGroup> groups = load().stream()
                 .filter(group -> {
-                    if (!Objects.equals(group.getModelId(), req.getModelId())) {
+                    if (CollectionUtils.isEmpty(modelIds) || !modelIds.contains(group.getModelId())) {
                         return false;
                     }
                     if (!CollectionUtils.isEmpty(group.getAuthorizedUsers()) && group.getAuthorizedUsers()
-                            .contains(req.getUser())) {
+                            .contains(userName)) {
                         return true;
                     }
-                    for (String departmentId : req.getDepartmentIds()) {
+                    for (String departmentId : departmentIds) {
                         if (!CollectionUtils.isEmpty(group.getAuthorizedDepartmentIds())
                                 && group.getAuthorizedDepartmentIds().contains(departmentId)) {
                             return true;
@@ -148,7 +147,7 @@ public class AuthServiceImpl implements AuthService {
                     }
                     return false;
                 }).collect(Collectors.toList());
-        log.info("user:{} department:{} authGroups:{}", req.getUser(), req.getDepartmentIds(), groups);
+        log.info("user:{} department:{} authGroups:{}", userName, departmentIds, groups);
         return groups;
     }
 

chat/api/pom.xml

@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-api</artifactId>
+            <artifactId>headless-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SchemaMapper.java

@@ -1,15 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-
-/**
- * This interface defines the contract for a schema mapper that identifies references to schema
- * elements in natural language queries.
- *
- * The schema mapper matches queries against the knowledge base which is constructed using the
- * schema of semantic models.
- */
-public interface SchemaMapper {
-
-    void map(QueryContext queryContext);
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticLayer.java

@@ -1,52 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.common.pojo.enums.AuthType;
-import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
-import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
-import java.util.List;
-
-/**
- * This interface defines the contract for a semantic layer that provides a simplified and
- * consistent view of data from multiple sources.
- * The semantic layer abstracts away the complexity of the underlying data sources and provides
- * a unified view of the data that is easier to understand and use.
- * <p>
- * The interface defines methods for getting metadata as well as querying data in the semantic layer.
- * Implementations of this interface should provide concrete implementations that interact with the
- * underlying data sources and return results in a consistent format. Or it can be implemented
- * as proxy to a remote semantic service.
- * </p>
- */
-public interface SemanticLayer {
-
-    QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user);
-
-    QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
-
-    QueryResultWithSchemaResp queryByDsl(QueryDslReq queryDslReq, User user);
-
-    List<ModelSchema> getModelSchema();
-
-    List<ModelSchema> getModelSchema(List<Long> ids);
-
-    ModelSchema getModelSchema(Long model, Boolean cacheEnable);
-
-    PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionCmd);
-
-    PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd);
-
-    List<DomainResp> getDomainList(User user);
-
-    List<ModelResp> getModelList(AuthType authType, Long domainId, User user);
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticParser.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-
-import com.tencent.supersonic.chat.api.pojo.ChatContext;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-
-/**
- * This interface defines the contract for a semantic parser that can analyze natural language query
- * and extract meaning from it.
- *
- * The semantic parser uses either rule-based or model-based algorithms to identify query intent
- * and related semantic items described in the query.
- */
-public interface SemanticParser {
-
-    void parse(QueryContext queryContext, ChatContext chatContext);
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/ModelSchema.java

@@ -1,45 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import lombok.Data;
-
-@Data
-public class ModelSchema {
-
-    private SchemaElement model;
-    private Set<SchemaElement> metrics = new HashSet<>();
-    private Set<SchemaElement> dimensions = new HashSet<>();
-    private Set<SchemaElement> dimensionValues = new HashSet<>();
-    private SchemaElement entity = new SchemaElement();
-
-    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = Optional.ofNullable(entity);
-                break;
-            case MODEL:
-                element = Optional.of(model);
-                break;
-            case METRIC:
-                element = metrics.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            case DIMENSION:
-                element = dimensions.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            case VALUE:
-                element = dimensionValues.stream().filter(e -> e.getId() == elementID).findFirst();
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/QueryContext.java

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.tencent.supersonic.chat.api.component.SemanticQuery;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class QueryContext {
-
-    private QueryReq request;
-    private List<SemanticQuery> candidateQueries = new ArrayList<>();
-    private SchemaMapInfo mapInfo = new SchemaMapInfo();
-
-    public QueryContext(QueryReq request) {
-        this.request = request;
-    }
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SchemaElementMatch.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo;
 
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SchemaMapInfo.java

@@ -1,5 +1,7 @@
 package com.tencent.supersonic.chat.api.pojo;
 
+import com.google.common.collect.Lists;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -7,21 +9,25 @@ import java.util.Set;
 
 public class SchemaMapInfo {
 
-    private Map<Long, List<SchemaElementMatch>> modelElementMatches = new HashMap<>();
+    private Map<Long, List<SchemaElementMatch>> viewElementMatches = new HashMap<>();
 
-    public Set<Long> getMatchedModels() {
+    public Set<Long> getMatchedViewInfos() {
-        return modelElementMatches.keySet();
+        return viewElementMatches.keySet();
     }
 
-    public List<SchemaElementMatch> getMatchedElements(Long model) {
+    public List<SchemaElementMatch> getMatchedElements(Long view) {
-        return modelElementMatches.get(model);
+        return viewElementMatches.getOrDefault(view, Lists.newArrayList());
     }
 
-    public Map<Long, List<SchemaElementMatch>> getModelElementMatches() {
+    public Map<Long, List<SchemaElementMatch>> getViewElementMatches() {
-        return modelElementMatches;
+        return viewElementMatches;
     }
 
-    public void setMatchedElements(Long model, List<SchemaElementMatch> elementMatches) {
+    public void setViewElementMatches(Map<Long, List<SchemaElementMatch>> viewElementMatches) {
-        modelElementMatches.put(model, elementMatches);
+        this.viewElementMatches = viewElementMatches;
+    }
+
+    public void setMatchedElements(Long view, List<SchemaElementMatch> elementMatches) {
+        viewElementMatches.put(view, elementMatches);
     }
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticCorrectInfo.java

@@ -0,0 +1,22 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SemanticCorrectInfo {
+
+    private QueryFilters queryFilters;
+
+    private SemanticParseInfo parseInfo;
+
+    private String sql;
+
+    private String preSql;
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java

@@ -1,10 +1,17 @@
 package com.tencent.supersonic.chat.api.pojo;
 
 
+import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
+import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.Order;
+import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
+import com.tencent.supersonic.common.pojo.enums.FilterType;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -13,39 +20,41 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import lombok.Data;
 
 @Data
 public class SemanticParseInfo {
 
+    private Integer id;
     private String queryMode;
-    private SchemaElement model;
+    private SchemaElement view;
     private Set<SchemaElement> metrics = new TreeSet<>(new SchemaNameLengthComparator());
     private Set<SchemaElement> dimensions = new LinkedHashSet();
     private SchemaElement entity;
     private AggregateTypeEnum aggType = AggregateTypeEnum.NONE;
+    private FilterType filterType = FilterType.UNION;
     private Set<QueryFilter> dimensionFilters = new LinkedHashSet();
     private Set<QueryFilter> metricFilters = new LinkedHashSet();
     private Set<Order> orders = new LinkedHashSet();
     private DateConf dateInfo;
     private Long limit;
-    private Boolean nativeQuery = false;
     private double score;
     private List<SchemaElementMatch> elementMatches = new ArrayList<>();
     private Map<String, Object> properties = new HashMap<>();
-
+    private EntityInfo entityInfo;
-    public Long getModelId() {
+    private SqlInfo sqlInfo = new SqlInfo();
-        return model != null ? model.getId() : 0L;
+    private QueryType queryType = QueryType.ID;
-    }
-
-    public String getModelName() {
-        return model != null ? model.getName() : "null";
-    }
 
     private static class SchemaNameLengthComparator implements Comparator<SchemaElement> {
 
         @Override
         public int compare(SchemaElement o1, SchemaElement o2) {
+            if (o1.getOrder() != o2.getOrder()) {
+                if (o1.getOrder() < o2.getOrder()) {
+                    return -1;
+                } else {
+                    return 1;
+                }
+            }
             int len1 = o1.getName().length();
             int len2 = o2.getName().length();
             if (len1 != len2) {
@@ -63,4 +72,15 @@ public class SemanticParseInfo {
         return metrics;
     }
 
+    public Long getViewId() {
+        if (view == null) {
+            return null;
+        }
+        return view.getView();
+    }
+
+    public SchemaElement getModel() {
+        return view;
+    }
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticSchema.java

@@ -1,55 +1,157 @@
 package com.tencent.supersonic.chat.api.pojo;
 
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import org.springframework.util.CollectionUtils;
 
 public class SemanticSchema implements Serializable {
 
-    private List<ModelSchema> modelSchemaList;
+    private List<ViewSchema> viewSchemaList;
 
-    public SemanticSchema(List<ModelSchema> modelSchemaList) {
+    public SemanticSchema(List<ViewSchema> viewSchemaList) {
-        this.modelSchemaList = modelSchemaList;
+        this.viewSchemaList = viewSchemaList;
     }
 
-    public void add(ModelSchema schema) {
+    public void add(ViewSchema schema) {
-        modelSchemaList.add(schema);
+        viewSchemaList.add(schema);
     }
 
-    public Map<Long, String> getModelIdToName() {
+    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
-        return modelSchemaList.stream()
+        Optional<SchemaElement> element = Optional.empty();
-                .collect(Collectors.toMap(a -> a.getModel().getId(), a -> a.getModel().getName(), (k1, k2) -> k1));
+
+        switch (elementType) {
+            case ENTITY:
+                element = getElementsById(elementID, getEntities());
+                break;
+            case VIEW:
+                element = getElementsById(elementID, getViews());
+                break;
+            case METRIC:
+                element = getElementsById(elementID, getMetrics());
+                break;
+            case DIMENSION:
+                element = getElementsById(elementID, getDimensions());
+                break;
+            case VALUE:
+                element = getElementsById(elementID, getDimensionValues());
+                break;
+            default:
+        }
+
+        if (element.isPresent()) {
+            return element.get();
+        } else {
+            return null;
+        }
+    }
+
+    public Map<Long, String> getViewIdToName() {
+        return viewSchemaList.stream()
+                .collect(Collectors.toMap(a -> a.getView().getId(), a -> a.getView().getName(), (k1, k2) -> k1));
     }
 
     public List<SchemaElement> getDimensionValues() {
         List<SchemaElement> dimensionValues = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> dimensionValues.addAll(d.getDimensionValues()));
+        viewSchemaList.stream().forEach(d -> dimensionValues.addAll(d.getDimensionValues()));
         return dimensionValues;
     }
 
     public List<SchemaElement> getDimensions() {
         List<SchemaElement> dimensions = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> dimensions.addAll(d.getDimensions()));
+        viewSchemaList.stream().forEach(d -> dimensions.addAll(d.getDimensions()));
         return dimensions;
     }
 
+    public List<SchemaElement> getDimensions(Long viewId) {
+        List<SchemaElement> dimensions = getDimensions();
+        return getElementsByViewId(viewId, dimensions);
+    }
+
+    public SchemaElement getDimension(Long id) {
+        List<SchemaElement> dimensions = getDimensions();
+        Optional<SchemaElement> dimension = getElementsById(id, dimensions);
+        return dimension.orElse(null);
+    }
+
+    public List<SchemaElement> getTags() {
+        List<SchemaElement> tags = new ArrayList<>();
+        viewSchemaList.stream().forEach(d -> tags.addAll(d.getTags()));
+        return tags;
+    }
+
+    public List<SchemaElement> getTags(Long viewId) {
+        List<SchemaElement> tags = new ArrayList<>();
+        viewSchemaList.stream().filter(schemaElement ->
+                        viewId.equals(schemaElement.getView().getView()))
+                .forEach(d -> tags.addAll(d.getTags()));
+        return tags;
+    }
+
     public List<SchemaElement> getMetrics() {
         List<SchemaElement> metrics = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> metrics.addAll(d.getMetrics()));
+        viewSchemaList.stream().forEach(d -> metrics.addAll(d.getMetrics()));
         return metrics;
     }
 
-    public List<SchemaElement> getModels() {
+    public List<SchemaElement> getMetrics(Long viewId) {
-        List<SchemaElement> models = new ArrayList<>();
+        List<SchemaElement> metrics = getMetrics();
-        modelSchemaList.stream().forEach(d -> models.add(d.getModel()));
+        return getElementsByViewId(viewId, metrics);
-        return models;
     }
 
     public List<SchemaElement> getEntities() {
         List<SchemaElement> entities = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
+        viewSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
         return entities;
     }
+
+    public List<SchemaElement> getEntities(Long viewId) {
+        List<SchemaElement> entities = getEntities();
+        return getElementsByViewId(viewId, entities);
+    }
+
+    private List<SchemaElement> getElementsByViewId(Long viewId, List<SchemaElement> elements) {
+        return elements.stream()
+                .filter(schemaElement -> viewId.equals(schemaElement.getView()))
+                .collect(Collectors.toList());
+    }
+
+    private Optional<SchemaElement> getElementsById(Long id, List<SchemaElement> elements) {
+        return elements.stream()
+                .filter(schemaElement -> id.equals(schemaElement.getId()))
+                .findFirst();
+    }
+
+    public SchemaElement getView(Long viewId) {
+        List<SchemaElement> views = getViews();
+        return getElementsById(viewId, views).orElse(null);
+    }
+
+    public List<SchemaElement> getViews() {
+        List<SchemaElement> views = new ArrayList<>();
+        viewSchemaList.stream().forEach(d -> views.add(d.getView()));
+        return views;
+    }
+
+    public Map<String, String> getBizNameToName(Long viewId) {
+        List<SchemaElement> allElements = new ArrayList<>();
+        allElements.addAll(getDimensions(viewId));
+        allElements.addAll(getMetrics(viewId));
+        return allElements.stream()
+                .collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
+    }
+
+    public Map<Long, ViewSchema> getViewSchemaMap() {
+        if (CollectionUtils.isEmpty(viewSchemaList)) {
+            return new HashMap<>();
+        }
+        return viewSchemaList.stream().collect(Collectors.toMap(viewSchema
+                -> viewSchema.getView().getView(), viewSchema -> viewSchema));
+    }
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/ViewSchema.java

@@ -0,0 +1,113 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import com.tencent.supersonic.headless.api.pojo.QueryConfig;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
+import com.tencent.supersonic.headless.api.pojo.TagTypeDefaultConfig;
+import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig;
+import lombok.Data;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+@Data
+public class ViewSchema {
+
+    private SchemaElement view;
+    private Set<SchemaElement> metrics = new HashSet<>();
+    private Set<SchemaElement> dimensions = new HashSet<>();
+    private Set<SchemaElement> dimensionValues = new HashSet<>();
+    private Set<SchemaElement> tags = new HashSet<>();
+    private SchemaElement entity = new SchemaElement();
+    private QueryConfig queryConfig;
+
+    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
+        Optional<SchemaElement> element = Optional.empty();
+
+        switch (elementType) {
+            case ENTITY:
+                element = Optional.ofNullable(entity);
+                break;
+            case VIEW:
+                element = Optional.of(view);
+                break;
+            case METRIC:
+                element = metrics.stream().filter(e -> e.getId() == elementID).findFirst();
+                break;
+            case DIMENSION:
+                element = dimensions.stream().filter(e -> e.getId() == elementID).findFirst();
+                break;
+            case VALUE:
+                element = dimensionValues.stream().filter(e -> e.getId() == elementID).findFirst();
+                break;
+            case TAG:
+                element = tags.stream().filter(e -> e.getId() == elementID).findFirst();
+                break;
+            default:
+        }
+
+        if (element.isPresent()) {
+            return element.get();
+        } else {
+            return null;
+        }
+    }
+
+    public SchemaElement getElement(SchemaElementType elementType, String name) {
+        Optional<SchemaElement> element = Optional.empty();
+
+        switch (elementType) {
+            case ENTITY:
+                element = Optional.ofNullable(entity);
+                break;
+            case VIEW:
+                element = Optional.of(view);
+                break;
+            case METRIC:
+                element = metrics.stream().filter(e -> name.equals(e.getName())).findFirst();
+                break;
+            case DIMENSION:
+                element = dimensions.stream().filter(e -> name.equals(e.getName())).findFirst();
+                break;
+            case VALUE:
+                element = dimensionValues.stream().filter(e -> name.equals(e.getName())).findFirst();
+                break;
+            default:
+        }
+
+        if (element.isPresent()) {
+            return element.get();
+        } else {
+            return null;
+        }
+    }
+
+    public TimeDefaultConfig getTagTypeTimeDefaultConfig() {
+        if (queryConfig == null) {
+            return null;
+        }
+        if (queryConfig.getTagTypeDefaultConfig() == null) {
+            return null;
+        }
+        return queryConfig.getTagTypeDefaultConfig().getTimeDefaultConfig();
+    }
+
+    public TimeDefaultConfig getMetricTypeTimeDefaultConfig() {
+        if (queryConfig == null) {
+            return null;
+        }
+        if (queryConfig.getMetricTypeDefaultConfig() == null) {
+            return null;
+        }
+        return queryConfig.getMetricTypeDefaultConfig().getTimeDefaultConfig();
+    }
+
+    public TagTypeDefaultConfig getTagTypeDefaultConfig() {
+        if (queryConfig == null) {
+            return null;
+        }
+        return queryConfig.getTagTypeDefaultConfig();
+    }
+
+}

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

@@ -1,8 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ChatAggConfigReq {
 

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

@@ -1,10 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
-import java.util.List;
+
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.List;
+
 /**
  * extended information command about model
  */
@@ -30,6 +32,11 @@ public class ChatConfigBaseReq {
      */
     private List<RecommendedQuestionReq> recommendedQuestions;
 
+    /**
+     *  the llm examples about the model
+     */
+    private String llmExamples;
+
     /**
      * available status
      */

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

@@ -1,10 +1,10 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 
-import com.tencent.supersonic.common.pojo.Constants;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
 
 @Data
 public class ChatDefaultConfigReq {
@@ -12,26 +12,5 @@ public class ChatDefaultConfigReq {
     private List<Long> dimensionIds = new ArrayList<>();
     private List<Long> metricIds = new ArrayList<>();
 
-    /**
-     * default time span unit
-     */
-    private Integer unit = 1;
-
-    /**
-     * default time type: day
-     * DAY, WEEK, MONTH, YEAR
-     */
-    private String period = Constants.DAY;
-
-    private TimeMode timeMode = TimeMode.LAST;
-
-    public enum TimeMode {
-        /**
-         * date mode
-         * LAST   - a certain time
-         * RECENT - a period time
-         */
-        LAST, RECENT
-    }
 
 }

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

@@ -1,8 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ChatDetailConfigReq {
 

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

@@ -3,14 +3,18 @@ package com.tencent.supersonic.chat.api.pojo.request;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import lombok.Builder;
 import lombok.Data;
 
+@Builder
 @Data
 public class ExecuteQueryReq {
-
     private User user;
+    private Integer agentId;
     private Integer chatId;
     private String queryText;
+    private Long queryId;
+    private Integer parseId;
     private SemanticParseInfo parseInfo;
-    private boolean saveAnswer = true;
+    private boolean saveAnswer;
 }

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

@@ -0,0 +1,13 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class ItemNameVisibility {
+
+    private ItemNameVisibilityInfo aggVisibilityInfo;
+
+    private ItemNameVisibilityInfo detailVisibilityInfo;
+}

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

@@ -0,0 +1,23 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Data
+@ToString
+public class ItemNameVisibilityInfo {
+
+    /**
+     * invisible dimensions
+     */
+    private List<String> blackDimNameList = new ArrayList<>();
+
+    /**
+     * invisible metrics
+     */
+    private List<String> blackMetricNameList = new ArrayList<>();
+}

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

@@ -1,8 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
 
 /**
  * advanced knowledge config

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

@@ -1,7 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+
 import javax.validation.constraints.NotNull;
+
 import lombok.Data;
 
 /**
@@ -30,6 +32,4 @@ public class KnowledgeInfoReq {
      * advanced knowledge config for single item
      */
     private KnowledgeAdvancedConfig knowledgeAdvancedConfig;
-
-
 }

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
 public class PageQueryInfoReq {
@@ -11,27 +12,9 @@ public class PageQueryInfoReq {
 
     private String userName;
 
-    public int getPageSize() {
+    private List<Long> ids;
-        return pageSize;
-    }
 
-    public void setPageSize(int pageSize) {
+    public Integer getLimitStart() {
-        this.pageSize = pageSize;
+        return this.pageSize * (this.current - 1);
-    }
-
-    public int getCurrent() {
-        return current;
-    }
-
-    public void setCurrent(int current) {
-        this.current = current;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
     }
 }

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

@@ -13,7 +13,7 @@ public class PluginQueryReq {
 
     private String type;
 
-    private String model;
+    private String view;
 
     private String pattern;
 

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

@@ -1,24 +1,21 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.common.pojo.DateConf;
-import com.tencent.supersonic.common.pojo.Order;
 import java.util.HashSet;
 import java.util.Set;
 import lombok.Data;
 
 @Data
 public class QueryDataReq {
-
+    private User user;
-    String queryMode;
+    private Set<SchemaElement> metrics = new HashSet<>();
-    SchemaElement model;
+    private Set<SchemaElement> dimensions = new HashSet<>();
-    Set<SchemaElement> metrics = new HashSet<>();
+    private Set<QueryFilter> dimensionFilters = new HashSet<>();
-    Set<SchemaElement> dimensions = new HashSet<>();
+    private Set<QueryFilter> metricFilters = new HashSet<>();
-    Set<QueryFilter> dimensionFilters = new HashSet<>();
-    Set<QueryFilter> metricFilters = new HashSet<>();
-    private Set<Order> orders = new HashSet<>();
     private DateConf dateInfo;
-    private Long limit;
+    private Long queryId;
-    private Boolean nativeQuery = false;
+    private Integer parseId;
 }

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

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
+import com.google.common.base.Objects;
-import java.util.Objects;
+import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import lombok.Data;
 import lombok.ToString;
 
@@ -19,6 +19,8 @@ public class QueryFilter {
 
     private Long elementID;
 
+    private String function;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -27,14 +29,15 @@ public class QueryFilter {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        QueryFilter filter = (QueryFilter) o;
+        QueryFilter that = (QueryFilter) o;
-        return Objects.equals(bizName, filter.bizName) && Objects.equals(name, filter.name)
+        return Objects.equal(bizName, that.bizName) && Objects.equal(name,
-                && operator == filter.operator && Objects.equals(value, filter.value) && Objects.equals(
+                that.name) && operator == that.operator && Objects.equal(value, that.value)
-                elementID, filter.elementID);
+                && Objects.equal(elementID, that.elementID) && Objects.equal(
+                function, that.function);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(bizName, name, operator, value, elementID);
+        return Objects.hashCode(bizName, name, operator, value, elementID, function);
     }
 }

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

@@ -1,14 +1,13 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
+import lombok.Data;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.Data;
 
 @Data
 public class QueryFilters {
-
     private List<QueryFilter> filters = new ArrayList<>();
     private Map<String, Object> params = new HashMap<>();
 }

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

@@ -5,11 +5,11 @@ import lombok.Data;
 
 @Data
 public class QueryReq {
-
     private String queryText;
     private Integer chatId;
-    private Long modelId = 0L;
+    private Long modelId;
     private User user;
     private QueryFilters queryFilters;
     private boolean saveAnswer = true;
+    private Integer agentId;
 }

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

@@ -0,0 +1,13 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+
+import lombok.Data;
+
+@Data
+public class RecommendReq {
+
+    private Long modelId;
+
+    private Long metricId;
+
+}

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

@@ -0,0 +1,25 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SimilarQueryReq {
+
+    private Long queryId;
+
+    private Integer parseId;
+
+    private String queryText;
+
+    private Long viewId;
+
+    private Integer agentId;
+
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/AggregateInfo.java

@@ -6,6 +6,5 @@ import lombok.Data;
 
 @Data
 public class AggregateInfo {
-
     private List<MetricInfo> metricInfos = new ArrayList<>();
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatAggRichConfigResp.java

@@ -2,9 +2,10 @@ package com.tencent.supersonic.chat.api.pojo.response;
 
 import com.tencent.supersonic.chat.api.pojo.request.KnowledgeAdvancedConfig;
 import com.tencent.supersonic.chat.api.pojo.request.KnowledgeInfoReq;
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ChatAggRichConfigResp {
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigResp.java

@@ -4,8 +4,10 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatDetailConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+
 import java.util.Date;
 import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -21,6 +23,8 @@ public class ChatConfigResp {
 
     private List<RecommendedQuestionReq> recommendedQuestions;
 
+    private String llmExamples;
+
     /**
      * available status
      */

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatConfigRichResp.java

@@ -4,6 +4,7 @@ import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import java.util.Date;
 import java.util.List;
+
 import lombok.Data;
 
 @Data

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDefaultRichConfigResp.java

@@ -1,12 +1,13 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq;
 import com.tencent.supersonic.common.pojo.Constants;
-import java.util.List;
+import com.tencent.supersonic.common.pojo.enums.TimeMode;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ChatDefaultRichConfigResp {
 
@@ -20,11 +21,11 @@ public class ChatDefaultRichConfigResp {
     private Integer unit = 1;
 
     /**
-     * default time type: day
+     * default time type:
      * DAY, WEEK, MONTH, YEAR
      */
     private String period = Constants.DAY;
 
-    private ChatDefaultConfigReq.TimeMode timeMode;
+    private TimeMode timeMode;
 
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDetailRichConfigResp.java

@@ -2,9 +2,10 @@ package com.tencent.supersonic.chat.api.pojo.response;
 
 import com.tencent.supersonic.chat.api.pojo.request.KnowledgeAdvancedConfig;
 import com.tencent.supersonic.chat.api.pojo.request.KnowledgeInfoReq;
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ChatDetailRichConfigResp {
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DataInfo.java

@@ -1,8 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DataInfo {
 
     private Integer itemId;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/DictLatestTaskResp.java

@@ -1,12 +1,16 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.api.pojo.response;
-
 
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
-import java.util.Date;
 import lombok.Data;
+import lombok.ToString;
 
+import java.util.Date;
+
+@ToString
 @Data
-public class DimValueDictInfo {
+public class DictLatestTaskResp {
+
+    private Long dimId;
 
     private Long id;
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/EntityInfo.java

@@ -1,14 +1,16 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
 
 @Data
 public class EntityInfo {
 
-    private ModelInfo modelInfo = new ModelInfo();
+    private ViewInfo viewInfo = new ViewInfo();
     private List<DataInfo> dimensions = new ArrayList<>();
     private List<DataInfo> metrics = new ArrayList<>();
     private String entityId;
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/EntityRichInfoResp.java

@@ -1,14 +1,14 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+
 import java.util.List;
 import lombok.Data;
 
 @Data
 public class EntityRichInfoResp {
-
     /**
-     * entity alias
+     *  entity alias
      */
     private List<String> names;
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java

@@ -1,29 +1,23 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.Getter;
+import java.util.List;
-import lombok.NoArgsConstructor;
 
 @Data
-@Getter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class ParseResp {
-
     private Integer chatId;
     private String queryText;
+    private Long queryId;
     private ParseState state;
-    private List<SemanticParseInfo> selectedParses;
+    private List<SemanticParseInfo> selectedParses = Lists.newArrayList();
-    private List<SemanticParseInfo> candidateParses;
+    private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO();
 
     public enum ParseState {
         COMPLETED,
         PENDING,
         FAILED
     }
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseTimeCostDO.java

@@ -0,0 +1,15 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+import lombok.Data;
+
+@Data
+public class ParseTimeCostDO {
+
+    private long parseStartTime;
+    private long parseTime;
+    private long sqlTime;
+
+    public ParseTimeCostDO() {
+        this.parseStartTime = System.currentTimeMillis();
+    }
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryRecallResp.java

@@ -0,0 +1,11 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryRecallResp {
+    private List<SimilarQueryRecallResp> solvedQueryRecallRespList;
+    private Long queryTimeCost;
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java

@@ -1,7 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import java.util.Date;
+import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import lombok.Data;
+import java.util.Date;
+import java.util.List;
 
 @Data
 public class QueryResp {
@@ -13,4 +15,8 @@ public class QueryResp {
     private String feedback;
     private String queryText;
     private QueryResult queryResult;
+    private List<SemanticParseInfo> parseInfos;
+    private List<SimilarQueryRecallResp> similarQueries;
+
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java

@@ -1,11 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import lombok.Data;
 import java.util.List;
 import java.util.Map;
-import lombok.Data;
 
 @Data
 public class QueryResult {
@@ -21,4 +22,6 @@ public class QueryResult {
     private SemanticParseInfo chatContext;
     private Object response;
     private List<Map<String, Object>> queryResults;
+    private Long queryTimeCost;
+    private List<SchemaElement> recommendedDimensions;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendQuestionResp.java

@@ -1,14 +1,14 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
 import com.tencent.supersonic.chat.api.pojo.request.RecommendedQuestionReq;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 public class RecommendQuestionResp {
-
     private Long modelId;
     private List<RecommendedQuestionReq> recommendedQuestions;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/RecommendResp.java

@@ -1,12 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class RecommendResp {
-
     private List<SchemaElement> dimensions;
     private List<SchemaElement> metrics;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SearchResp.java

@@ -3,6 +3,7 @@ package com.tencent.supersonic.chat.api.pojo.response;
 import java.util.List;
 import lombok.Data;
 
+
 @Data
 public class SearchResp {
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SearchResult.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import java.util.Objects;
 import lombok.Builder;
 import lombok.Data;

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ShowCaseResp.java

@@ -0,0 +1,18 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ShowCaseResp {
+
+    private Map<Long, List<QueryResp>> showCaseMap;
+
+    private int pageSize;
+
+    private int current;
+
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java

@@ -0,0 +1,17 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SimilarQueryRecallResp {
+
+    private Long queryId;
+
+    private Integer parseId;
+
+    private String queryText;
+
+}