(fix)(chat) Fix query dimension value error (#440)

Co-authored-by: jolunoluo

.gitignore

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

CHANGELOG

@@ -1,21 +0,0 @@
-davinci 0.3.0 change log
-1) add data portal
-2) add metric trend chart
-3) add feedback component
-4) add tab component
-5) add page setting
-6) modify permission process
-7) optimize css style
-8) optimize filter
-9) delete view module
-
-
-supersonic 0.6.0 change log
-1) add llm parser and llm api server
-2) support fuzzy mapping
-3) support query filter and domain filter in query and search
-4) support standalone mode
-5) add dsl query in semantic
-6) code architecture adjustment in semantic and chat
-7) add unit testing and integration testing
-8) support dimension and metric alias

CHANGELOG.md

@@ -0,0 +1,160 @@
+# SuperSonic Changelog
+
+- All notable changes to this project will be documented in this file.
+- "Breaking Changes" describes any changes that may break existing functionality or cause
+  compatibility issues with previous versions.
+
+## SuperSonic [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
+
+### Added
+- Support asynchronous query - return parse information to user before executing result
+- Add Model as the basic data structure of the semantic definitions - this will repalce the old conception of subdomain
+
+### Updated
+- improve knowledge word similarity algorithm
+- improve embedding plugin chooser
+- improve DSLQuery field correction and parser
+
+
+### Fixed
+-  Fix mapper error that detectWord text is shorter than word
+-  Fix MetricDomainQuery inherit context
+  
+## SuperSonic [0.7.0] - 2023-07-30
+
+### Added
+
+- Add function call parser and embedding recall parser
+- Add plugin management
+- Add web page query and web service query
+- Metric filter query support querying metrics and comparing them in different dimensions
+- Support dimension value mapping
+- Support dimension/metric invisible, chat filter related data
+- Add user guide docs
+
+
+### Fixed
+
+- Fix the data problem of getDomainList interface in standalone mode
+
+## SuperSonic [0.6.0] - 2023-07-16
+
+### Added
+
+- Support llm parser and llm api server - users can query data through complex natural language.
+- Support fuzzy query dimension and metric name - users can set the 'metric.dimension.threshold'
+  parameter to control the fuzzy threshold.
+- Support query filter and domain filter in query and search - users can specify domainId and query
+  filter to filter the results in search and query.
+- Support standalone mode - users can integrate semantic and chat services in one process for easy
+  management and debugging.
+- Support dsl query in semantic - users can specify DSL language to query data in Semantic. In the
+  past, data querying was limited to struct language.
+- Add unit and integration testing - add integration tests for single-turn and multi-turn
+  conversations, to efficiently validate the code.
+- Support dimension and metric alias - users can specify one or multiple aliases to expand search
+  and query.
+- Add scheduled semantic metadata update functionality in chat.
+- Support create datasource by table name in the web page.
+- Add the ability to set permissions for domain.
+- Add a local/Remote implementation to the SemanticLayer interface.
+
+### Updated
+
+- Code architecture adjustment in chat.
+
+1) Abstracting into three modules, namely api, core, and knowledge. Providing four core interfaces:
+   SchemaMapper, SemanticLayer, SemanticParser, and SemanticQuery.
+2) Add RuleSemanticQuery and LLMSemanticQuery implement to SemanticQuery.
+3) Add all possible queries to the candidate queries, and then select the most suitable query from
+   the candidate queries.
+
+- Code architecture adjustment in semantic.
+
+1) Refactor semantic layer SQL parsing code through Calcite.
+2) Add QueryOptimizer interface.
+
+- Chat config subdivided into detailed and metric scenarios - users can set different parameters in these two scenarios.
+
+### Fixed
+
+- Resolved last word not be recognized in SchemaMapper.
+- Fix context inheritance problem.
+- Fix the error of querying H2 database by month unit.
+- Set faker user to context when authentication disable.
+
+## SuperSonic [0.5.0] - 2023-06-15
+
+### Added
+- Add the search and query feature in chat according to rules in an extensible way.
+- Add semantic/chat independent service for users.
+- Add Modeling Interface - users can visually define and maintain semantic models in the web page.
+- Add a unified semantic parsing layer - user can query data by struct language.
+
+# Davinci Changelog
+
+## Davinci [0.3.0] - 2023-06-15
+
+### Added
+
+- add data portal
+- add metric trend chart
+- add feedback component
+- add tab component
+- add page setting
+
+### Updated
+
+- modify permission process
+- optimize css style
+- optimize filter
+
+### Removed
+
+- delete view module

README.md

@@ -1,70 +1,63 @@
-English | [中文](README_CN.md)
+[中文介绍](README_CN.md) | [文档中心](https://github.com/tencentmusic/supersonic/wiki)
 
 # 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 define logical semantic models (metrics, dimensions, relationships, etc) on top of physical data models, and no data modification or copying is required. Meanwhile SuperSonic is designed to be plugable, allowing new functionalities to be added through plugins and core components to be integrated into other systems.
+**SuperSonic is an out-of-the-box yet highly extensible framework for building ChatBI**. 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.
 
-
-<img src="./docs/images/supersonic_demo.gif" align="center"/>
+<img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
 
 ## Motivation
 
-The emergence of Large Language Models (LLMs) like ChatGPT is reshaping the way information is retrieved. In the field of data analytics, both academia and industry are primarily focused on leveraging deep learning models to convert natural language queries into SQL queries. While some works show promising results, they are 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 works exhibit promising results, their **reliability** is inadequate for real-world applications.  
 
-From our perspective, the key to filling the real-world gap lies in two aspects: 
-1. Utilize a combination of rule-based and model-based semantic parsers to deal with different scenarios
-2. Introduce a semantic model layer to encapsulate underlying complexity thus simplify the semantic parsers
+From our perspective, the key to filling the real-world gap lies in three aspects: 
+1. Introduce a semantic layer encapsulating underlying data context(joins, formulas, etc) to reduce **complexity**.
+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 heuristic rules when necessary to improve **efficiency**(in terms of latency and cost).
 
-With these ideas in mind, we developed SuperSonic as a reference implementation and used it to power our real-world products. Additionally, to encourage further development of data chatbots, we decided 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 graphical interface for analytics engineers to manage semantic models
+- Built-in CUI(Chat User Interface) for *business users* to enter data queries
+- Built-in GUI(Graphical User 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
 
-SuperSonic is composed of two layers: supersonic-chat and supersonic-semantic. The chat layer is responsible for converting **natural language query** into semantic query (also known as DSL query), whereas the semantic layer is responsible for converting DSL query into **SQL query**. 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="65%" width="65%" align="center"/> 
 
-<img src="./docs/images/supersonic_components.png" height="80%" width="80%" align="center"/> 
+- **Knowledge Base:** extracts schema information periodically from the semantic models and build dictionary and index to facilitate schema mapping.
 
+- **Schema Mapper:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against the knowledge base.
 
-### Chat Layer
+- **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.
 
-The chat layer contains four core components:
+- **Semantic Corrector:** checks validity of extracted semantic information and performs correction and optimization if needed.
 
-- **Chat Interface:** accepts user queries and answer results with appropriate visualization charts. It supports input auto-completion as well as multi-turn conversation.
+- **Semantic Interpreter:** performs execution according to extracted semantic information. It generates SQL statements and executes them against physical data models.
 
-- **Schema Mapper Chain:** identifies references to semantic schema elements in user queries. It matches queries against the knowledage base which is constructed using the schema of semantic models.
-
-- **Semantic Parser Chain:** resolves query mode based on mapped semantic models. It is composed of a group of rule-based and model-based parsers, each of which deals with specific scenarios.
-
-- **Semantic Query:** performs execution according to the results of semantic parsing. The default semantic query would submit DSL to the semantic component, but new types of semantic query can be extended.
-
-### Semantic Layer
-
-The semantic layer contains four core components:
-
-- **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.
-
-- **DSL Parser:** converts DSL expression to intermediate structures. To make it easily integratable with analytics applications, SQL (without joins and calculation formulas) is used as the DSL.
-
-- **Query Planner:** builds and optimizes query plans according to various rules. 
-
-- **SQL Generator:** generates final SQL expression (with joins and calculation formulas) based on the query plan.
+- **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
-- Visit http://localhost:9080 in browser to start exploration
+- Run script "bin/supersonic-daemon.sh" to start services (one java process and one python process)
+- Visit http://localhost:9080 in the browser to start exploration
 
-## How to Build
+## Build and Development
 
-Pull the source code and run script "assembly/bin/build-standalone.sh" to build packages in the standalone mode.
+Please refer to project [wiki](https://github.com/tencentmusic/supersonic/wiki). 
+
+## WeChat Contact
+
+Please follow SuperSonic wechat official account:
+
+<img src="./docs/images/supersonic_wechat_oa.png" height="50%" width="50%" align="center"/> 

README_CN.md

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

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-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,53 @@
+@echo off
+setlocal
+chcp 65001
+set "sbinDir=%~dp0"
+set "baseDir=%~dp0.."
+set "buildDir=%baseDir%\build"
+set "runtimeDir=%baseDir%\..\runtime"
+set "pip_path=pip3"
+
+rem 1. build backend java modules
+del /q "%buildDir%\*.tar.gz" 2>NUL
+call mvn -f "%baseDir%\..\pom.xml" clean package -DskipTests
+
+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%\"
+
+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
+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
+  rd /s /q "%runtimeDir%"
+  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,48 @@
+#!/usr/bin/env bash
+
+set -x
+sbinDir=$(cd "$(dirname "$0")"; pwd)
+chmod +x $sbinDir/supersonic-common.sh
+source $sbinDir/supersonic-common.sh
+
+cd $baseDir
+
+#1. build backend java modules
+rm -fr ${buildDir}/*.tar.gz
+rm -fr dist
+
+set +x
+
+mvn -f $baseDir/../ clean package -DskipTests
+
+#2. move package to build
+cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.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}/
+
+#4. copy webapp to java classpath
+cd $buildDir
+tar xvf supersonic-webapp.tar.gz
+mv supersonic-webapp webapp
+cp -fr webapp ../../launchers/semantic/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
+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"
+
+#6. reset runtime
+rm -fr $runtimeDir/*
+moveAllToRuntime
+setEnvToWeb chat
+setEnvToWeb semantic

assembly/bin/supersonic-common.sh

@@ -0,0 +1,106 @@
+#!/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 SEMANTIC_APP_NAME="supersonic_semantic"
+readonly LLMPARSER_APP_NAME="supersonic_llmparser"
+readonly STANDALONE_APP_NAME="supersonic_standalone"
+readonly CHAT_SERVICE="chat"
+readonly SEMANTIC_SERVICE="semantic"
+readonly LLMPARSER_SERVICE="llmparser"
+readonly STANDALONE_SERVICE="standalone"
+readonly LLMPARSER_HOST="127.0.0.1"
+readonly LLMPARSER_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
+  tar -zxvf ${buildDir}/supersonic-${model_name}.tar.gz  -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
+}
+
+function moveAllToRuntime {
+  mkdir -p ${runtimeDir}
+  tar xvf  ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
+  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
+
+  moveToRuntime chat
+  moveToRuntime semantic
+  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}/llmparser
+  cd $pythonRunDir
+  nohup ${python_path} supersonic_llmparser.py  > $pythonRunDir/llmparser.log  2>&1   &
+  # add health check
+  for i in {1..10}
+  do
+    echo "llmparser health check attempt $i..."
+    response=$(curl -s http://${LLMPARSER_HOST}:${LLMPARSER_PORT}/health)
+    echo "llmparser health check response: $response"
+    status_ok="Healthy"
+    if [[ $response == *$status_ok* ]] ; then
+      echo "llmparser Health check passed."
+      break
+    else
+      if [ "$i" -eq 10 ]; then
+        echo "llmparser Health check failed after 10 attempts."
+        echo "May still downloading model files. Please check llmparser.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 "llmparser_service=llmparser"
+
+set "javaRunDir=%runtimeDir%\supersonic-standalone"
+set "pythonRunDir=%runtimeDir%\supersonic-standalone\llmparser"
+
+set "command=%~1"
+set "service=%~2"
+
+if "%service%"=="" (
+   set "service=%standalone_service%"
+)
+
+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%"=="%llmparser_service%" (
+         call :START_PYTHON
+         goto :EOF
+    )
+    call :START_PYTHON
+    call :START_JAVA
+    goto :EOF
+
+:STOP
+    if "%service%"=="%llmparser_service%" (
+        call :STOP_PYTHON
+        goto :EOF
+    )
+    call :STOP_PYTHON
+    call :STOP_JAVA
+    goto :EOF
+
+:START_PYTHON
+   echo 'python service starting, see logs in llmparser/llmparser.log'
+   cd "%pythonRunDir%"
+   start /B %python_path% supersonic_llmparser.py  > %pythonRunDir%\llmparser.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-%service%\lib"
+   set "confDir=%runtimeDir%\supersonic-%service%\conf"
+   set "webDir=%runtimeDir%\supersonic-%service%\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\llmparser\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,147 @@
+#!/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" == "llmparser" ]; then
+  model_name=${STANDALONE_SERVICE}
+fi
+
+cd $baseDir
+
+# 2.set main class
+function setMainClass {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    main_class="com.tencent.supersonic.ChatLauncher"
+  elif [ "$service" == $SEMANTIC_SERVICE ]; then
+    main_class="com.tencent.supersonic.SemanticLauncher"
+  fi
+}
+setMainClass
+# 3.set app name
+function setAppName {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    app_name=$CHAT_APP_NAME
+  elif [ "$service" == $SEMANTIC_SERVICE ]; then
+    app_name=$SEMANTIC_APP_NAME
+  elif [ "$service" == $LLMPARSER_SERVICE ]; then
+    app_name=$LLMPARSER_APP_NAME
+  fi
+}
+setAppName
+
+function reloadExamples {
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
+  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} == $LLMPARSER_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 == $LLMPARSER_APP_NAME ]]; then
+    reloadExamples
+  fi
+}
+
+# 4. execute command operation
+case "$command" in
+  start)
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Starting $LLMPARSER_APP_NAME"
+          start $LLMPARSER_APP_NAME
+          echo  "Starting $app_name"
+          start $app_name
+        else
+          echo  "Starting $app_name"
+          start $app_name
+        fi
+        echo  "Start success"
+        ;;
+  stop)
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Stopping $LLMPARSER_APP_NAME"
+          stop $LLMPARSER_APP_NAME
+          echo  "Stopping $app_name"
+          stop $app_name
+        else
+          echo  "Stopping $app_name"
+          stop ${app_name}
+        fi
+        echo  "Stop success"
+        ;;
+  reload)
+        echo  "Reloading ${app_name}"
+        reload ${app_name}
+        echo  "Reload success"
+        ;;
+  restart)
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Stopping ${app_name}"
+          stop ${app_name}
+          echo  "Stopping ${LLMPARSER_APP_NAME}"
+          stop $LLMPARSER_APP_NAME
+          echo  "Starting ${LLMPARSER_APP_NAME}"
+          start $LLMPARSER_APP_NAME
+          echo  "Starting ${app_name}"
+          start ${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>
-            <outputDirectory>llm</outputDirectory>
+            <directory>${project.basedir}/../../chat/python</directory>
+            <outputDirectory>llmparser</outputDirectory>
             <fileMode>0777</fileMode>
             <directoryMode>0755</directoryMode>
         </fileSet>

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

@@ -0,0 +1,25 @@
+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;
+
+public interface UserAdaptor {
+
+    List<String> getUserNames();
+
+    List<User> getUserList();
+
+    List<Organization> getOrganizationTree();
+
+    void register(UserReq userReq);
+
+    String login(UserReq userReq);
+
+    List<User> getUserByOrg(String key);
+
+    Set<String> getUserAllOrgId(String userName);
+}

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

@@ -9,18 +9,19 @@ 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;
 
-
 }

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

@@ -0,0 +1,23 @@
+package com.tencent.supersonic.auth.api.authentication.pojo;
+
+import com.google.common.collect.Lists;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Organization {
+
+    private String id;
+
+    private String parentId;
+
+    private String name;
+
+    private String fullName;
+
+    private List<Organization> subOrganizations = Lists.newArrayList();
+
+    private boolean isRoot;
+
+}

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

@@ -18,17 +18,22 @@ public class User {
 
     private String email;
 
-    public static User get(Long id, String name, String displayName, String email) {
-        return new User(id, name, displayName, email);
+    private Integer isAdmin;
+
+    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 getFakeUser() {
-        return new User(1L, "admin", "admin", "admin@email");
+        return new User(1L, "admin", "admin", "admin@email", 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) {
-        super(id, name, displayName, email);
+    public UserWithPassword(Long id, String name, String displayName, String email, String password, Integer isAdmin) {
+        super(id, name, displayName, email, isAdmin);
         this.password = password;
     }
 
-    public static UserWithPassword get(Long id, String name, String displayName, String email, String password) {
-        return new UserWithPassword(id, name, displayName, email, password);
+    public static UserWithPassword get(Long id, String name, String displayName,
+                                       String email, String password, Integer isAdmin) {
+        return new UserWithPassword(id, name, displayName, email, password, isAdmin);
     }
 
 }

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

@@ -1,9 +1,11 @@
 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 java.util.List;
+import java.util.Set;
 
 public interface UserService {
 
@@ -14,4 +16,10 @@ public interface UserService {
     void register(UserReq userCmd);
 
     String login(UserReq userCmd);
+
+    Set<String> getUserAllOrgId(String userName);
+
+    List<User> getUserByOrg(String key);
+
+    List<Organization> getOrganizationTree();
 }

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 domainId;
+    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,14 +7,14 @@ import lombok.ToString;
 @ToString
 public class AuthRes {
 
-    private String domainId;
+    private Long modelId;
     private String name;
 
     public AuthRes() {
     }
 
-    public AuthRes(String domainId, String name) {
-        this.domainId = domainId;
+    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,21 +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 domainId;
+    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/request/QueryGroupReq.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.auth.api.authorization.request;
 
 
-import com.tencent.supersonic.common.request.PageBaseReq;
+import com.tencent.supersonic.common.pojo.PageBaseReq;
 import java.util.List;
 import lombok.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 javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 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

@@ -1,67 +1,58 @@
-package com.tencent.supersonic.auth.authentication.application;
+package com.tencent.supersonic.auth.authentication.adaptor;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
-import com.tencent.supersonic.auth.api.authentication.service.UserService;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.repository.UserRepository;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
-import java.util.List;
-import java.util.stream.Collectors;
+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 org.springframework.stereotype.Service;
-
-@Service
-public class UserServiceImpl implements UserService {
-
-    private UserRepository userRepository;
-
-    private UserTokenUtils userTokenUtils;
-
-    public UserServiceImpl(UserRepository userRepository, UserTokenUtils userTokenUtils) {
-        this.userRepository = userRepository;
-        this.userTokenUtils = userTokenUtils;
-    }
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+public class DefaultUserAdaptor implements UserAdaptor {
 
     private List<UserDO> getUserDOList() {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         return userRepository.getUserList();
     }
 
     private UserDO getUser(String name) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         return userRepository.getUser(name);
     }
 
-    public boolean checkExist(UserWithPassword user) {
-        UserDO userDO = getUser(user.getName());
-        if (userDO == null) {
-            return false;
-        }
-        return userDO.getPassword().equals(user.getPassword());
-    }
-
     @Override
     public List<String> getUserNames() {
         return getUserDOList().stream().map(UserDO::getName).collect(Collectors.toList());
     }
 
-
     @Override
     public List<User> getUserList() {
         List<UserDO> userDOS = getUserDOList();
         return userDOS.stream().map(this::convert).collect(Collectors.toList());
     }
 
+    @Override
+    public List<Organization> getOrganizationTree() {
+        return Lists.newArrayList();
+    }
+
     private User convert(UserDO userDO) {
         User user = new User();
         BeanUtils.copyProperties(userDO, user);
         return user;
     }
 
-
     @Override
     public void register(UserReq userReq) {
+        UserRepository userRepository = ContextUtils.getBean(UserRepository.class);
         List<String> userDOS = getUserNames();
         if (userDOS.contains(userReq.getName())) {
             throw new RuntimeException(String.format("user %s exist", userReq.getName()));
@@ -73,17 +64,27 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public String login(UserReq userReq) {
+        UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
         UserDO userDO = getUser(userReq.getName());
         if (userDO == null) {
             throw new RuntimeException("user not exist,please register");
         }
         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");
     }
 
+    @Override
+    public List<User> getUserByOrg(String key) {
+        return Lists.newArrayList();
+    }
 
-}
+    @Override
+    public Set<String> getUserAllOrgId(String userName) {
+        return Sets.newHashSet();
+    }
+
+}

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

@@ -1,51 +0,0 @@
-package com.tencent.supersonic.auth.authentication.infrastructure.mapper;
-
-
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface UserDOMapper {
-
-    /**
-     * @mbg.generated
-     */
-    long countByExample(UserDOExample example);
-
-    /**
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * @mbg.generated
-     */
-    int insert(UserDO record);
-
-    /**
-     * @mbg.generated
-     */
-    int insertSelective(UserDO record);
-
-    /**
-     * @mbg.generated
-     */
-    List<UserDO> selectByExample(UserDOExample example);
-
-    /**
-     * @mbg.generated
-     */
-    UserDO selectByPrimaryKey(Long id);
-
-    /**
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(UserDO record);
-
-    /**
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(UserDO record);
-}

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 
 import java.lang.annotation.ElementType;

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

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
-import com.tencent.supersonic.auth.authentication.application.UserServiceImpl;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
-import com.tencent.supersonic.common.util.context.S2ThreadContext;
+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;
@@ -42,6 +42,17 @@ 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);

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

@@ -1,15 +1,15 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
-import com.tencent.supersonic.auth.authentication.application.UserServiceImpl;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
-import com.tencent.supersonic.common.exception.AccessException;
-import com.tencent.supersonic.common.util.context.ContextUtils;
-import com.tencent.supersonic.common.util.context.S2ThreadContext;
-import com.tencent.supersonic.common.util.context.ThreadContext;
+import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
+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;
@@ -35,14 +35,21 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
             setFakerUser(request);
             return true;
         }
-        HandlerMethod handlerMethod = (HandlerMethod) handler;
-        Method method = handlerMethod.getMethod();
-        AuthenticationIgnore ignore = method.getAnnotation(AuthenticationIgnore.class);
-        if (ignore != null) {
-            return true;
+
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            Method method = handlerMethod.getMethod();
+            AuthenticationIgnore ignore = method.getAnnotation(AuthenticationIgnore.class);
+            if (ignore != null) {
+                return true;
+            }
         }
 
         String uri = request.getServletPath();
+        if (!isIncludedUri(uri)) {
+            return true;
+        }
+
         if (isExcludedUri(uri)) {
             return true;
         }

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.interceptor;
+package com.tencent.supersonic.auth.authentication.interceptor;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.SpringFactoriesLoader;

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

@@ -1,99 +1,129 @@
-package com.tencent.supersonic.auth.authentication.domain.dataobject;
+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

@@ -1,10 +1,9 @@
-package com.tencent.supersonic.auth.authentication.domain.dataobject;
+package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
 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() {
-        return distinct;
+    public String getOrderByClause() {
+        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) {
-        this.limitStart = limitStart;
+    public void setLimitEnd(Integer limitEnd) {
+        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/mapper/UserDOMapper.java

@@ -0,0 +1,22 @@
+package com.tencent.supersonic.auth.authentication.persistence.mapper;
+
+
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserDOMapper {
+
+    /**
+     * @mbg.generated
+     */
+    int insert(UserDO record);
+
+    /**
+     * @mbg.generated
+     */
+    List<UserDO> selectByExample(UserDOExample example);
+
+}

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.infrastructure.repository;
+package com.tencent.supersonic.auth.authentication.persistence.repository.impl;
 
 
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample;
-import com.tencent.supersonic.auth.authentication.domain.repository.UserRepository;
-import com.tencent.supersonic.auth.authentication.infrastructure.mapper.UserDOMapper;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
+import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.stereotype.Component;

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.auth.authentication.domain.repository;
+package com.tencent.supersonic.auth.authentication.persistence.repository;
 
-import com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO;
+import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import java.util.List;
 
 public interface UserRepository {

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

@@ -1,19 +1,22 @@
 package com.tencent.supersonic.auth.authentication.rest;
 
 
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.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.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.PathVariable;
 
 @RestController
 @RequestMapping("/api/auth/user")
@@ -32,7 +35,6 @@ public class UserController {
         return UserHolder.findUser(httpServletRequest, httpServletResponse);
     }
 
-
     @GetMapping("/getUserNames")
     public List<String> getUserNames() {
         return userService.getUserNames();
@@ -43,6 +45,21 @@ public class UserController {
         return userService.getUserList();
     }
 
+    @GetMapping("/getOrganizationTree")
+    public List<Organization> getOrganizationTree() {
+        return userService.getOrganizationTree();
+    }
+
+    @GetMapping("/getUserAllOrgId/{userName}")
+    public Set<String> getUserAllOrgId(@PathVariable("userName") String userName) {
+        return userService.getUserAllOrgId(userName);
+    }
+
+    @GetMapping("/getUserByOrg/{org}")
+    public List<User> getUserByOrg(@PathVariable("org") String org) {
+        return userService.getUserByOrg(org);
+    }
+
     @PostMapping("/register")
     public void register(@RequestBody UserReq userCmd) {
         userService.register(userCmd);

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

@@ -0,0 +1,52 @@
+package com.tencent.supersonic.auth.authentication.service;
+
+import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.auth.api.authentication.request.UserReq;
+import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.authentication.utils.ComponentFactory;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+
+    @Override
+    public List<String> getUserNames() {
+        return ComponentFactory.getUserAdaptor().getUserNames();
+    }
+
+    @Override
+    public List<User> getUserList() {
+        return ComponentFactory.getUserAdaptor().getUserList();
+    }
+
+    @Override
+    public Set<String> getUserAllOrgId(String userName) {
+        return ComponentFactory.getUserAdaptor().getUserAllOrgId(userName);
+    }
+
+    @Override
+    public List<User> getUserByOrg(String key) {
+        return ComponentFactory.getUserAdaptor().getUserByOrg(key);
+    }
+
+    @Override
+    public List<Organization> getOrganizationTree() {
+        return ComponentFactory.getUserAdaptor().getOrganizationTree();
+    }
+
+    @Override
+    public void register(UserReq userReq) {
+        ComponentFactory.getUserAdaptor().register(userReq);
+    }
+
+    @Override
+    public String login(UserReq userReq) {
+        return ComponentFactory.getUserAdaptor().login(userReq);
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;

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

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.auth.authentication.domain.utils.UserTokenUtils;
+import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.domain.strategy;
+package com.tencent.supersonic.auth.authentication.strategy;
 
 
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;

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

@@ -0,0 +1,23 @@
+package com.tencent.supersonic.auth.authentication.utils;
+
+import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor;
+import org.springframework.core.io.support.SpringFactoriesLoader;
+import java.util.Objects;
+
+public class ComponentFactory {
+
+    private static UserAdaptor userAdaptor;
+
+    public static UserAdaptor getUserAdaptor() {
+        if (Objects.isNull(userAdaptor)) {
+            userAdaptor = init(UserAdaptor.class);
+        }
+        return userAdaptor;
+    }
+
+    private static <T> T init(Class<T> factoryType) {
+        return SpringFactoriesLoader.loadFactories(factoryType,
+                Thread.currentThread().getContextClassLoader()).get(0);
+    }
+
+}

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

@@ -1,7 +1,8 @@
-package com.tencent.supersonic.auth.authentication.domain.utils;
+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,11 +10,10 @@ 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;
-import com.tencent.supersonic.common.exception.AccessException;
+import com.tencent.supersonic.common.pojo.exception.AccessException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -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,6 +54,7 @@ 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);
     }
 
@@ -62,13 +66,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 +84,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) {

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tencent.supersonic.auth.authentication.infrastructure.mapper.UserDOMapper">
-  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
-    <id column="id" jdbcType="BIGINT" property="id" />
+<mapper namespace="com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper">
+  <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
+    <result column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="display_name" jdbcType="VARCHAR" property="displayName" />
     <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="is_admin" jdbcType="INTEGER" property="isAdmin" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -38,9 +39,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, password, display_name, email
+    id, name, password, display_name, email, is_admin
   </sql>
-  <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -57,23 +58,15 @@
       limit #{limitStart} , #{limitEnd}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from s2_user
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from s2_user
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user (id, name, password, 
-      display_name, email)
+      display_name, email, is_admin
+      )
     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" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
+  <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -91,6 +84,9 @@
       <if test="email != null">
         email,
       </if>
+      <if test="isAdmin != null">
+        is_admin,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -108,38 +104,15 @@
       <if test="email != null">
         #{email,jdbcType=VARCHAR},
       </if>
+      <if test="isAdmin != null">
+        #{isAdmin,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDOExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultType="java.lang.Long">
     select count(*) from s2_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.auth.authentication.domain.dataobject.UserDO">
-    update s2_user
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="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.domain.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/application/AuthServiceImpl.java

@@ -2,26 +2,25 @@ package com.tencent.supersonic.auth.authorization.application;
 
 import com.google.common.base.Strings;
 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.AuthRes;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthResGrp;
 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 javax.servlet.http.HttpServletRequest;
-
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthRule;
 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.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.Map;
+import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 @Service
@@ -30,8 +29,12 @@ public class AuthServiceImpl implements AuthService {
 
     private JdbcTemplate jdbcTemplate;
 
-    public AuthServiceImpl(JdbcTemplate jdbcTemplate) {
+    private UserService userService;
+
+    public AuthServiceImpl(JdbcTemplate jdbcTemplate,
+                           UserService userService) {
         this.jdbcTemplate = jdbcTemplate;
+        this.userService = userService;
     }
 
     private List<AuthGroup> load() {
@@ -41,15 +44,15 @@ public class AuthServiceImpl implements AuthService {
     }
 
     @Override
-    public List<AuthGroup> queryAuthGroups(String domainId, Integer groupId) {
+    public List<AuthGroup> queryAuthGroups(String modelId, Integer groupId) {
         return load().stream()
                 .filter(group -> (Objects.isNull(groupId) || groupId.equals(group.getGroupId()))
-                        && domainId.equals(group.getDomainId()))
+                        && 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;
@@ -74,19 +77,20 @@ public class AuthServiceImpl implements AuthService {
 
 
     @Override
-    public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, HttpServletRequest request) {
-        List<AuthGroup> groups = getAuthGroups(req);
+    public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, User user) {
+        Set<String> userOrgIds = userService.getUserAllOrgId(user.getName());
+        List<AuthGroup> groups = getAuthGroups(req.getModelIds(), user.getName(), new ArrayList<>(userOrgIds));
         AuthorizedResourceResp resource = new AuthorizedResourceResp();
-        Map<String, List<AuthGroup>> authGroupsByDomainId = groups.stream()
-                .collect(Collectors.groupingBy(AuthGroup::getDomainId));
-        Map<String, List<AuthRes>> reqAuthRes = req.getResources().stream()
-                .collect(Collectors.groupingBy(AuthRes::getDomainId));
+        Map<Long, List<AuthGroup>> authGroupsByModelId = groups.stream()
+                .collect(Collectors.groupingBy(AuthGroup::getModelId));
+        Map<Long, List<AuthRes>> reqAuthRes = req.getResources().stream()
+                .collect(Collectors.groupingBy(AuthRes::getModelId));
 
-        for (String domainId : reqAuthRes.keySet()) {
-            List<AuthRes> reqResourcesList = reqAuthRes.get(domainId);
+        for (Long modelId : reqAuthRes.keySet()) {
+            List<AuthRes> reqResourcesList = reqAuthRes.get(modelId);
             AuthResGrp rg = new AuthResGrp();
-            if (authGroupsByDomainId.containsKey(domainId)) {
-                List<AuthGroup> authGroups = authGroupsByDomainId.get(domainId);
+            if (authGroupsByModelId.containsKey(modelId)) {
+                List<AuthGroup> authGroups = authGroupsByModelId.get(modelId);
                 for (AuthRes reqRes : reqResourcesList) {
                     for (AuthGroup authRuleGroup : authGroups) {
                         List<AuthRule> authRules = authRuleGroup.getAuthRules();
@@ -105,8 +109,8 @@ public class AuthServiceImpl implements AuthService {
             }
         }
 
-        if (StringUtils.isNotEmpty(req.getDomainId())) {
-            List<AuthGroup> authGroups = authGroupsByDomainId.get(req.getDomainId());
+        if (req.getModelId() != null) {
+            List<AuthGroup> authGroups = authGroupsByModelId.get(req.getModelId());
             if (!CollectionUtils.isEmpty(authGroups)) {
                 for (AuthGroup group : authGroups) {
                     if (group.getDimensionFilters() != null
@@ -119,29 +123,28 @@ public class AuthServiceImpl implements AuthService {
                 }
             }
         }
-
         return resource;
     }
 
-    private List<AuthGroup> getAuthGroups(QueryAuthResReq req) {
-        List<AuthGroup> groups = load().stream().
-                filter(group -> {
-                    if (!Objects.equals(group.getDomainId(), req.getDomainId())) {
+    private List<AuthGroup> getAuthGroups(List<Long> modelIds, String userName, List<String> departmentIds) {
+        List<AuthGroup> groups = load().stream()
+                .filter(group -> {
+                    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 deparmentId : req.getDepartmentIds()) {
+                    for (String departmentId : departmentIds) {
                         if (!CollectionUtils.isEmpty(group.getAuthorizedDepartmentIds())
-                                && group.getAuthorizedDepartmentIds().contains(deparmentId)) {
+                                && group.getAuthorizedDepartmentIds().contains(departmentId)) {
                             return true;
                         }
                     }
                     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;
     }
 

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.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;
@@ -26,9 +29,9 @@ public class AuthController {
     }
 
     @GetMapping("/queryGroup")
-    public List<AuthGroup> queryAuthGroup(@RequestParam("domainId") String domainId,
+    public List<AuthGroup> queryAuthGroup(@RequestParam("modelId") String modelId,
             @RequestParam(value = "groupId", required = false) Integer groupId) {
-        return authService.queryAuthGroups(domainId, groupId);
+        return authService.queryAuthGroups(modelId, groupId);
     }
 
     /**
@@ -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) {
-        return authService.queryAuthorizedResources(req, request);
+                                                           HttpServletRequest request,
+                                                           HttpServletResponse response) {
+        User user = UserHolder.findUser(request, response);
+        return authService.queryAuthorizedResources(req, user);
     }
 }

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

@@ -1,15 +1,12 @@
 package com.tencent.supersonic.chat.api.component;
 
-import com.tencent.supersonic.chat.api.request.QueryContextReq;
+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.
+ * A schema mapper identifies references to schema elements(metrics/dimensions/entities/values)
+ * in user queries. It matches the query text against the knowledge base.
  */
 public interface SchemaMapper {
 
-    void map(QueryContextReq queryContext);
+    void map(QueryContext queryContext);
 }

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

@@ -0,0 +1,13 @@
+package com.tencent.supersonic.chat.api.component;
+
+import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
+
+/**
+ * A semantic corrector checks validity of extracted semantic information and
+ * performs correction and optimization if needed.
+ */
+public interface SemanticCorrector {
+
+    void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
+}

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

@@ -0,0 +1,63 @@
+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.DomainResp;
+import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
+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.ModelSchemaResp;
+import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
+
+import java.util.List;
+
+/**
+ * A semantic layer provides a simplified and consistent view of data from multiple sources.
+ * It 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 SemanticInterpreter {
+
+    QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user);
+
+    QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
+
+    QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user);
+
+    QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
+
+    List<ModelSchema> getModelSchema();
+
+    List<ModelSchema> getModelSchema(List<Long> ids);
+
+    ModelSchema getModelSchema(Long model, Boolean cacheEnable);
+
+    PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionReq);
+
+    PageInfo<MetricResp> getMetricPage(PageMetricReq pageDimensionReq, User user);
+
+    List<DomainResp> getDomainList(User user);
+
+    List<ModelResp> getModelList(AuthType authType, Long domainId, User user);
+
+    <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception;
+
+    List<ModelSchemaResp> fetchModelSchema(List<Long> ids, Boolean cacheEnable);
+
+}

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

@@ -1,51 +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.semantic.api.core.request.PageDimensionReq;
-import com.tencent.supersonic.semantic.api.core.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.core.response.*;
-import com.tencent.supersonic.semantic.api.query.request.QuerySqlReq;
-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 queryBySql(QuerySqlReq querySqlReq, User user);
-
-    DomainSchemaResp getDomainSchemaInfo(Long domain, Boolean cacheEnable);
-
-    List<DomainSchemaResp> getDomainSchemaInfo(List<Long> ids);
-
-    List<DomainResp> getDomainListForViewer();
-
-    List<DomainResp> getDomainListForAdmin();
-
-    PageInfo<DimensionResp> queryDimensionPage(PageDimensionReq pageDimensionCmd);
-
-    PageInfo<MetricResp> queryMetricPage(PageMetricReq pageMetricCmd);
-
-//    PageInfo<MetricResp> queryMetricPage(PageMetricReq pageMetricCmd);
-//
-//    PageInfo<DimensionResp> queryDimensionPage(PageDimensionReq pageDimensionCmd);
-//
-//    List<DomainResp> getDomainListForAdmin();
-//
-//    List<DomainResp> getDomainListForViewer();
-
-}

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

@@ -2,16 +2,14 @@ package com.tencent.supersonic.chat.api.component;
 
 
 import com.tencent.supersonic.chat.api.pojo.ChatContext;
-import com.tencent.supersonic.chat.api.request.QueryContextReq;
+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.
+ * A semantic parser understands user queries and extracts semantic information.
+ * It could leverage either rule-based or LLM-based approach to identify query intent
+ * and extract related semantic items from the query.
  */
 public interface SemanticParser {
 
-    void parse(QueryContextReq queryContext, ChatContext chatContext);
+    void parse(QueryContext queryContext, ChatContext chatContext);
 }

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

@@ -2,17 +2,23 @@ package com.tencent.supersonic.chat.api.component;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.response.QueryResultResp;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import org.apache.calcite.sql.parser.SqlParseException;
 
 /**
- * This class defines the contract for a semantic query that executes specific type of
- * query based on the results of semantic parsing.
+ * A semantic query executes specific type of query based on the results of semantic parsing.
  */
 public interface SemanticQuery {
 
     String getQueryMode();
 
-    QueryResultResp execute(User user);
+    QueryResult execute(User user) throws SqlParseException;
+
+    void initS2Sql(User user);
+
+    String explain(User user);
 
     SemanticParseInfo getParseInfo();
+
+    void setParseInfo(SemanticParseInfo parseInfo);
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 public class ChatContext {
 
     private Integer chatId;
+    private Integer agentId;
     private String queryText;
     private SemanticParseInfo parseInfo = new SemanticParseInfo();
     private String user;

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

@@ -1,12 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import java.io.Serializable;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class DomainInfo extends DataInfo implements Serializable {
-
-    private List<String> words;
-    private String primaryEntityBizName;
-}

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

@@ -1,40 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
-import java.util.Objects;
-import lombok.Data;
-import lombok.ToString;
-
-@Data
-@ToString(callSuper = true)
-public class Filter {
-
-    private String bizName;
-
-    private String name;
-
-    private FilterOperatorEnum operator = FilterOperatorEnum.EQUALS;
-
-    private Object value;
-
-    private Long elementID;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Filter filter = (Filter) o;
-        return Objects.equals(bizName, filter.bizName) && Objects.equals(name, filter.name)
-                && operator == filter.operator && Objects.equals(value, filter.value) && Objects.equals(
-                elementID, filter.elementID);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(bizName, name, operator, value, elementID);
-    }
-}

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

@@ -0,0 +1,98 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import com.google.common.collect.Sets;
+import com.tencent.supersonic.common.pojo.ModelRela;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+@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 Set<SchemaElement> tags = new HashSet<>();
+    private SchemaElement entity = new SchemaElement();
+    private List<ModelRela> modelRelas = new ArrayList<>();
+
+    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();
+                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 MODEL:
+                element = Optional.of(model);
+                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 Set<Long> getModelClusterSet() {
+        if (CollectionUtils.isEmpty(modelRelas)) {
+            return Sets.newHashSet();
+        }
+        Set<Long> modelClusterSet = new HashSet<>();
+        modelRelas.forEach(modelRela -> {
+            modelClusterSet.add(modelRela.getToModelId());
+            modelClusterSet.add(modelRela.getFromModelId());
+        });
+        return modelClusterSet;
+    }
+
+}

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

@@ -0,0 +1,23 @@
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class QueryContext {
+
+    private QueryReq request;
+    private List<SemanticQuery> candidateQueries = new ArrayList<>();
+    private SchemaMapInfo mapInfo = new SchemaMapInfo();
+    private SchemaModelClusterMapInfo modelClusterMapInfo = new SchemaModelClusterMapInfo();
+
+    public QueryContext(QueryReq request) {
+        this.request = request;
+    }
+}

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

@@ -1,12 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import lombok.Data;
-
-@Data
-public class QueryMatchInfo {
-
-    SchemaElementType elementType;
-    String detectWord;
-    private Integer count = 0;
-    private double maxSimilarity;
-}

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

@@ -0,0 +1,19 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RelatedSchemaElement {
+
+    private Long dimensionId;
+
+    private boolean isNecessary;
+
+}

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

@@ -0,0 +1,54 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import com.google.common.base.Objects;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SchemaElement implements Serializable {
+
+    private Long model;
+    private Long id;
+    private String name;
+    private String bizName;
+    private Long useCnt;
+    private SchemaElementType type;
+    private List<String> alias;
+    private List<SchemaValueMap> schemaValueMaps;
+    private List<RelatedSchemaElement> relatedSchemaElements;
+
+    private String defaultAgg;
+
+    private double order;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SchemaElement schemaElement = (SchemaElement) o;
+        return Objects.equal(model, schemaElement.model) && Objects.equal(id,
+                schemaElement.id) && Objects.equal(name, schemaElement.name)
+                && Objects.equal(bizName, schemaElement.bizName)
+                && Objects.equal(type, schemaElement.type);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(model, id, name, bizName, type);
+    }
+
+}

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

@@ -13,15 +13,11 @@ import lombok.ToString;
 @NoArgsConstructor
 public class SchemaElementMatch {
 
-    SchemaElementType elementType;
-
-    int elementID;
-
+    SchemaElement element;
     double similarity;
-
     String detectWord;
-
     String word;
-
     Long frequency;
+    boolean isInherited;
+
 }

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

@@ -1,11 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo;
 
 public enum SchemaElementType {
-    DOMAIN,
+    MODEL,
     METRIC,
     DIMENSION,
     VALUE,
     ENTITY,
+    TAG,
     ID,
     DATE
 }

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

@@ -7,26 +7,25 @@ import java.util.Set;
 
 public class SchemaMapInfo {
 
-    private Map<Integer, List<SchemaElementMatch>> domainElementMatches = new HashMap<>();
+    private Map<Long, List<SchemaElementMatch>> modelElementMatches = new HashMap<>();
 
-    public Set<Integer> getMatchedDomains() {
-        return domainElementMatches.keySet();
+    public Set<Long> getMatchedModels() {
+        return modelElementMatches.keySet();
     }
 
-    public List<SchemaElementMatch> getMatchedElements(Integer domain) {
-        return domainElementMatches.get(domain);
+    public List<SchemaElementMatch> getMatchedElements(Long model) {
+        return modelElementMatches.get(model);
     }
 
-    public Map<Integer, List<SchemaElementMatch>> getDomainElementMatches() {
-        return domainElementMatches;
+    public Map<Long, List<SchemaElementMatch>> getModelElementMatches() {
+        return modelElementMatches;
     }
 
-    public void setDomainElementMatches(
-            Map<Integer, List<SchemaElementMatch>> domainElementMatches) {
-        this.domainElementMatches = domainElementMatches;
+    public void setModelElementMatches(Map<Long, List<SchemaElementMatch>> modelElementMatches) {
+        this.modelElementMatches = modelElementMatches;
     }
 
-    public void setMatchedElements(Integer domain, List<SchemaElementMatch> elementMatches) {
-        domainElementMatches.put(domain, elementMatches);
+    public void setMatchedElements(Long model, List<SchemaElementMatch> elementMatches) {
+        modelElementMatches.put(model, elementMatches);
     }
 }

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

@@ -0,0 +1,61 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import com.clickhouse.client.internal.apache.commons.compress.utils.Lists;
+import com.tencent.supersonic.common.pojo.ModelCluster;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Data
+public class SchemaModelClusterMapInfo {
+
+    private Map<String, List<SchemaElementMatch>> modelElementMatches = new HashMap<>();
+
+    public Set<String> getMatchedModelClusters() {
+        return modelElementMatches.keySet();
+    }
+
+    public List<SchemaElementMatch> getMatchedElements(Long modelId) {
+        for (String key : modelElementMatches.keySet()) {
+            if (ModelCluster.getModelIdFromKey(key).contains(modelId)) {
+                return modelElementMatches.get(key);
+            }
+        }
+        return Lists.newArrayList();
+    }
+
+    public List<SchemaElementMatch> getMatchedElements(String modelCluster) {
+        return modelElementMatches.get(modelCluster);
+    }
+
+    public Map<String, List<SchemaElementMatch>> getModelElementMatches() {
+        return modelElementMatches;
+    }
+
+    public Map<String, List<SchemaElementMatch>> getElementMatchesByModelIds(Set<Long> modelIds) {
+        if (CollectionUtils.isEmpty(modelIds)) {
+            return modelElementMatches;
+        }
+        Map<String, List<SchemaElementMatch>> modelElementMatchesFiltered = new HashMap<>();
+        for (String key : modelElementMatches.keySet()) {
+            for (Long modelId : modelIds) {
+                if (ModelCluster.getModelIdFromKey(key).contains(modelId)) {
+                    modelElementMatchesFiltered.put(key, modelElementMatches.get(key));
+                }
+            }
+        }
+        return modelElementMatchesFiltered;
+    }
+
+    public void setModelElementMatches(Map<String, List<SchemaElementMatch>> modelElementMatches) {
+        this.modelElementMatches = modelElementMatches;
+    }
+
+    public void setMatchedElements(String modelCluster, List<SchemaElementMatch> elementMatches) {
+        modelElementMatches.put(modelCluster, elementMatches);
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SchemaValueMap {
+
+    /**
+     * dimension value in db
+     */
+    private String techName;
+
+    /**
+     * dimension value for result show
+     */
+    private String bizName;
+
+    /**
+     * dimension value for user query
+     */
+    private List<String> alias = new ArrayList<>();
+}

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,34 +1,111 @@
 package com.tencent.supersonic.chat.api.pojo;
 
 
-import com.tencent.supersonic.common.enums.AggregateTypeEnum;
+import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
+import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
+import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.Order;
-import com.tencent.supersonic.common.pojo.SchemaItem;
+import com.tencent.supersonic.common.pojo.QueryType;
+import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
+import com.tencent.supersonic.common.pojo.enums.FilterType;
+import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import lombok.Data;
+import java.util.TreeSet;
 
 @Data
 public class SemanticParseInfo {
 
-    String queryMode;
-    AggregateTypeEnum aggType = AggregateTypeEnum.NONE;
-    Long domainId = 0L;
-    String domainName;
-    Long entity = 0L;
-    Set<SchemaItem> metrics = new LinkedHashSet();
-    Set<SchemaItem> dimensions = new LinkedHashSet();
-    Set<Filter> dimensionFilters = new LinkedHashSet();
-    Set<Filter> metricFilters = new LinkedHashSet();
+    private Integer id;
+    private String queryMode;
+    private ModelCluster model = new ModelCluster();
+    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 bonus = 0d;
+    private double score;
     private List<SchemaElementMatch> elementMatches = new ArrayList<>();
-    private Object info;
+    private Map<String, Object> properties = new HashMap<>();
+    private EntityInfo entityInfo;
+    private SqlInfo sqlInfo = new SqlInfo();
+    private QueryType queryType = QueryType.OTHER;
+
+    public String getModelClusterKey() {
+        if (model == null) {
+            return "";
+        }
+        return model.getKey();
+    }
+
+    public String getModelName() {
+        if (model == null) {
+            return "";
+        }
+        return model.getName();
+    }
+
+    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) {
+                return len1 - len2;
+            } else {
+                return o1.getName().compareTo(o2.getName());
+            }
+        }
+    }
+
+    public Set<SchemaElement> getMetrics() {
+        Set<SchemaElement> metricSet = new TreeSet<>(new SchemaNameLengthComparator());
+        metricSet.addAll(metrics);
+        metrics = metricSet;
+        return metrics;
+    }
+
+    private Map<Long, Integer> getModelElementCountMap() {
+        Map<Long, Integer> elementCountMap = new HashMap<>();
+        elementMatches.forEach(element -> {
+            int count = elementCountMap.getOrDefault(element.getElement().getModel(), 0);
+            elementCountMap.put(element.getElement().getModel(), count + 1);
+        });
+        return elementCountMap;
+    }
+
+    public Long getModelId() {
+        Map<Long, Integer> elementCountMap = getModelElementCountMap();
+        Long modelId = -1L;
+        int maxCnt = 0;
+        for (Long model : elementCountMap.keySet()) {
+            if (elementCountMap.get(model) > maxCnt) {
+                maxCnt = elementCountMap.get(model);
+                modelId = model;
+            }
+        }
+        return modelId;
+    }
+
 }

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

@@ -0,0 +1,181 @@
+package com.tencent.supersonic.chat.api.pojo;
+
+import org.springframework.util.CollectionUtils;
+
+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.Set;
+import java.util.stream.Collectors;
+
+public class SemanticSchema implements Serializable {
+
+    private List<ModelSchema> modelSchemaList;
+
+    public SemanticSchema(List<ModelSchema> modelSchemaList) {
+        this.modelSchemaList = modelSchemaList;
+    }
+
+    public void add(ModelSchema schema) {
+        modelSchemaList.add(schema);
+    }
+
+    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
+        Optional<SchemaElement> element = Optional.empty();
+
+        switch (elementType) {
+            case ENTITY:
+                element = getElementsById(elementID, getEntities());
+                break;
+            case MODEL:
+                element = getElementsById(elementID, getModels());
+                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 SchemaElement getElementByName(SchemaElementType elementType, String name) {
+        Optional<SchemaElement> element = Optional.empty();
+
+        switch (elementType) {
+            case ENTITY:
+                element = getElementsByName(name, getEntities());
+                break;
+            case MODEL:
+                element = getElementsByName(name, getModels());
+                break;
+            case METRIC:
+                element = getElementsByName(name, getMetrics());
+                break;
+            case DIMENSION:
+                element = getElementsByName(name, getDimensions());
+                break;
+            case VALUE:
+                element = getElementsByName(name, getDimensionValues());
+                break;
+            default:
+        }
+
+        if (element.isPresent()) {
+            return element.get();
+        } else {
+            return null;
+        }
+    }
+
+    public Map<Long, String> getModelIdToName() {
+        return modelSchemaList.stream()
+                .collect(Collectors.toMap(a -> a.getModel().getId(), a -> a.getModel().getName(), (k1, k2) -> k1));
+    }
+
+    public List<SchemaElement> getDimensionValues() {
+        List<SchemaElement> dimensionValues = new ArrayList<>();
+        modelSchemaList.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()));
+        return dimensions;
+    }
+
+    public List<SchemaElement> getDimensions(Set<Long> modelIds) {
+        List<SchemaElement> dimensions = getDimensions();
+        return getElementsByModelId(modelIds, dimensions);
+    }
+
+    public SchemaElement getDimensions(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<>();
+        modelSchemaList.stream().forEach(d -> tags.addAll(d.getTags()));
+        return tags;
+    }
+
+    public List<SchemaElement> getTags(Set<Long> modelIds) {
+        List<SchemaElement> tags = new ArrayList<>();
+        modelSchemaList.stream().filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
+                .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()));
+        return metrics;
+    }
+
+    public List<SchemaElement> getMetrics(Set<Long> modelIds) {
+        List<SchemaElement> metrics = getMetrics();
+        return getElementsByModelId(modelIds, metrics);
+    }
+
+    public List<SchemaElement> getEntities() {
+        List<SchemaElement> entities = new ArrayList<>();
+        modelSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
+        return entities;
+    }
+
+    private List<SchemaElement> getElementsByModelId(Set<Long> modelIds, List<SchemaElement> elements) {
+        return elements.stream()
+                .filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
+                .collect(Collectors.toList());
+    }
+
+    private Optional<SchemaElement> getElementsById(Long id, List<SchemaElement> elements) {
+        return elements.stream()
+                .filter(schemaElement -> id.equals(schemaElement.getId()))
+                .findFirst();
+    }
+
+    private Optional<SchemaElement> getElementsByName(String name, List<SchemaElement> elements) {
+        return elements.stream()
+                .filter(schemaElement -> name.equals(schemaElement.getName()))
+                .findFirst();
+    }
+
+    public List<SchemaElement> getModels() {
+        List<SchemaElement> models = new ArrayList<>();
+        modelSchemaList.stream().forEach(d -> models.add(d.getModel()));
+        return models;
+    }
+
+    public Map<String, String> getBizNameToName(Set<Long> modelIds) {
+        List<SchemaElement> allElements = new ArrayList<>();
+        allElements.addAll(getDimensions(modelIds));
+        allElements.addAll(getMetrics(modelIds));
+        return allElements.stream()
+                .collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
+    }
+
+    public Map<Long, ModelSchema> getModelSchemaMap() {
+        if (CollectionUtils.isEmpty(modelSchemaList)) {
+            return new HashMap<>();
+        }
+        return modelSchemaList.stream().collect(Collectors.toMap(modelSchema
+                -> modelSchema.getModel().getModel(), modelSchema -> modelSchema));
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChatAggConfigReq {
+
+    /**
+     * invisible dimensions/metrics
+     */
+    private ItemVisibility visibility;
+
+    /**
+     * information about dictionary about the model
+     */
+    private List<KnowledgeInfoReq> knowledgeInfos;
+
+    private KnowledgeAdvancedConfig globalKnowledgeConfig;
+
+    private ChatDefaultConfigReq chatDefaultConfig;
+
+}

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

@@ -0,0 +1,45 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * extended information command about model
+ */
+@Data
+@ToString
+public class ChatConfigBaseReq {
+
+    private Long modelId;
+
+    /**
+     * the chatDetailConfig about the model
+     */
+    private ChatDetailConfigReq chatDetailConfig;
+
+    /**
+     * the chatAggConfig about the model
+     */
+    private ChatAggConfigReq chatAggConfig;
+
+
+    /**
+     * the recommended questions about the model
+     */
+    private List<RecommendedQuestionReq> recommendedQuestions;
+
+    /**
+     *  the llm examples about the model
+     */
+    private String llmExamples;
+
+    /**
+     * available status
+     */
+    private StatusEnum status;
+
+}

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 import lombok.Data;
 

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
-import com.tencent.supersonic.common.enums.StatusEnum;
+import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +10,6 @@ import lombok.NoArgsConstructor;
 public class ChatConfigFilter {
 
     private Long id;
-    private Long domainId;
+    private Long modelId;
     private StatusEnum status = StatusEnum.ONLINE;
 }

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

@@ -1,14 +1,14 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 
-import com.tencent.supersonic.common.constant.Constants;
+import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class ChatDefaultConfig {
+public class ChatDefaultConfigReq {
 
     private List<Long> dimensionIds = new ArrayList<>();
     private List<Long> metricIds = new ArrayList<>();
@@ -24,4 +24,15 @@ public class ChatDefaultConfig {
      */
     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

@@ -0,0 +1,24 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChatDetailConfigReq {
+
+    /**
+     * invisible dimensions/metrics
+     */
+    private ItemVisibility visibility;
+
+    /**
+     * information about dictionary about the model
+     */
+    private List<KnowledgeInfoReq> knowledgeInfos;
+
+    private KnowledgeAdvancedConfig globalKnowledgeConfig;
+
+    private ChatDefaultConfigReq chatDefaultConfig;
+
+}

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

@@ -0,0 +1,23 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+import static java.time.LocalDate.now;
+
+@ToString
+@Data
+@NoArgsConstructor
+public class DictLatestTaskReq {
+
+    @NotNull
+    private Long modelId;
+
+    private List<Long> dimIds;
+
+    private String createdAt = now().plusDays(-4).toString();
+}

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

@@ -0,0 +1,20 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+
+@ToString
+@Data
+public class DictTaskFilterReq {
+
+    private Long id;
+
+    private String name;
+
+    private String createdBy;
+
+    private String createdAt;
+
+    private TaskStatusEnum status;
+}

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

@@ -0,0 +1,21 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class DimensionValueReq {
+
+    private Integer agentId;
+
+    @NotNull
+    private Long elementID;
+
+    @NotNull
+    private Long modelId;
+
+    private String bizName;
+
+    @NotNull
+    private String value;
+}

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 import java.util.List;
 import lombok.AllArgsConstructor;
@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 /**
- * the entity info about the domain
+ * the entity info about the model
  */
 @Data
 @AllArgsConstructor

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

@@ -0,0 +1,20 @@
+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;
+}

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/ItemVisibility.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 import lombok.Data;
 

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

@@ -1,21 +1,20 @@
-package com.tencent.supersonic.chat.domain.pojo.config;
+package com.tencent.supersonic.chat.api.pojo.request;
 
-import com.tencent.supersonic.common.enums.TypeEnums;
+import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 
-import java.util.List;
 import javax.validation.constraints.NotNull;
 
 import lombok.Data;
 
 /**
- * information about dictionary about the domain
+ * information about dictionary about the model
  */
 
 @Data
-public class KnowledgeInfo {
+public class KnowledgeInfoReq {
 
     /**
-     * metricId、DimensionId、domainId
+     * metricId、DimensionId、modelId
      */
     private Long itemId;
 
@@ -33,6 +32,4 @@ public class KnowledgeInfo {
      * advanced knowledge config for single item
      */
     private KnowledgeAdvancedConfig knowledgeAdvancedConfig;
-
-
-}
+}

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

@@ -0,0 +1,20 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class PageQueryInfoReq {
+
+    private int current;
+
+    private int pageSize;
+
+    private String userName;
+
+    private List<Long> ids;
+
+    public Integer getLimitStart() {
+        return this.pageSize * (this.current - 1);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+
+import lombok.Data;
+
+@Data
+public class PluginQueryReq {
+
+
+    private String name;
+
+    private String parseMode;
+
+    private String type;
+
+    private String model;
+
+    private String pattern;
+
+    private String createdBy;
+}

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

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

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

@@ -0,0 +1,43 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.google.common.base.Objects;
+import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString(callSuper = true)
+public class QueryFilter {
+
+    private String bizName;
+
+    private String name;
+
+    private FilterOperatorEnum operator = FilterOperatorEnum.EQUALS;
+
+    private Object value;
+
+    private Long elementID;
+
+    private String function;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        QueryFilter that = (QueryFilter) o;
+        return Objects.equal(bizName, that.bizName) && Objects.equal(name,
+                that.name) && operator == that.operator && Objects.equal(value, that.value)
+                && Objects.equal(elementID, that.elementID) && Objects.equal(
+                function, that.function);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(bizName, name, operator, value, elementID, function);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.api.pojo;
+package com.tencent.supersonic.chat.api.pojo.request;
 
 import lombok.Data;
 import java.util.ArrayList;
@@ -7,10 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
-public class QueryFilter {
-
-    private List<Filter> filters = new ArrayList<>();
-
+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

@@ -0,0 +1,15 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import lombok.Data;
+
+@Data
+public class QueryReq {
+    private String queryText;
+    private Integer chatId;
+    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/RecommendedQuestionReq.java

@@ -0,0 +1,16 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class RecommendedQuestionReq {
+
+    private String question;
+
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SolvedQueryReq.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 SolvedQueryReq {
+
+    private Long queryId;
+
+    private Integer parseId;
+
+    private String queryText;
+
+    private String modelId;
+
+    private Integer agentId;
+
+}

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

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.chat.api.pojo.response;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class AggregateInfo {
+    private List<MetricInfo> metricInfos = new ArrayList<>();
+}