(improvement)(headless) Merge server and core in headless-api (#590)

(improvement)(headless) Merge server and core in headless-api

---------

Co-authored-by: jolunoluo

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

@@ -4,20 +4,20 @@ 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.headless.common.server.request.PageDimensionReq;
-import com.tencent.supersonic.headless.common.server.request.PageMetricReq;
-import com.tencent.supersonic.headless.common.server.response.DomainResp;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.ExplainResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
-import com.tencent.supersonic.headless.common.server.response.ModelResp;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 
 import java.util.List;
 

chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.chat.config;
 
 
-import com.tencent.supersonic.headless.common.server.response.DimSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
 import java.util.List;
 import lombok.Data;
 

chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java

@@ -23,8 +23,8 @@ import com.tencent.supersonic.common.pojo.enums.DataFormatTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.DateUtils;
 import com.tencent.supersonic.knowledge.service.SchemaService;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;

chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java

@@ -15,11 +15,11 @@ import com.tencent.supersonic.common.pojo.Order;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.knowledge.service.SchemaService;
-import com.tencent.supersonic.headless.common.server.enums.QueryType;
-import com.tencent.supersonic.headless.common.server.response.ExplainResp;
-import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.enums.QueryType;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java

@@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java

@@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.query.llm.LLMSemanticQuery;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
 import com.tencent.supersonic.chat.utils.QueryReqBuilder;
 import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java

@@ -23,9 +23,9 @@ import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java

@@ -9,8 +9,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.common.pojo.enums.FilterType;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.Filter;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java

@@ -18,7 +18,7 @@ import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.chat.service.SemanticService;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java

@@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.common.pojo.Filter;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.FilterType;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java

@@ -12,12 +12,12 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp;
 import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
-import com.tencent.supersonic.headless.common.server.request.PageDimensionReq;
-import com.tencent.supersonic.headless.common.server.request.PageMetricReq;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.DomainResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
-import com.tencent.supersonic.headless.common.server.response.ModelResp;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java

@@ -41,8 +41,8 @@ import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.RatioOverType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateUtils;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import com.tencent.supersonic.knowledge.service.SchemaService;
 import java.text.DecimalFormat;
 import java.time.DayOfWeek;

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java

@@ -31,9 +31,9 @@ import com.tencent.supersonic.chat.utils.ChatConfigHelper;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
 import com.tencent.supersonic.chat.utils.VisibilityEvent;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.service.MetricService;

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java

@@ -16,7 +16,7 @@ import com.tencent.supersonic.chat.service.PluginService;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.common.server.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java

@@ -59,8 +59,8 @@ import com.tencent.supersonic.knowledge.dictionary.MultiCustomDictionary;
 import com.tencent.supersonic.knowledge.service.SearchService;
 import com.tencent.supersonic.knowledge.utils.HanlpHelper;
 import com.tencent.supersonic.knowledge.utils.NatureHelper;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;

chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java

@@ -14,8 +14,8 @@ import com.tencent.supersonic.chat.persistence.dataobject.DimValueDO;
 import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.knowledge.dictionary.DictUpdateMode;
 import com.tencent.supersonic.knowledge.dictionary.DimValue2DictCommand;
-import com.tencent.supersonic.headless.common.server.request.PageDimensionReq;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java

@@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.Order;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;

chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java

@@ -13,9 +13,9 @@ import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;

chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java

@@ -11,11 +11,11 @@ import com.tencent.supersonic.chat.service.ChatService;
 import com.tencent.supersonic.chat.service.QueryService;
 import com.tencent.supersonic.chat.service.impl.ConfigServiceImpl;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.headless.common.server.response.DimSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
-import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import com.tencent.supersonic.headless.server.pojo.DimensionFilter;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.DimensionService;

chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java

@@ -10,8 +10,8 @@ import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java

@@ -4,7 +4,7 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.tencent.supersonic.chat.api.component.SemanticInterpreter;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java

@@ -5,21 +5,21 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.headless.common.server.request.PageDimensionReq;
-import com.tencent.supersonic.headless.common.server.request.PageMetricReq;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.DomainResp;
-import com.tencent.supersonic.headless.common.server.response.ExplainResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
-import com.tencent.supersonic.headless.common.server.response.ModelResp;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import com.tencent.supersonic.headless.core.service.QueryService;
 import com.tencent.supersonic.headless.core.service.SchemaService;
 import com.tencent.supersonic.headless.server.service.DimensionService;

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java

@@ -6,12 +6,12 @@ import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.DimValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.RelateDimension;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
-import com.tencent.supersonic.headless.common.server.response.DimSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java

@@ -19,21 +19,21 @@ import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
-import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.headless.common.server.request.PageDimensionReq;
-import com.tencent.supersonic.headless.common.server.request.PageMetricReq;
-import com.tencent.supersonic.headless.common.server.response.DimensionResp;
-import com.tencent.supersonic.headless.common.server.response.DomainResp;
-import com.tencent.supersonic.headless.common.server.response.ExplainResp;
-import com.tencent.supersonic.headless.common.server.response.MetricResp;
-import com.tencent.supersonic.headless.common.server.response.ModelResp;
-import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq;
-import com.tencent.supersonic.headless.common.core.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryS2SQLReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 import java.net.URI;
 import java.net.URL;
 import java.util.HashMap;

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum AggOption {
     NATIVE,

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum AppStatus {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 import com.tencent.supersonic.common.pojo.Constants;

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java

@@ -0,0 +1,9 @@
+package com.tencent.supersonic.headless.api.enums;
+
+
+public enum DimensionType {
+
+    categorical,
+    time
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java

@@ -0,0 +1,8 @@
+package com.tencent.supersonic.headless.api.enums;
+
+public enum IdentifyType {
+
+    primary,
+    foreign,
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java

@@ -0,0 +1,9 @@
+package com.tencent.supersonic.headless.api.enums;
+
+
+public enum MetricType {
+
+    ATOMIC,
+    DERIVED
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 import java.util.Objects;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum QueryOptMode {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 public enum QueryType {

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 public enum QueryTypeBack {

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum SemanticType {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AppConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Cache.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dim.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimValueMap.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimensionTimeTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DrillDownDimension.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Entity.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Identify.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Item.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.enums.ApiItemType;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ItemDateFilter.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Measure.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricQueryDefaultConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
-import com.tencent.supersonic.headless.common.core.enums.AggOption;
+import com.tencent.supersonic.headless.api.enums.AggOption;
 import lombok.Data;
 
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import java.util.List;
 import com.google.common.collect.Lists;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.enums.DimensionType;
+import com.tencent.supersonic.headless.api.enums.DimensionType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryStat.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/RelateDimension.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaItem.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.base.Objects;
 import com.tencent.supersonic.common.pojo.RecordInfo;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java

@@ -0,0 +1,14 @@
+package com.tencent.supersonic.headless.api.pojo;
+
+
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import lombok.Data;
+
+@Data
+public class SingleItemQueryResult {
+
+    private Item item;
+
+    private QueryResultWithSchemaResp result;
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;
-import com.tencent.supersonic.headless.common.server.enums.AppStatus;
+import com.tencent.supersonic.headless.api.enums.AppStatus;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import com.tencent.supersonic.headless.common.server.pojo.AppConfig;
+import com.tencent.supersonic.headless.api.pojo.AppConfig;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.enums.DataType;
+import com.tencent.supersonic.headless.api.enums.DataType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.ArrayList;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
-import com.tencent.supersonic.headless.common.server.pojo.DimValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import java.util.ArrayList;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
-import com.tencent.supersonic.headless.common.server.enums.QueryType;
+import com.tencent.supersonic.headless.api.enums.QueryType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.List;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DataFormat;
-import com.tencent.supersonic.headless.common.server.pojo.RelateDimension;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java

@@ -1,12 +1,13 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
-import java.util.List;
-import java.util.Map;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
-public class MetricReq {
+public class MetricQueryReq {
 
     private List<String> metrics;
     private List<String> dimensions;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
-import com.tencent.supersonic.headless.common.server.enums.MetricType;
-import com.tencent.supersonic.headless.common.server.pojo.Measure;
-import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams;
+import com.tencent.supersonic.headless.api.enums.MetricType;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.MetricTypeParams;
 import lombok.Data;
 import java.util.List;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.pojo.Dim;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.ModelDetail;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.ModelDetail;
+import com.tencent.supersonic.headless.api.pojo.Dim;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
-import com.tencent.supersonic.headless.common.core.pojo.MetricTable;
+import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.alibaba.fastjson.JSONObject;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryS2SQLReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.Aggregator;
@@ -12,8 +12,8 @@ import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
-import com.tencent.supersonic.headless.common.core.pojo.Cache;
-import com.tencent.supersonic.headless.common.core.pojo.Param;
+import com.tencent.supersonic.headless.api.pojo.Cache;
+import com.tencent.supersonic.headless.api.pojo.Param;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import javax.validation.constraints.NotBlank;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.Date;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import com.tencent.supersonic.headless.common.server.enums.AppStatus;
-import com.tencent.supersonic.headless.common.server.pojo.AppConfig;
+import com.tencent.supersonic.headless.api.enums.AppStatus;
+import com.tencent.supersonic.headless.api.pojo.AppConfig;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
-import com.tencent.supersonic.headless.common.server.pojo.DimValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
-import com.tencent.supersonic.headless.common.server.pojo.Entity;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Entity;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.response;
+package com.tencent.supersonic.headless.api.response;
 
-import com.tencent.supersonic.headless.common.core.pojo.SingleItemQueryResult;
+import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult;
 import lombok.Builder;
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java

@@ -1,14 +1,14 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.tencent.supersonic.common.pojo.DataFormat;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.Measure;
-import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams;
-import com.tencent.supersonic.headless.common.server.pojo.RelateDimension;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.MetricTypeParams;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.pojo.Dim;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.Identify;
-import com.tencent.supersonic.headless.common.server.pojo.ModelDetail;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Dim;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.ModelDetail;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Identify;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.tencent.supersonic.common.pojo.ModelRela;
-import com.tencent.supersonic.headless.common.server.pojo.Identify;
+import com.tencent.supersonic.headless.api.pojo.Identify;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/QueryResultWithSchemaResp.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.headless.common.server.enums.SemanticType;
-import com.tencent.supersonic.headless.common.server.pojo.QueryResult;
+import com.tencent.supersonic.headless.api.enums.SemanticType;
+import com.tencent.supersonic.headless.api.pojo.QueryResult;
 import lombok.Data;
 import lombok.ToString;
 import java.util.List;