构建多模块工程完成

148 files changed, 109 insertions, 238 deletions

diff --git a/README.md b/README.md
index 7cfb441..44ad1f8 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # 银河数据服务平台
 [![](https://img.shields.io/badge/MIT-License-blue)](https://git.mesalab.cn/galaxy/galaxy-data-platform/-/blob/master/LICENSE)
-[![](https://img.shields.io/badge/SpringBoot-2.2.2.RELEASE-green)](https://docs.spring.io/spring-boot/docs/2.2.2.RELEASE/reference/html/index.html)
+[![](https://img.shields.io/badge/SpringBoot-2.0.2.RELEASE-green)](https://docs.spring.io/spring-boot/docs/2.0.2.RELEASE/reference/html/index.html)
 [![](https://img.shields.io/badge/SpringCloud-Hoxton.SR1-brightgreen)](https://spring.io/blog/2019/12/21/spring-cloud-hoxton-service-release-1-sr1-is-available)
 [![](https://img.shields.io/badge/maven--central-snapshots-orange)](http://192.168.40.125:8099/content/repositories/snapshots/com/mesalab/)
 ## Introduction
 统一的接口支持流式、批量作业，提供交互式SQL分析和例行调度，让您更方便编写和提交ETL程序，高效执行大数据计算程序，让大数据处理变得如此简单。
 ## Technology stack
-**Spring Boot 2.2.2.RELEASE** https://docs.spring.io/spring-boot/docs/2.2.2.RELEASE/reference/html/index.html
+**Spring Boot 2.0.2.RELEASE** https://docs.spring.io/spring-boot/docs/2.2.2.RELEASE/reference/html/index.html
 
 **Spring Cloud Hoxton.SR1** https://spring.io/blog/2019/12/21/spring-cloud-hoxton-service-release-1-sr1-is-available
 
@@ -16,7 +16,7 @@
 
 **Spring Boot Admin 2.3.0** https://codecentric.github.io/spring-boot-admin/2.3.0/
 ## 系统架构图
-![系统架构图](images/architecture-v1.0.jpg)
+![系统架构图](images/architecture-v2.0.jpg)
 ## 项目启动顺序
 
 1.  **[galaxy-eureka-server](https://git.mesalab.cn/galaxy/galaxy-data-platform/-/tree/master/galaxy-eureka-server)** 优先启动注册中心,各服务启动时会向注册中心提交服务和拉取服务列表
diff --git a/galaxy-business-api/pom.xml b/galaxy-business-api/pom.xml
new file mode 100644
index 0000000..ec9f07d
--- /dev/null
+++ b/galaxy-business-api/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-business-api</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/galaxy-common/pom.xml b/galaxy-common/pom.xml
index a7b528a..0cd2b05 100644
--- a/galaxy-common/pom.xml
+++ b/galaxy-common/pom.xml
@@ -60,6 +60,7 @@
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
diff --git a/galaxy-common/src/main/java/com/mesalab/common/dto/params/NetworkParam.java b/galaxy-common/src/main/java/com/mesalab/common/dto/params/NetworkParam.java
index 8ab565d..01b8fe4 100644
--- a/galaxy-common/src/main/java/com/mesalab/common/dto/params/NetworkParam.java
+++ b/galaxy-common/src/main/java/com/mesalab/common/dto/params/NetworkParam.java
@@ -1,10 +1,10 @@
 package com.mesalab.common.dto.params;
 
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.Valid;
 
 /**
  * @author wangwei
diff --git a/galaxy-common/src/main/java/com/mesalab/common/dto/params/QueryParam.java b/galaxy-common/src/main/java/com/mesalab/common/dto/params/QueryParam.java
index c74b8dd..02bf4bf 100644
--- a/galaxy-common/src/main/java/com/mesalab/common/dto/params/QueryParam.java
+++ b/galaxy-common/src/main/java/com/mesalab/common/dto/params/QueryParam.java
@@ -1,12 +1,12 @@
 package com.mesalab.common.dto.params;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/galaxy-eureka-server/config/application.properties b/galaxy-eureka-server/config/application.properties
deleted file mode 100644
index 7561b95..0000000
--- a/galaxy-eureka-server/config/application.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#application config
-server.port=8501
-spring.application.name=galaxy-eureka-server
-#spring cloud eureka config
-eureka.client.fetchRegistry=false
-eureka.client.registerWithEureka=false
-eureka.server.enable-self-preservation=false
-eureka.instance.hostname=127.0.0.1
-eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/
-#management config
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-#spring security config
-spring.security.user.name=admin
-spring.security.user.password=admin
-#log file path config
-logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-eureka-server/config/logback-spring.xml b/galaxy-eureka-server/config/logback-spring.xml
deleted file mode 100644
index 6ce832c..0000000
--- a/galaxy-eureka-server/config/logback-spring.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration scan="true" scanPeriod="60 seconds">
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-eureka-server/logs" />
-
-    <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-eureka-server/logs" />
-
-    <property name="LOG_NAME" value="galaxy-eureka-server" />
-
-    <!-- dev env -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-    <root level="INFO">
-        <appender-ref ref="CONSOLE" />
-    </root>
-
-    <!-- test env -->
-    <springProfile name="test">
-        <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <encoder>
-                <pattern>${FILE_LOG_PATTERN}</pattern>
-            </encoder>
-            <file>${TEST_FILE_PATH}${file.separator}${LOG_NAME}.log</file>
-            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-                <!-- rollover daily -->
-                <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB -->
-                <maxHistory>30</maxHistory>
-                <maxFileSize>100MB</maxFileSize>
-            </rollingPolicy>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="TEST_FILE" />
-        </root>
-    </springProfile>
-
-    <!-- prod env -->
-    <springProfile name="prod">
-        <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <encoder>
-                <pattern>${FILE_LOG_PATTERN}</pattern>
-            </encoder>
-            <file>${PROD_FILE_PATH}${file.separator}${LOG_NAME}.log</file>
-            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-                <!-- rollover daily -->
-                <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB -->
-                <maxHistory>30</maxHistory>
-                <maxFileSize>100MB</maxFileSize>
-            </rollingPolicy>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="PROD_FILE" />
-        </root>
-    </springProfile>
-</configuration>
diff --git a/galaxy-eureka-server/docker/Dockerfile b/galaxy-eureka-server/docker/Dockerfile
deleted file mode 100644
index 36e302c..0000000
--- a/galaxy-eureka-server/docker/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-ARG JDK_IMAGE
-FROM ${JDK_IMAGE}
-MAINTAINER galaxy-data-platform
-VOLUME /tmp
-WORKDIR /home/galaxy/galaxy-eureka-server
-COPY config config
-ARG JAR_FILE
-COPY ${JAR_FILE} galaxy-eureka-server.jar
-ENV JAVA_OPTS=" -Xms1024m -Xmx2048m "
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar galaxy-eureka-server.jar" ]
diff --git a/galaxy-eureka-server/pom.xml b/galaxy-eureka-server/pom.xml
deleted file mode 100644
index d4073f5..0000000
--- a/galaxy-eureka-server/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>galaxy-data-platform</artifactId>
-        <groupId>com.mesalab</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>galaxy-eureka-server</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>galaxy-eureka-server</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.0.1.RELEASE</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.mesalab.eureka.GalaxyEurekaServerApp</mainClass>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <serverId>153-docker-repo</serverId>
-                    <registryUrl>${docker.registry}:${docker.registry.port}</registryUrl>
-                    <pushImage>true</pushImage>
-                    <imageName>${docker.registry}:${docker.registry.port}/${docker.image.prefix}/${project.artifactId}
-                    </imageName>
-                    <forceTags>true</forceTags>
-                    <dockerHost>http://192.168.40.153:2375</dockerHost>
-                    <dockerDirectory>docker</dockerDirectory>
-                    <buildArgs>
-                        <JDK_IMAGE>192.168.40.153:9080/common/jdk:1.8.0_73</JDK_IMAGE>
-                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                        <resource>
-                            <targetPath>/config</targetPath>
-                            <directory>config</directory>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/galaxy-eureka-server/src/main/java/com/mesalab/eureka/GalaxyEurekaServerApp.java b/galaxy-eureka-server/src/main/java/com/mesalab/eureka/GalaxyEurekaServerApp.java
deleted file mode 100644
index 0b21f22..0000000
--- a/galaxy-eureka-server/src/main/java/com/mesalab/eureka/GalaxyEurekaServerApp.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mesalab.eureka;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
-
-@EnableEurekaServer
-@SpringCloudApplication
-public class GalaxyEurekaServerApp {
-
-    public static void main(String[] args) {
-        SpringApplication.run(GalaxyEurekaServerApp.class);
-    }
-
-}
diff --git a/galaxy-eureka-server/src/main/java/com/mesalab/eureka/config/WebSecurityConfigurer.java b/galaxy-eureka-server/src/main/java/com/mesalab/eureka/config/WebSecurityConfigurer.java
deleted file mode 100644
index 74540af..0000000
--- a/galaxy-eureka-server/src/main/java/com/mesalab/eureka/config/WebSecurityConfigurer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mesalab.eureka.config;
-
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@EnableWebSecurity
-public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        //关闭csrf
-        http.csrf().disable();
-        //开启认证：URL格式登录必须是httpBasic
-        http.authorizeRequests().anyRequest().authenticated().and().httpBasic();
-    }
-}
diff --git a/galaxy-eureka-server/src/main/resources/banner.txt b/galaxy-eureka-server/src/main/resources/banner.txt
deleted file mode 100644
index 944fbd7..0000000
--- a/galaxy-eureka-server/src/main/resources/banner.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-${AnsiColor.BRIGHT_GREEN}
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-${AnsiColor.BRIGHT_BLUE}
-              _                                            _
-             | |                                          | |
-   __ _  __ _| | __ ___  ___   _ ______ ___ _   _ _ __ ___| | ____ _ ______ ___  ___ _ ____   _____ _ __
-  / _` |/ _` | |/ _` \ \/ / | | |______/ _ \ | | | '__/ _ \ |/ / _` |______/ __|/ _ \ '__\ \ / / _ \ '__|
- | (_| | (_| | | (_| |>  <| |_| |     |  __/ |_| | | |  __/   < (_| |      \__ \  __/ |   \ V /  __/ |
-  \__, |\__,_|_|\__,_/_/\_\\__, |      \___|\__,_|_|  \___|_|\_\__,_|      |___/\___|_|    \_/ \___|_|
-   __/ |                    __/ |
-  |___/                    |___/
-${AnsiColor.BRIGHT_BLUE}
-Spring Boot Version: ${spring-boot.version}
-${AnsiColor.BRIGHT_GREEN}
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-${AnsiColor.DEFAULT}
-
diff --git a/galaxy-hos-service/pom.xml b/galaxy-hos-service/pom.xml
new file mode 100644
index 0000000..cd12254
--- /dev/null
+++ b/galaxy-hos-service/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-hos-service</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/galaxy-job-admin/pom.xml b/galaxy-job-admin/pom.xml
new file mode 100644
index 0000000..2eb01f9
--- /dev/null
+++ b/galaxy-job-admin/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-job-admin</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/galaxy-job-core/pom.xml b/galaxy-job-core/pom.xml
new file mode 100644
index 0000000..d887b30
--- /dev/null
+++ b/galaxy-job-core/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-job-core</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml
new file mode 100644
index 0000000..c58ae76
--- /dev/null
+++ b/galaxy-job-executor/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-job-executor</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/galaxy-data-engine/config/application.properties b/galaxy-query-engine/config/application.properties
index b03dc02..b03dc02 100644
--- a/galaxy-data-engine/config/application.properties
+++ b/galaxy-query-engine/config/application.properties
diff --git a/galaxy-data-engine/config/logback-spring.xml b/galaxy-query-engine/config/logback-spring.xml
index 07bad98..07bad98 100644
--- a/galaxy-data-engine/config/logback-spring.xml
+++ b/galaxy-query-engine/config/logback-spring.xml
diff --git a/galaxy-data-engine/docker/Dockerfile b/galaxy-query-engine/docker/Dockerfile
index 92acb05..92acb05 100644
--- a/galaxy-data-engine/docker/Dockerfile
+++ b/galaxy-query-engine/docker/Dockerfile
diff --git a/galaxy-data-engine/mmdb/asn_v4.mmdb b/galaxy-query-engine/mmdb/asn_v4.mmdb
index 4508ea2..4508ea2 100644
--- a/galaxy-data-engine/mmdb/asn_v4.mmdb
+++ b/galaxy-query-engine/mmdb/asn_v4.mmdb
diff --git a/galaxy-data-engine/mmdb/asn_v6.mmdb b/galaxy-query-engine/mmdb/asn_v6.mmdb
index a779312..a779312 100644
--- a/galaxy-data-engine/mmdb/asn_v6.mmdb
+++ b/galaxy-query-engine/mmdb/asn_v6.mmdb
diff --git a/galaxy-data-engine/mmdb/ip_private_v4.mmdb b/galaxy-query-engine/mmdb/ip_private_v4.mmdb
index 445f2aa..445f2aa 100644
--- a/galaxy-data-engine/mmdb/ip_private_v4.mmdb
+++ b/galaxy-query-engine/mmdb/ip_private_v4.mmdb
diff --git a/galaxy-data-engine/mmdb/ip_private_v6.mmdb b/galaxy-query-engine/mmdb/ip_private_v6.mmdb
index cf82ebe..cf82ebe 100644
--- a/galaxy-data-engine/mmdb/ip_private_v6.mmdb
+++ b/galaxy-query-engine/mmdb/ip_private_v6.mmdb
diff --git a/galaxy-data-engine/mmdb/ip_v4.mmdb b/galaxy-query-engine/mmdb/ip_v4.mmdb
index 842cce9..842cce9 100644
--- a/galaxy-data-engine/mmdb/ip_v4.mmdb
+++ b/galaxy-query-engine/mmdb/ip_v4.mmdb
diff --git a/galaxy-data-engine/mmdb/ip_v6.mmdb b/galaxy-query-engine/mmdb/ip_v6.mmdb
index cf82ebe..cf82ebe 100644
--- a/galaxy-data-engine/mmdb/ip_v6.mmdb
+++ b/galaxy-query-engine/mmdb/ip_v6.mmdb
diff --git a/galaxy-data-engine/pom.xml b/galaxy-query-engine/pom.xml
index c95671c..c95671c 100644
--- a/galaxy-data-engine/pom.xml
+++ b/galaxy-query-engine/pom.xml
diff --git a/galaxy-data-engine/schema/clickhouse/active_defence_event_log.avsc b/galaxy-query-engine/schema/clickhouse/active_defence_event_log.avsc
index d21aca3..d21aca3 100644
--- a/galaxy-data-engine/schema/clickhouse/active_defence_event_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/active_defence_event_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/connection_record_log.avsc b/galaxy-query-engine/schema/clickhouse/connection_record_log.avsc
index 3687b50..3687b50 100644
--- a/galaxy-data-engine/schema/clickhouse/connection_record_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/connection_record_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc
index 76eb947..76eb947 100644
--- a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc
+++ b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc
index 9e717ee..9e717ee 100644
--- a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc
+++ b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
index f8b0167..f8b0167 100644
--- a/galaxy-data-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
+++ b/galaxy-query-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/connection_record_log_http_domain.avsc b/galaxy-query-engine/schema/clickhouse/connection_record_log_http_domain.avsc
index 5d6ba28..5d6ba28 100644
--- a/galaxy-data-engine/schema/clickhouse/connection_record_log_http_domain.avsc
+++ b/galaxy-query-engine/schema/clickhouse/connection_record_log_http_domain.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/processes.avsc b/galaxy-query-engine/schema/clickhouse/processes.avsc
index 75d74a9..75d74a9 100644
--- a/galaxy-data-engine/schema/clickhouse/processes.avsc
+++ b/galaxy-query-engine/schema/clickhouse/processes.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/proxy_event_log.avsc b/galaxy-query-engine/schema/clickhouse/proxy_event_log.avsc
index 834e3b2..834e3b2 100644
--- a/galaxy-data-engine/schema/clickhouse/proxy_event_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/proxy_event_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/proxy_ip_info.avsc b/galaxy-query-engine/schema/clickhouse/proxy_ip_info.avsc
index 87797bd..87797bd 100644
--- a/galaxy-data-engine/schema/clickhouse/proxy_ip_info.avsc
+++ b/galaxy-query-engine/schema/clickhouse/proxy_ip_info.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/query_log.avsc b/galaxy-query-engine/schema/clickhouse/query_log.avsc
index 4f5e8d5..4f5e8d5 100644
--- a/galaxy-data-engine/schema/clickhouse/query_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/query_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/radius_onff_log.avsc b/galaxy-query-engine/schema/clickhouse/radius_onff_log.avsc
index 0e475c4..0e475c4 100644
--- a/galaxy-data-engine/schema/clickhouse/radius_onff_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/radius_onff_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/radius_record_log.avsc b/galaxy-query-engine/schema/clickhouse/radius_record_log.avsc
index 981a031..981a031 100644
--- a/galaxy-data-engine/schema/clickhouse/radius_record_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/radius_record_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/security_event_log.avsc b/galaxy-query-engine/schema/clickhouse/security_event_log.avsc
index 0a58bca..0a58bca 100644
--- a/galaxy-data-engine/schema/clickhouse/security_event_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/security_event_log.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/security_ip_info.avsc b/galaxy-query-engine/schema/clickhouse/security_ip_info.avsc
index e4d8ad9..e4d8ad9 100644
--- a/galaxy-data-engine/schema/clickhouse/security_ip_info.avsc
+++ b/galaxy-query-engine/schema/clickhouse/security_ip_info.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/security_website_domain_info.avsc b/galaxy-query-engine/schema/clickhouse/security_website_domain_info.avsc
index be084e6..be084e6 100644
--- a/galaxy-data-engine/schema/clickhouse/security_website_domain_info.avsc
+++ b/galaxy-query-engine/schema/clickhouse/security_website_domain_info.avsc
diff --git a/galaxy-data-engine/schema/clickhouse/sys_packet_capture_log.avsc b/galaxy-query-engine/schema/clickhouse/sys_packet_capture_log.avsc
index 73d3c42..73d3c42 100644
--- a/galaxy-data-engine/schema/clickhouse/sys_packet_capture_log.avsc
+++ b/galaxy-query-engine/schema/clickhouse/sys_packet_capture_log.avsc
diff --git a/galaxy-data-engine/schema/druid/injection_metrics_log.avsc b/galaxy-query-engine/schema/druid/injection_metrics_log.avsc
index 9e932bf..9e932bf 100644
--- a/galaxy-data-engine/schema/druid/injection_metrics_log.avsc
+++ b/galaxy-query-engine/schema/druid/injection_metrics_log.avsc
diff --git a/galaxy-data-engine/schema/druid/proxy_event_hits_log.avsc b/galaxy-query-engine/schema/druid/proxy_event_hits_log.avsc
index f6f700c..f6f700c 100644
--- a/galaxy-data-engine/schema/druid/proxy_event_hits_log.avsc
+++ b/galaxy-query-engine/schema/druid/proxy_event_hits_log.avsc
diff --git a/galaxy-data-engine/schema/druid/security_event_hits_log.avsc b/galaxy-query-engine/schema/druid/security_event_hits_log.avsc
index 740c124..740c124 100644
--- a/galaxy-data-engine/schema/druid/security_event_hits_log.avsc
+++ b/galaxy-query-engine/schema/druid/security_event_hits_log.avsc
diff --git a/galaxy-data-engine/schema/druid/source_country_ip_num_log.avsc b/galaxy-query-engine/schema/druid/source_country_ip_num_log.avsc
index 908fa08..908fa08 100644
--- a/galaxy-data-engine/schema/druid/source_country_ip_num_log.avsc
+++ b/galaxy-query-engine/schema/druid/source_country_ip_num_log.avsc
diff --git a/galaxy-data-engine/schema/druid/sys_storage_log.avsc b/galaxy-query-engine/schema/druid/sys_storage_log.avsc
index 1ab7b1c..1ab7b1c 100644
--- a/galaxy-data-engine/schema/druid/sys_storage_log.avsc
+++ b/galaxy-query-engine/schema/druid/sys_storage_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_domain_recommend_daily_log.avsc b/galaxy-query-engine/schema/druid/top_domain_recommend_daily_log.avsc
index 76766b5..76766b5 100644
--- a/galaxy-data-engine/schema/druid/top_domain_recommend_daily_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_domain_recommend_daily_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_external_host_log.avsc b/galaxy-query-engine/schema/druid/top_external_host_log.avsc
index 700e774..700e774 100644
--- a/galaxy-data-engine/schema/druid/top_external_host_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_external_host_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_internal_host_log.avsc b/galaxy-query-engine/schema/druid/top_internal_host_log.avsc
index 8ecf953..8ecf953 100644
--- a/galaxy-data-engine/schema/druid/top_internal_host_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_internal_host_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_urls_log.avsc b/galaxy-query-engine/schema/druid/top_urls_log.avsc
index 44b5dbd..44b5dbd 100644
--- a/galaxy-data-engine/schema/druid/top_urls_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_urls_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_user_log.avsc b/galaxy-query-engine/schema/druid/top_user_log.avsc
index 1f8dc0f..1f8dc0f 100644
--- a/galaxy-data-engine/schema/druid/top_user_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_user_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_website_domain_log.avsc b/galaxy-query-engine/schema/druid/top_website_domain_log.avsc
index b6bfc7f..b6bfc7f 100644
--- a/galaxy-data-engine/schema/druid/top_website_domain_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_website_domain_log.avsc
diff --git a/galaxy-data-engine/schema/druid/top_website_urls_daily_log.avsc b/galaxy-query-engine/schema/druid/top_website_urls_daily_log.avsc
index 5679d14..5679d14 100644
--- a/galaxy-data-engine/schema/druid/top_website_urls_daily_log.avsc
+++ b/galaxy-query-engine/schema/druid/top_website_urls_daily_log.avsc
diff --git a/galaxy-data-engine/schema/druid/traffic_metrics_log.avsc b/galaxy-query-engine/schema/druid/traffic_metrics_log.avsc
index f6df6d1..f6df6d1 100644
--- a/galaxy-data-engine/schema/druid/traffic_metrics_log.avsc
+++ b/galaxy-query-engine/schema/druid/traffic_metrics_log.avsc
diff --git a/galaxy-data-engine/schema/druid/traffic_protocol_stat_log.avsc b/galaxy-query-engine/schema/druid/traffic_protocol_stat_log.avsc
index 9eaf478..9eaf478 100644
--- a/galaxy-data-engine/schema/druid/traffic_protocol_stat_log.avsc
+++ b/galaxy-query-engine/schema/druid/traffic_protocol_stat_log.avsc
diff --git a/galaxy-data-engine/schema/druid/traffic_summary_log.avsc b/galaxy-query-engine/schema/druid/traffic_summary_log.avsc
index c50c5fe..c50c5fe 100644
--- a/galaxy-data-engine/schema/druid/traffic_summary_log.avsc
+++ b/galaxy-query-engine/schema/druid/traffic_summary_log.avsc
diff --git a/galaxy-data-engine/schema/memory-schema.json b/galaxy-query-engine/schema/memory-schema.json
index 4880e0d..4880e0d 100644
--- a/galaxy-data-engine/schema/memory-schema.json
+++ b/galaxy-query-engine/schema/memory-schema.json
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/GalaxyDataEngineApp.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyDataEngineApp.java
index 708e09e..708e09e 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/GalaxyDataEngineApp.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyDataEngineApp.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ArangoParser.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ArangoParser.java
index 4776439..4776439 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ArangoParser.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ArangoParser.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ClickHouseParser.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ClickHouseParser.java
index 43358f8..43358f8 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ClickHouseParser.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ClickHouseParser.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLParser.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLParser.java
index 9923c08..9923c08 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLParser.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLParser.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLRouter.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLRouter.java
index fb917d6..fb917d6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLRouter.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLRouter.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLValidate.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLValidate.java
index 579e8f8..579e8f8 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DSLValidate.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DSLValidate.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DruidParser.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DruidParser.java
index 4c672c1..4c672c1 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/DruidParser.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/DruidParser.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/IDGenerator.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/IDGenerator.java
index 94549e2..94549e2 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/IDGenerator.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/IDGenerator.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/IPConverter.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/IPConverter.java
index c4f2fd6..c4f2fd6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/IPConverter.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/IPConverter.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/LoggerCache.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/LoggerCache.java
index 5f6ff33..5f6ff33 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/LoggerCache.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/LoggerCache.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ReportCache.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ReportCache.java
index 4a2ef84..4a2ef84 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/ReportCache.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/ReportCache.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SchemaCache.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SchemaCache.java
index 2922929..2922929 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SchemaCache.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SchemaCache.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SpringContext.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SpringContext.java
index d0d7418..d0d7418 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SpringContext.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SpringContext.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SqlFunction.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SqlFunction.java
index fa21b7f..fa21b7f 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SqlFunction.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SqlFunction.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SysLogAspect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SysLogAspect.java
index d7f499c..d7f499c 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/SysLogAspect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/SysLogAspect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/bean/ApiQueryBean.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/bean/ApiQueryBean.java
index 97a792b..97a792b 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/bean/ApiQueryBean.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/bean/ApiQueryBean.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/bean/SqlQueryBean.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/bean/SqlQueryBean.java
index fb153eb..fb153eb 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/bean/SqlQueryBean.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/bean/SqlQueryBean.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/CalciteMemory.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/CalciteMemory.java
index 88e7f66..88e7f66 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/CalciteMemory.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/CalciteMemory.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/DateFunction.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/DateFunction.java
index ffa27b0..ffa27b0 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/DateFunction.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/DateFunction.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchema.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchema.java
index c073304..c073304 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchema.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchema.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchemaFactory.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchemaFactory.java
index b19d88e..b19d88e 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchemaFactory.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemorySchemaFactory.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemoryTable.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemoryTable.java
index 6ff7463..6ff7463 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/InMemoryTable.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/InMemoryTable.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/storage/DataTypeMapping.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/storage/DataTypeMapping.java
index cad66f0..cad66f0 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/storage/DataTypeMapping.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/storage/DataTypeMapping.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/storage/Storage.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/storage/Storage.java
index 79f8b9f..79f8b9f 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/calcite/storage/Storage.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/calcite/storage/Storage.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/ArangoConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/ArangoConfig.java
index 3756f11..3756f11 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/ArangoConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/ArangoConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/ClickHouseConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/ClickHouseConfig.java
index 83429f0..83429f0 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/ClickHouseConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/ClickHouseConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/DruidConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/DruidConfig.java
index 63fa087..63fa087 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/DruidConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/DruidConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/EngineConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/EngineConfig.java
index f615aa6..f615aa6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/EngineConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/EngineConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/HbaseConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/HbaseConfig.java
index b3bf735..b3bf735 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/HbaseConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/HbaseConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/HttpConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/HttpConfig.java
index 29d2ac7..29d2ac7 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/HttpConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/HttpConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/XxlJobConfig.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/XxlJobConfig.java
index 5688d5f..5688d5f 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/config/XxlJobConfig.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/config/XxlJobConfig.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/HttpConfiguration.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/HttpConfiguration.java
index 29b10a6..29b10a6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/HttpConfiguration.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/HttpConfiguration.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectAuthorProperties.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectAuthorProperties.java
index 7b1ad67..7b1ad67 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectAuthorProperties.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectAuthorProperties.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectProperties.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectProperties.java
index 8ab3250..8ab3250 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectProperties.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/configuration/ProjectProperties.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractDataSourceDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractDataSourceDialect.java
index b4e694b..b4e694b 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractDataSourceDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractDataSourceDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractEngineDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractEngineDialect.java
index 7b94b49..7b94b49 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractEngineDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/AbstractEngineDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/ClickHouseDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/ClickHouseDialect.java
index 8cf17d6..8cf17d6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/ClickHouseDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/ClickHouseDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/Dialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/Dialect.java
index e254d51..e254d51 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/Dialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/Dialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/DruidDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/DruidDialect.java
index cad27fa..cad27fa 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/DruidDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/DruidDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/FederationDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/FederationDialect.java
index 648ca67..648ca67 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/FederationDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/FederationDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/HbaseDialect.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/HbaseDialect.java
index e0b5ff0..e0b5ff0 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/dialect/HbaseDialect.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/dialect/HbaseDialect.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamFilter.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamFilter.java
index 26f02c5..26f02c5 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamFilter.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamFilter.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamWrapper.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamWrapper.java
index 779364a..779364a 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamWrapper.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/filter/RequestParamWrapper.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/BaseQueryProvider.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/BaseQueryProvider.java
index 9973b75..9973b75 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/BaseQueryProvider.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/BaseQueryProvider.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/FqdnProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/FqdnProviderImpl.java
index a0801b7..a0801b7 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/FqdnProviderImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/FqdnProviderImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/IpProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/IpProviderImpl.java
index 9fedc02..9fedc02 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/IpProviderImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/IpProviderImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/QueryProvider.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/QueryProvider.java
index 84dad2e..84dad2e 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/QueryProvider.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/QueryProvider.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/SubscriberIdProviderImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/SubscriberIdProviderImpl.java
index 4fb8b51..4fb8b51 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/strategy/SubscriberIdProviderImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/strategy/SubscriberIdProviderImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_CITY.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_CITY.java
index 81efda8..81efda8 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_CITY.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_CITY.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_COUNTRY.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_COUNTRY.java
index b725269..b725269 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_COUNTRY.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_COUNTRY.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_GEO.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_GEO.java
index 66921b6..66921b6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_GEO.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/IP_TO_GEO.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/TIME_FLOOR_WITH_FILL.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/TIME_FLOOR_WITH_FILL.java
index 7e2a839..7e2a839 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/TIME_FLOOR_WITH_FILL.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/TIME_FLOOR_WITH_FILL.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/UDF.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/UDF.java
index 0317c30..0317c30 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/UDF.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/UDF.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/UDFElements.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/UDFElements.java
index 3a9e8f1..3a9e8f1 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/component/udf/UDFElements.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/component/udf/UDFElements.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/DslQueryController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/DslQueryController.java
index 09b7333..09b7333 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/DslQueryController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/DslQueryController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/GlobalExceptionHandler.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/GlobalExceptionHandler.java
index 568ebc2..568ebc2 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/GlobalExceptionHandler.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/GlobalExceptionHandler.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/KnowledgeController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/KnowledgeController.java
index 4fc5130..4fc5130 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/KnowledgeController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/KnowledgeController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/MetadataController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/MetadataController.java
index 9489d75..9489d75 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/MetadataController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/MetadataController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/NetworkController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/NetworkController.java
index c0cef48..c0cef48 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/NetworkController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/NetworkController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/SqlQueryController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/SqlQueryController.java
index 6ff20d1..6ff20d1 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/SqlQueryController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/SqlQueryController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/SystemController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/SystemController.java
index b41975e..b41975e 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/SystemController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/SystemController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
index 88b5633..88b5633 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/ArangoEngineService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/ArangoEngineService.java
index 4dc29f9..4dc29f9 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/ArangoEngineService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/ArangoEngineService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/AuthorizeService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/AuthorizeService.java
index d293b1b..d293b1b 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/AuthorizeService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/AuthorizeService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/ClickHouseEngineService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/ClickHouseEngineService.java
index d82cca0..d82cca0 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/ClickHouseEngineService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/ClickHouseEngineService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/CommonEngineService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/CommonEngineService.java
index 215ba4d..215ba4d 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/CommonEngineService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/CommonEngineService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/DruidEngineService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/DruidEngineService.java
index d4ce603..d4ce603 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/DruidEngineService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/DruidEngineService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
index a6e899d..a6e899d 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/HttpClientManager.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/HttpClientManager.java
index 9cedf97..9cedf97 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/HttpClientManager.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/HttpClientManager.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/HttpClientService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/HttpClientService.java
index 73568f6..73568f6 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/HttpClientService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/HttpClientService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/KnowledgeService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/KnowledgeService.java
index 2b61894..2b61894 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/KnowledgeService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/KnowledgeService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/MetadataService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/MetadataService.java
index 517ded9..517ded9 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/MetadataService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/MetadataService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/NetworkService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/NetworkService.java
index eacff41..eacff41 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/NetworkService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/NetworkService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/SqlEngineService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/SqlEngineService.java
index f455cac..f455cac 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/SqlEngineService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/SqlEngineService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/SystemService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/SystemService.java
index 570ad68..570ad68 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/SystemService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/SystemService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java
index 81a5cba..81a5cba 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/ArangoEngineServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/ArangoEngineServiceImpl.java
index c17508d..c17508d 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/ArangoEngineServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/ArangoEngineServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/AuthorizeServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/AuthorizeServiceImpl.java
index f94a12f..f94a12f 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/AuthorizeServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/AuthorizeServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/ClickHouseEngineServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/ClickHouseEngineServiceImpl.java
index 1c0db2e..1c0db2e 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/ClickHouseEngineServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/ClickHouseEngineServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/DruidEngineServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/DruidEngineServiceImpl.java
index f065a45..f065a45 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/DruidEngineServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/DruidEngineServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/EngineExecuteServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/EngineExecuteServiceImpl.java
index 31c877c..31c877c 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/EngineExecuteServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/EngineExecuteServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/MetadataServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/MetadataServiceImpl.java
index 36517dd..36517dd 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/MetadataServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/MetadataServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/NetworkServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/NetworkServiceImpl.java
index a14c850..a14c850 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/NetworkServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/NetworkServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/SqlEngineServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/SqlEngineServiceImpl.java
index b0abed9..b0abed9 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/SqlEngineServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/SqlEngineServiceImpl.java
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/SystemServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/SystemServiceImpl.java
index 7c11d58..7c11d58 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/SystemServiceImpl.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/impl/SystemServiceImpl.java
diff --git a/galaxy-data-engine/src/main/resources/banner.txt b/galaxy-query-engine/src/main/resources/banner.txt
index c94616e..c94616e 100644
--- a/galaxy-data-engine/src/main/resources/banner.txt
+++ b/galaxy-query-engine/src/main/resources/banner.txt
diff --git a/galaxy-data-engine/src/main/resources/validate-dsl.json b/galaxy-query-engine/src/main/resources/validate-dsl.json
index fef7e25..fef7e25 100644
--- a/galaxy-data-engine/src/main/resources/validate-dsl.json
+++ b/galaxy-query-engine/src/main/resources/validate-dsl.json
diff --git a/galaxy-report-service/pom.xml b/galaxy-report-service/pom.xml
new file mode 100644
index 0000000..6039111
--- /dev/null
+++ b/galaxy-report-service/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>galaxy-data-platform</artifactId>
+        <groupId>com.mesalab</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>galaxy-report-service</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/images/architecture-v2.0.jpg b/images/architecture-v2.0.jpg
new file mode 100644
index 0000000..eaf882a
--- /dev/null
+++ b/images/architecture-v2.0.jpg
diff --git a/pom.xml b/pom.xml
index 79d4883..9c391dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,16 +33,21 @@
     <modules>
         <!--公共组件-->
         <module>galaxy-common</module>
-        <!--注册中心-->
-        <module>galaxy-eureka-server</module>
         <!--查询网关-->
         <module>galaxy-gateway</module>
         <!--查询引擎-->
-        <module>galaxy-data-engine</module>
+        <module>galaxy-query-engine</module>
         <!--认证中心-->
         <module>galaxy-auth-center</module>
         <!--监控服务-->
         <module>galaxy-admin-server</module>
+        <!--业务API-->
+        <module>galaxy-business-api</module>
+        <module>galaxy-hos-service</module>
+        <module>galaxy-report-service</module>
+        <module>galaxy-job-admin</module>
+        <module>galaxy-job-executor</module>
+        <module>galaxy-job-core</module>
     </modules>
 
     <properties>
@@ -54,6 +59,7 @@
         <zdjizhi.version>1.0.4</zdjizhi.version>
         <commonsio.version>2.2</commonsio.version>
         <joda.time.version>2.6</joda.time.version>
+        <jakarta.version>3.0.0</jakarta.version>
         <jsqlparser.version>3.0</jsqlparser.version>
         <google.gson.version>2.8.6</google.gson.version>
         <json.schema.version>2.2.10</json.schema.version>
@@ -62,7 +68,7 @@
         <commons.lang3.version>3.5</commons.lang3.version>
         <calcite.core.version>1.22.0</calcite.core.version>
         <spring.cloud.version>Hoxton.SR1</spring.cloud.version>
-        <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
+        <spring.boot.version>2.0.2.RELEASE</spring.boot.version>
         <galaxy.common.version>1.0-SNAPSHOT</galaxy.common.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>