diff options
Diffstat (limited to 'galaxy-query-engine')
43 files changed, 68 insertions, 73 deletions
diff --git a/galaxy-query-engine/pom.xml b/galaxy-query-engine/pom.xml index 835beef..06686c2 100644 --- a/galaxy-query-engine/pom.xml +++ b/galaxy-query-engine/pom.xml @@ -48,14 +48,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.zdjizhi</groupId> - <artifactId>galaxy</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> + <groupId>com.mesalab</groupId> + <artifactId>galaxy-tool</artifactId> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> diff --git a/galaxy-query-engine/src/main/java/com/mesalab/calcite/CalciteMemoryUtils.java b/galaxy-query-engine/src/main/java/com/mesalab/calcite/CalciteMemoryUtils.java index c84cdb7..50fa6ad 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/calcite/CalciteMemoryUtils.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/calcite/CalciteMemoryUtils.java @@ -8,7 +8,7 @@ import com.google.common.collect.Maps; import com.mesalab.calcite.storage.DataTypeMapping; import com.mesalab.calcite.storage.Storage; import com.mesalab.common.exception.BusinessException; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.calcite.jdbc.CalciteConnection; import org.apache.commons.lang3.StringUtils; @@ -18,7 +18,7 @@ import java.sql.*; import java.util.*; import java.util.concurrent.TimeUnit; -import static com.zdjizhi.utils.StringUtil.setDefaultIfEmpty; +import static com.mesalab.tool.utils.StringUtil.setDefaultIfEmpty; import static org.apache.commons.lang3.StringUtils.defaultIfEmpty; @Slf4j diff --git a/galaxy-query-engine/src/main/java/com/mesalab/calcite/function/DateFunction.java b/galaxy-query-engine/src/main/java/com/mesalab/calcite/function/DateFunction.java index 1801c9c..221c4f4 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/calcite/function/DateFunction.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/calcite/function/DateFunction.java @@ -1,6 +1,6 @@ package com.mesalab.calcite.function; -import com.zdjizhi.utils.DateUtils; +import com.mesalab.tool.utils.DateUtils; public class DateFunction { diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/base/SchemaBase.java b/galaxy-query-engine/src/main/java/com/mesalab/common/base/SchemaBase.java index aff97f9..f85cdf3 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/base/SchemaBase.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/base/SchemaBase.java @@ -22,7 +22,7 @@ public class SchemaBase implements Serializable { private List<Map> fields; public String getNamespace() { - return namespace = "com.zdjizhi"; + return namespace = "com.mesalab.tool"; } public String getType() { diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/ClickHouseConfiguration.java b/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/ClickHouseConfiguration.java index fe684af..8f3dd25 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/ClickHouseConfiguration.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/ClickHouseConfiguration.java @@ -1,7 +1,7 @@ package com.mesalab.common.configuration; import com.mesalab.qgw.model.api.ClickHouseHttpSource; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ConvertUtil.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ConvertUtil.java index 43736f0..0e62895 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ConvertUtil.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ConvertUtil.java @@ -3,8 +3,8 @@ package com.mesalab.common.utils; import com.google.common.base.Joiner; import com.google.common.collect.*; import com.mesalab.common.support.IConvertor; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.StringUtil; import org.apache.commons.lang3.StringUtils; import org.nutz.lang.Lang; import java.util.*; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/IPUtil.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/IPUtil.java index 5a26fb1..836700d 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/IPUtil.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/IPUtil.java @@ -1,6 +1,6 @@ package com.mesalab.common.utils; -import com.zdjizhi.utils.IpLookup; +import com.mesalab.tool.utils.IpLookup; import javax.servlet.http.HttpServletRequest; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/QueryCacheUtils.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/QueryCacheUtils.java index 07ee3d7..96d40ea 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/QueryCacheUtils.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/QueryCacheUtils.java @@ -3,7 +3,7 @@ package com.mesalab.common.utils; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheStats; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ReportCacheUtils.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ReportCacheUtils.java index c31c1ec..38fd291 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ReportCacheUtils.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/ReportCacheUtils.java @@ -7,7 +7,7 @@ import com.mesalab.common.enums.ResultCodeEnum; import com.mesalab.common.enums.ResultStatusEnum; import com.mesalab.common.exception.BusinessException; import com.mesalab.qgw.model.api.HBaseAPISource; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.hadoop.hbase.TableName; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/SQLFunctionUtil.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/SQLFunctionUtil.java index 6feb2a3..8f684d7 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/SQLFunctionUtil.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/SQLFunctionUtil.java @@ -7,7 +7,7 @@ import com.mesalab.knowledge.common.utils.HttpConfig; import com.mesalab.qgw.model.api.ClickHouseHttpSource; import com.mesalab.qgw.model.api.DruidIoHttpSource; import com.mesalab.qgw.service.impl.HttpClientService; -import com.zdjizhi.utils.Encodes; +import com.mesalab.tool.utils.Encodes; import lombok.Data; import org.apache.commons.lang.StringUtils; import org.apache.http.NameValuePair; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TableFinder.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TableFinder.java index 4ca55b7..3cf6dbf 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TableFinder.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TableFinder.java @@ -2,7 +2,7 @@ package com.mesalab.common.utils; import com.mesalab.common.utils.SpringContextUtil; import com.mesalab.qgw.service.MetadataService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import net.sf.jsqlparser.expression.*; import net.sf.jsqlparser.expression.operators.arithmetic.*; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TreeUtils.java b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TreeUtils.java index e09fbe5..8d6b7ca 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TreeUtils.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/common/utils/TreeUtils.java @@ -1,7 +1,7 @@ package com.mesalab.common.utils; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/common/utils/JwtCache.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/common/utils/JwtCache.java index b09825d..ff1c263 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/common/utils/JwtCache.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/common/utils/JwtCache.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheStats; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; /** * @description: for jwt cache diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/controller/KnowledgeController.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/controller/KnowledgeController.java index d2fbcbf..f3fef3d 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/controller/KnowledgeController.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/controller/KnowledgeController.java @@ -6,7 +6,7 @@ import com.mesalab.common.enums.ResultStatusEnum; import com.mesalab.common.exception.BusinessException; import com.mesalab.knowledge.enums.QueryTypeEnum; import com.mesalab.knowledge.service.KnowledgeService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.EnumUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/entity/Match.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/entity/Match.java index 3e44af1..7ad2818 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/entity/Match.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/entity/Match.java @@ -2,7 +2,7 @@ package com.mesalab.knowledge.entity; import com.google.common.base.CharMatcher; import com.mesalab.knowledge.enums.MatchEnum; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import org.apache.commons.lang3.EnumUtils; import org.springframework.util.ObjectUtils; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/service/KnowledgeService.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/service/KnowledgeService.java index 20e7780..6b42113 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/service/KnowledgeService.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/service/KnowledgeService.java @@ -15,9 +15,9 @@ import com.mesalab.knowledge.enums.DataSourceEnum; import com.mesalab.knowledge.enums.MatchEnum; import com.mesalab.knowledge.enums.RangeEnum; import com.mesalab.knowledge.strategy.QueryProvider; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.Validate; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/BaseQueryProvider.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/BaseQueryProvider.java index 599910d..366eaf0 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/BaseQueryProvider.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/BaseQueryProvider.java @@ -6,7 +6,7 @@ import com.mesalab.knowledge.common.config.ArangoConfig; import com.mesalab.knowledge.common.utils.Constant; import com.mesalab.knowledge.common.utils.JwtCache; import com.mesalab.qgw.service.impl.HttpClientService; -import com.zdjizhi.utils.JsonMapper; +import com.mesalab.tool.utils.JsonMapper; import lombok.extern.slf4j.Slf4j; import org.apache.http.Header; import org.apache.http.message.BasicHeader; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/FqdnProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/FqdnProviderImpl.java index 90ead32..2cdc0cc 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/FqdnProviderImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/FqdnProviderImpl.java @@ -13,8 +13,8 @@ import com.mesalab.knowledge.entity.Parameters; import com.mesalab.knowledge.entity.Range; import com.mesalab.knowledge.entity.arango.IpLearningPath; import com.mesalab.knowledge.enums.RangeEnum; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.StringUtil; import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.Validate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/IpProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/IpProviderImpl.java index 765ff56..e0c7d68 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/IpProviderImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/IpProviderImpl.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.mesalab.knowledge.entity.DSLObject; import com.mesalab.knowledge.entity.Parameters; import com.mesalab.knowledge.entity.Sort; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/SubscriberIdProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/SubscriberIdProviderImpl.java index 6370a2b..71f2490 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/SubscriberIdProviderImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/knowledge/strategy/SubscriberIdProviderImpl.java @@ -8,7 +8,7 @@ import com.google.common.collect.Maps; import com.mesalab.knowledge.entity.DSLObject; import com.mesalab.knowledge.entity.Match; import com.mesalab.knowledge.entity.Parameters; -import com.zdjizhi.utils.DateUtils; +import com.mesalab.tool.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/ApiController.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/ApiController.java index 0c9542b..62b3053 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/ApiController.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/ApiController.java @@ -6,8 +6,8 @@ import com.mesalab.qgw.model.api.ApiParam; import com.mesalab.qgw.model.api.AuditLog; import com.mesalab.qgw.model.api.CachedSubmitCheck; import com.mesalab.qgw.service.ApiService; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/AuditLogAspect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/AuditLogAspect.java index 690e66a..9eb6b96 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/AuditLogAspect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/AuditLogAspect.java @@ -7,7 +7,7 @@ import com.mesalab.common.utils.JsonMapper; import com.mesalab.qgw.model.api.ApiParam; import com.mesalab.qgw.model.api.AuditLog; import com.mesalab.qgw.model.api.AuditServiceLog; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.*; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/MetadataController.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/MetadataController.java index bc2db36..f53406a 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/MetadataController.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/MetadataController.java @@ -3,7 +3,7 @@ package com.mesalab.qgw.controller; import com.mesalab.common.base.BaseResult; import com.mesalab.common.base.BaseResultGenerator; import com.mesalab.qgw.service.MetadataService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/SystemController.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/SystemController.java index 9a2e755..0aa156d 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/SystemController.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/controller/SystemController.java @@ -6,7 +6,7 @@ import com.mesalab.common.enums.ResultStatusEnum; import com.mesalab.common.exception.BusinessException; import com.mesalab.qgw.model.job.StorageDeletionInfo; import com.mesalab.qgw.service.SystemService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractDataSourceDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractDataSourceDialect.java index aac3bd2..bfdad28 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractDataSourceDialect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractDataSourceDialect.java @@ -4,8 +4,8 @@ package com.mesalab.qgw.dialect; import com.mesalab.common.base.BaseResult; import com.mesalab.common.base.BaseResultGenerator; import com.mesalab.qgw.model.api.ApiParam; -import com.zdjizhi.utils.Encodes; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.Encodes; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import org.apache.calcite.rel.core.TableScan; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractEngineDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractEngineDialect.java index eb39720..88d1096 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractEngineDialect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/AbstractEngineDialect.java @@ -2,7 +2,7 @@ package com.mesalab.qgw.dialect; import com.mesalab.common.base.BaseResult; import com.mesalab.qgw.model.api.ApiParam; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import java.util.Optional; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/ClickHouseDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/ClickHouseDialect.java index 419b1ac..9153bd2 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/ClickHouseDialect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/ClickHouseDialect.java @@ -12,8 +12,8 @@ import com.mesalab.qgw.model.api.*; import com.mesalab.qgw.service.MetadataService; import com.mesalab.qgw.service.impl.HttpClientService; import com.mesalab.common.utils.TableFinder; -import com.zdjizhi.utils.Encodes; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.Encodes; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/DruidDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/DruidDialect.java index a33f12d..6cd4a84 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/DruidDialect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/DruidDialect.java @@ -20,7 +20,7 @@ import com.mesalab.qgw.model.api.DruidIoHttpSource; import com.mesalab.qgw.model.api.EngineConfigSource; import com.mesalab.qgw.model.api.SQLQuerySource; import com.mesalab.qgw.service.impl.HttpClientService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/FederationDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/FederationDialect.java index fe3649f..99e6798 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/FederationDialect.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/dialect/FederationDialect.java @@ -14,7 +14,7 @@ import com.mesalab.common.utils.JsonMapper; import com.mesalab.qgw.model.api.ApiParam; import com.mesalab.qgw.model.api.SQLQuerySource; import com.mesalab.qgw.model.api.udf.UDF; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/interceptor/QuerySubmitInterceptor.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/interceptor/QuerySubmitInterceptor.java index 9e5582f..1f4e8ff 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/interceptor/QuerySubmitInterceptor.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/interceptor/QuerySubmitInterceptor.java @@ -4,7 +4,7 @@ import com.google.common.cache.CacheStats; import com.mesalab.common.utils.QueryCacheUtils; import com.mesalab.common.utils.JsonMapper; import com.mesalab.qgw.model.api.CachedSubmitCheck; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/ApiParam.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/ApiParam.java index 14c6341..0280e0a 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/ApiParam.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/ApiParam.java @@ -1,6 +1,6 @@ package com.mesalab.qgw.model.api; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/SQLQuerySource.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/SQLQuerySource.java index 3ea2dd9..4d78c07 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/SQLQuerySource.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/SQLQuerySource.java @@ -5,7 +5,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.mesalab.qgw.model.api.udf.UDF; import com.mesalab.qgw.service.impl.ApiServiceImpl; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.select.*; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_CITY.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_CITY.java index 99b07f7..f87c3ac 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_CITY.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_CITY.java @@ -3,7 +3,7 @@ package com.mesalab.qgw.model.api.udf; import com.google.common.collect.Lists; import com.mesalab.common.utils.IPUtil; import com.mesalab.qgw.model.api.SQLQuerySource; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_COUNTRY.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_COUNTRY.java index d57f5ee..8133cc2 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_COUNTRY.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_COUNTRY.java @@ -3,7 +3,7 @@ package com.mesalab.qgw.model.api.udf; import com.google.common.collect.Lists; import com.mesalab.common.utils.IPUtil; import com.mesalab.qgw.model.api.SQLQuerySource; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_GEO.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_GEO.java index bc49146..14e5f12 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_GEO.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/IP_TO_GEO.java @@ -3,9 +3,9 @@ package com.mesalab.qgw.model.api.udf; import com.google.common.collect.Lists; import com.mesalab.common.utils.IPUtil; import com.mesalab.qgw.model.api.SQLQuerySource; -import com.zdjizhi.utils.IpLookup; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.IpLookup; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/TIME_FLOOR_WITH_FILL.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/TIME_FLOOR_WITH_FILL.java index bf2e2d6..c20caed 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/TIME_FLOOR_WITH_FILL.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/api/udf/TIME_FLOOR_WITH_FILL.java @@ -13,8 +13,8 @@ import com.mesalab.common.utils.SpringContextUtil; import com.mesalab.qgw.model.api.EngineConfigSource; import com.mesalab.qgw.model.api.SQLQuerySource; import com.mesalab.qgw.service.MetadataService; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/protocol/ProtocolTree.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/protocol/ProtocolTree.java index d917798..0492b99 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/protocol/ProtocolTree.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/model/protocol/ProtocolTree.java @@ -2,7 +2,7 @@ package com.mesalab.qgw.model.protocol; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/ArangoHealthIndicator.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/ArangoHealthIndicator.java index 042d503..a04a299 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/ArangoHealthIndicator.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/ArangoHealthIndicator.java @@ -7,8 +7,8 @@ import com.mesalab.knowledge.common.utils.Constant; import com.mesalab.knowledge.common.utils.JwtCache; import com.mesalab.knowledge.strategy.QueryProvider; import com.mesalab.qgw.service.impl.HttpClientService; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/ApiServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/ApiServiceImpl.java index b191734..89c1902 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/ApiServiceImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/ApiServiceImpl.java @@ -33,7 +33,7 @@ import com.mesalab.qgw.model.api.udf.UDF; import com.mesalab.qgw.model.api.udf.UDFElements; import com.mesalab.qgw.service.ApiService; import com.mesalab.qgw.service.MetadataService; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.BinaryExpression; import net.sf.jsqlparser.expression.Expression; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/HttpClientService.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/HttpClientService.java index 6e21a2f..9bf422e 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/HttpClientService.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/HttpClientService.java @@ -3,7 +3,7 @@ package com.mesalab.qgw.service.impl; import com.google.common.collect.Maps; import com.mesalab.common.exception.BusinessException; import com.mesalab.knowledge.common.utils.HttpConfig; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.http.*; import org.apache.http.client.ClientProtocolException; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/MetadataServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/MetadataServiceImpl.java index e65b328..0e4cd3f 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/MetadataServiceImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/MetadataServiceImpl.java @@ -10,8 +10,8 @@ import com.mesalab.common.enums.DBTypeEnum; import com.mesalab.common.exception.BusinessException; import com.mesalab.common.utils.SchemaCacheUtils; import com.mesalab.qgw.service.MetadataService; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.avro.Schema; import org.apache.http.HttpStatus; diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/SystemServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/SystemServiceImpl.java index a36c0f5..463916d 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/SystemServiceImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/SystemServiceImpl.java @@ -16,9 +16,9 @@ import com.mesalab.qgw.model.job.StorageDeletionInfo; import com.mesalab.qgw.model.job.XxlJobInfo; import com.mesalab.qgw.service.ApiService; import com.mesalab.qgw.service.SystemService; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.Encodes; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.Encodes; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -280,7 +280,7 @@ public class SystemServiceImpl implements SystemService { StorageDeletionInfo storageDeletionInfo = new StorageDeletionInfo(); Map trafficDate = getDataByHandler(jobHandlerValue); XxlJobInfo xxlJobInfo = mapToBean(trafficDate, XxlJobInfo.class); - Map executorParam = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(xxlJobInfo.getExecutorParam(), Map.class); + Map executorParam = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(xxlJobInfo.getExecutorParam(), Map.class); Object maxDays = executorParam.get("maxdays"); storageDeletionInfo.setLogType(logType); storageDeletionInfo.setMaxDays(Integer.parseInt(String.valueOf(maxDays))); @@ -336,7 +336,7 @@ public class SystemServiceImpl implements SystemService { baseResult = BaseResultGenerator.failure(HttpStatus.SC_INTERNAL_SERVER_ERROR, "服务繁忙，请联系调度平台方！"); } else { if (resultMap.get("status").equals(String.valueOf(HttpStatus.SC_OK))) { - Map result = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(String.valueOf(resultMap.get("result")), Map.class); + Map result = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(String.valueOf(resultMap.get("result")), Map.class); if (result.get("code").equals(HttpStatus.SC_OK)) { baseResult = BaseResultGenerator.success("ok", null); } else if (result.get("code").equals(HttpStatus.SC_LOCKED)) { diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/TestSqlServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/TestSqlServiceImpl.java index 478214c..e0fc6bd 100644 --- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/TestSqlServiceImpl.java +++ b/galaxy-query-engine/src/main/java/com/mesalab/qgw/service/impl/TestSqlServiceImpl.java @@ -12,8 +12,8 @@ import com.mesalab.common.utils.JsonMapper; import com.mesalab.common.utils.SchemaCacheUtils; import com.mesalab.knowledge.common.utils.HttpConfig; import com.mesalab.qgw.model.api.ClickHouseHttpSource; -import com.zdjizhi.utils.Encodes; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.Encodes; +import com.mesalab.tool.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.avro.JsonProperties; import org.apache.avro.Schema; @@ -456,7 +456,7 @@ public class TestSqlServiceImpl { Iterator<String> iterator = name.iterator(); while (iterator.hasNext()) {//遍历表,以Avro为基础 String tableName = iterator.next(); - Map resultMap = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(String.valueOf(druidSchemaInfo.get(tableName)), Map.class); + Map resultMap = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(String.valueOf(druidSchemaInfo.get(tableName)), Map.class); if (resultMap == null) { throw new BusinessException(ResultStatusEnum.FAIL.getCode(), "schema未注册此表: " + tableName, null); } @@ -498,7 +498,7 @@ public class TestSqlServiceImpl { Iterator<String> iterator = name.iterator(); while (iterator.hasNext()) {//遍历表,以Avro为基础 String tableName = iterator.next(); - Map resultMap = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(String.valueOf(ckSchemaInfo.get(tableName)), Map.class); + Map resultMap = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(String.valueOf(ckSchemaInfo.get(tableName)), Map.class); if (resultMap == null) { throw new BusinessException(ResultStatusEnum.FAIL.getCode(), "schema未注册此表: " + tableName, null); } @@ -587,7 +587,7 @@ public class TestSqlServiceImpl { Iterator<String> iterator = name.iterator(); while (iterator.hasNext()) {//遍历表 String tableName = iterator.next(); - Map resultMap = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(String.valueOf(ckeckSchemaInfo.get(tableName)), Map.class); + Map resultMap = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(String.valueOf(ckeckSchemaInfo.get(tableName)), Map.class); if (resultMap == null) { throw new BusinessException(ResultStatusEnum.FAIL.getCode(), "schema未注册此表: " + tableName, null); } @@ -597,7 +597,7 @@ public class TestSqlServiceImpl { while (fieldsIterator.hasNext()) { Map next = fieldsIterator.next(); try { - mapDoc = (Map) com.zdjizhi.utils.JsonMapper.fromJsonString(String.valueOf(next.get("doc")), Map.class); + mapDoc = (Map) com.mesalab.tool.utils.JsonMapper.fromJsonString(String.valueOf(next.get("doc")), Map.class); } catch (Exception ex) { log.error("该字段的 doc 为非JSON字符串，不需类型转换"); String str = String.format("%s.avro中doc非json格式字段%s", tableName, next.get("name")); |