集成consul注册中心

26 files changed, 284 insertions, 133 deletions

diff --git a/galaxy-admin-server/config/application.properties b/galaxy-admin-server/config/application.properties
deleted file mode 100644
index f0827a7..0000000
--- a/galaxy-admin-server/config/application.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#application config
-server.port=8800
-spring.application.name=galaxy-admin-server
-#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-admin-server/config/application.yml b/galaxy-admin-server/config/application.yml
new file mode 100644
index 0000000..d9c2fa6
--- /dev/null
+++ b/galaxy-admin-server/config/application.yml
@@ -0,0 +1,31 @@
+## application config
+server:
+  port: 8800
+spring:
+  application:
+    name: galaxy-admin-server
+  security:
+    user:
+      name: admin
+      password: admin
+  cloud:
+    consul:
+      host: 192.168.40.152
+      port: 8500
+      discovery:
+        service-name: ${spring.application.name}
+        prefer-ip-address: true
+        health-check-path: /actuator/health
+        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+## management config
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+## log file path config
+logging:
+  config: classpath:logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-admin-server/pom.xml b/galaxy-admin-server/pom.xml
index e800ddb..4b593ea 100644
--- a/galaxy-admin-server/pom.xml
+++ b/galaxy-admin-server/pom.xml
@@ -26,6 +26,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/galaxy-admin-server/src/main/java/com/mesalab/admin/GalaxyAdminServer.java b/galaxy-admin-server/src/main/java/com/mesalab/admin/GalaxyAdminServer.java
index b2705c8..595d374 100644
--- a/galaxy-admin-server/src/main/java/com/mesalab/admin/GalaxyAdminServer.java
+++ b/galaxy-admin-server/src/main/java/com/mesalab/admin/GalaxyAdminServer.java
@@ -2,11 +2,11 @@ package com.mesalab.admin;
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
 @EnableAdminServer
-@SpringCloudApplication
+@SpringBootApplication
 public class GalaxyAdminServer {
 
     public static void main(String[] args) {
diff --git a/galaxy-auth-center/config/application.properties b/galaxy-auth-center/config/application.properties
deleted file mode 100644
index 18b9d4e..0000000
--- a/galaxy-auth-center/config/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#application config
-server.port=8801
-spring.application.name=galaxy-auth-center
-#management config
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-#log file path config
-logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-auth-center/config/application.yml b/galaxy-auth-center/config/application.yml
new file mode 100644
index 0000000..21a8e0c
--- /dev/null
+++ b/galaxy-auth-center/config/application.yml
@@ -0,0 +1,27 @@
+## application config
+server:
+  port: 8801
+spring:
+  application:
+    name: galaxy-auth-center
+  cloud:
+    consul:
+      host: 192.168.40.152
+      port: 8500
+      discovery:
+        service-name: ${spring.application.name}
+        prefer-ip-address: true
+        health-check-path: /actuator/health
+        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+## management config
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+## log file path config
+logging:
+  config: classpath:logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-auth-center/pom.xml b/galaxy-auth-center/pom.xml
index c7622a3..70226a6 100644
--- a/galaxy-auth-center/pom.xml
+++ b/galaxy-auth-center/pom.xml
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -30,6 +31,10 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
+        <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
@@ -57,7 +62,7 @@
                 </executions>
                 <configuration>
                     <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.mesalab.auth.GalaxyAuthCenterApp</mainClass>
+                    <mainClass>com.mesalab.authcenter.GalaxyAuthCenter</mainClass>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/galaxy-auth-center/src/main/java/com/mesalab/authcenter/GalaxyAuthCenter.java b/galaxy-auth-center/src/main/java/com/mesalab/authcenter/GalaxyAuthCenter.java
new file mode 100644
index 0000000..214bc8f
--- /dev/null
+++ b/galaxy-auth-center/src/main/java/com/mesalab/authcenter/GalaxyAuthCenter.java
@@ -0,0 +1,15 @@
+package com.mesalab.authcenter;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@EnableDiscoveryClient
+@SpringBootApplication
+public class GalaxyAuthCenter {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GalaxyAuthCenter.class);
+    }
+
+}
diff --git a/galaxy-business-api/config/application.properties b/galaxy-business-api/config/application.properties
deleted file mode 100644
index 8858a8f..0000000
--- a/galaxy-business-api/config/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#application config
-server.port=8802
-spring.application.name=galaxy-business-api
-#management config
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-#log file path config
-logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-business-api/config/application.yml b/galaxy-business-api/config/application.yml
new file mode 100644
index 0000000..c5e6951
--- /dev/null
+++ b/galaxy-business-api/config/application.yml
@@ -0,0 +1,27 @@
+## application config
+server:
+  port: 8802
+spring:
+  application:
+    name: galaxy-business-api
+  cloud:
+    consul:
+      host: 192.168.40.152
+      port: 8500
+      discovery:
+        service-name: ${spring.application.name}
+        prefer-ip-address: true
+        health-check-path: /actuator/health
+        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+## management config
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+## log file path config
+logging:
+  config: classpath:logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-business-api/pom.xml b/galaxy-business-api/pom.xml
index ed2f4a4..8892a92 100644
--- a/galaxy-business-api/pom.xml
+++ b/galaxy-business-api/pom.xml
@@ -12,7 +12,41 @@
     <artifactId>galaxy-business-api</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <finalName>galaxy-business-api</finalName>
     </build>
+
 </project>
\ No newline at end of file
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/GalaxyBusinessApi.java b/galaxy-business-api/src/main/java/com/mesalab/api/GalaxyBusinessApi.java
new file mode 100644
index 0000000..0954ddb
--- /dev/null
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/GalaxyBusinessApi.java
@@ -0,0 +1,15 @@
+package com.mesalab.api;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@EnableDiscoveryClient
+@SpringBootApplication
+public class GalaxyBusinessApi {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GalaxyBusinessApi.class);
+    }
+
+}
diff --git a/galaxy-gateway/config/application.properties b/galaxy-gateway/config/application.properties
deleted file mode 100644
index af1b10c..0000000
--- a/galaxy-gateway/config/application.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#application config
-server.port=9999
-spring.application.name=galaxy-gateway
-#spring cloud eureka config
-eureka.instance.prefer-ip-address=true
-eureka.client.registry-fetch-interval-seconds=5
-eureka.instance.lease-renewal-interval-in-seconds=10
-eureka.instance.health-check-url-path=/actuator/health
-eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-#management config
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-#gateway config
-spring.cloud.gateway.discovery.locator.enabled=true
-spring.cloud.gateway.discovery.locator.lower-case-service-id=true
-#log file path config
-logging.config=./config/logback-spring.xml
-#system-config-route
-spring.cloud.gateway.routes[0].id=system-config-route
-spring.cloud.gateway.routes[0].uri=lb://galaxy-data-engine
-spring.cloud.gateway.routes[0].predicates[0]=Path=/sys/**
-#metadata-route
-spring.cloud.gateway.routes[1].id=metadata-route
-spring.cloud.gateway.routes[1].uri=lb://galaxy-data-engine
-spring.cloud.gateway.routes[1].predicates[0]=Path=/metadata/**
-#sql-query-route
-spring.cloud.gateway.routes[2].id=sql-query-route
-spring.cloud.gateway.routes[2].uri=lb://galaxy-data-engine
-spring.cloud.gateway.routes[2].predicates[0]=Query=query
-#network-route
-spring.cloud.gateway.routes[3].id=network-route
-spring.cloud.gateway.routes[3].uri=lb://galaxy-data-engine
-spring.cloud.gateway.routes[3].predicates[0]=Query=protocol
-#knowledge-route
-spring.cloud.gateway.routes[4].id=knowledge-route
-spring.cloud.gateway.routes[4].uri=lb://galaxy-data-engine
-spring.cloud.gateway.routes[4].predicates[0]=Path=/knowledge/**
\ No newline at end of file
diff --git a/galaxy-gateway/config/application.yml b/galaxy-gateway/config/application.yml
new file mode 100644
index 0000000..e5d6cd9
--- /dev/null
+++ b/galaxy-gateway/config/application.yml
@@ -0,0 +1,27 @@
+## application config
+server:
+  port: 8803
+spring:
+  application:
+    name: galaxy-gateway
+  cloud:
+    consul:
+      host: 192.168.40.152
+      port: 8500
+      discovery:
+        service-name: ${spring.application.name}
+        prefer-ip-address: true
+        health-check-path: /actuator/health
+        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+## management config
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+## log file path config
+logging:
+  config: classpath:logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-gateway/pom.xml b/galaxy-gateway/pom.xml
index a7d8781..f59e4f9 100644
--- a/galaxy-gateway/pom.xml
+++ b/galaxy-gateway/pom.xml
@@ -14,9 +14,22 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -36,7 +49,7 @@
                 </executions>
                 <configuration>
                     <includeSystemScope>true</includeSystemScope>
-                    <mainClass>com.mesalab.api.gateway.GalaxyGatewayApp</mainClass>
+                    <mainClass>com.mesalab.gateway.GalaxyGateway</mainClass>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/galaxy-gateway/src/main/java/com/mesalab/api/gateway/GalaxyGatewayApp.java b/galaxy-gateway/src/main/java/com/mesalab/gateway/GalaxyGateway.java
index 0f72ed3..b379a33 100644
--- a/galaxy-gateway/src/main/java/com/mesalab/api/gateway/GalaxyGatewayApp.java
+++ b/galaxy-gateway/src/main/java/com/mesalab/gateway/GalaxyGateway.java
@@ -1,13 +1,13 @@
-package com.mesalab.api.gateway;
+package com.mesalab.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class GalaxyGatewayApp {
+public class GalaxyGateway {
 
 
     public static void main(String[] args) {
-        SpringApplication.run(GalaxyGatewayApp.class);
+        SpringApplication.run(GalaxyGateway.class);
     }
 }
diff --git a/galaxy-gateway/src/main/resources/banner.txt b/galaxy-gateway/src/main/resources/banner.txt
deleted file mode 100644
index e9c1264..0000000
--- a/galaxy-gateway/src/main/resources/banner.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-${AnsiColor.BRIGHT_GREEN}
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-${AnsiColor.BRIGHT_BLUE}
-              _                                    _
-             | |                                  | |
-   __ _  __ _| | __ ___  ___   _ ______ __ _  __ _| |_ _____      ____ _ _   _
-  / _` |/ _` | |/ _` \ \/ / | | |______/ _` |/ _` | __/ _ \ \ /\ / / _` | | | |
- | (_| | (_| | | (_| |>  <| |_| |     | (_| | (_| | ||  __/\ V  V / (_| | |_| |
-  \__, |\__,_|_|\__,_/_/\_\\__, |      \__, |\__,_|\__\___| \_/\_/ \__,_|\__, |
-   __/ |                    __/ |       __/ |                             __/ |
-  |___/                    |___/       |___/                             |___/
-${AnsiColor.BRIGHT_BLUE}
-Spring Boot Version: ${spring-boot.version}
-${AnsiColor.BRIGHT_GREEN}
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-${AnsiColor.DEFAULT}
-
diff --git a/galaxy-query-engine/config/application.properties b/galaxy-query-engine/config/application.properties
deleted file mode 100644
index 014575d..0000000
--- a/galaxy-query-engine/config/application.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#application config
-server.port=8803
-spring.application.name=galaxy-query-engine
-
-#management config
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-
-#log file path config
-logging.config=classpath:logback-spring.xml
-
-#engine config
-engine.maxCacheNum=500000
-engine.defaultResultNum=300000
-
-#druid config
-druid.address=192.168.40.152:8082
-druid.dbname=druid
-druid.sqlTimeZone=Asia/Shanghai
-druid.query.url=http://${druid.address}/druid/v2/sql
-
-#clickhouse config
-clickhouse.address=192.168.44.12:8123
-clickhouse.query.url=http://${clickhouse.address}
-clickhouse.dbname=tsg_galaxy_v3
-clickhouse.real.time.username=tsg_query
-clickhouse.real.time.password=ceiec2018
-clickhouse.long.term.username=tsg_report
-clickhouse.long.term.password=ceiec2019
\ No newline at end of file
diff --git a/galaxy-query-engine/config/application.yml b/galaxy-query-engine/config/application.yml
new file mode 100644
index 0000000..bb3f2d8
--- /dev/null
+++ b/galaxy-query-engine/config/application.yml
@@ -0,0 +1,50 @@
+## application config
+server:
+  port: 8804
+spring:
+  application:
+    name: galaxy-query-engine
+  cloud:
+    consul:
+      host: 192.168.40.152
+      port: 8500
+      discovery:
+        service-name: ${spring.application.name}
+        prefer-ip-address: true
+        health-check-path: /actuator/health
+        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+## management config
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+## log file path config
+logging:
+  config: classpath:logback-spring.xml
+## engine config
+engine:
+  maxCacheNum: 1048576
+  defaultResultNum: 100000
+## druid config
+druid:
+  dbname: druid
+  socketTimeOut: 60000
+  address: 192.168.40.152:8082
+  query: http://${druid.address}/druid/v2/sql
+## clickhouse config
+clickhouse:
+  address: 192.168.44.12:8123
+  dbname: tsg_galaxy_v3
+  query: http://${clickhouse.address}
+  realTimeAccount:
+    username: tsg_query
+    password: ceiec2018
+    socketTimeOut: 60000
+  longTermAccount:
+    username: tsg_report
+    password: ceiec2019
+    socketTimeOut: 21700000
\ No newline at end of file
diff --git a/galaxy-query-engine/pom.xml b/galaxy-query-engine/pom.xml
index b7d8c32..c293685 100644
--- a/galaxy-query-engine/pom.xml
+++ b/galaxy-query-engine/pom.xml
@@ -16,6 +16,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -26,6 +27,10 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
+        <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyQueryEngine.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyQueryEngine.java
index ade63bd..8f80f11 100644
--- a/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyQueryEngine.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/GalaxyQueryEngine.java
@@ -2,7 +2,9 @@ package com.mesalab.engine;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+@EnableDiscoveryClient
 @SpringBootApplication
 public class GalaxyQueryEngine {
 
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
index ae87d2c..2bd8ab0 100644
--- a/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
+++ b/galaxy-query-engine/src/main/java/com/mesalab/engine/service/EngineExecuteService.java
@@ -17,7 +17,7 @@ public interface EngineExecuteService {
      * @Date: 2020/7/22 16:16
      * @return: java.lang.String
      **/
-    String executeDruidSql(String sql) throws BusinessException;
+    String executeDruidQuery(String sql) throws BusinessException;
 
     /**
      * @param sql:
@@ -26,6 +26,6 @@ public interface EngineExecuteService {
      * @Date: 2020/7/22 16:16
      * @return: java.lang.String
      **/
-    String executeClickHouseSql(String sql) throws BusinessException;
+    String executeClickHouseQuery(String sql) throws BusinessException;
 
 }
diff --git a/galaxy-query-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 25e6106..17add79 100644
--- a/galaxy-query-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
@@ -42,7 +42,7 @@ public class ClickHouseEngineServiceImpl implements ClickHouseEngineService {
     @Override
     public BaseResult dslQuery(DSLObject dslObject) throws BusinessException {
         String executeSql = clickHouseDSLParser.allQuery(dslObject);
-        String jsonResult = executeService.executeClickHouseSql(executeSql);
+        String jsonResult = executeService.executeClickHouseQuery(executeSql);
         return assemble(jsonResult);
     }
 
@@ -56,7 +56,7 @@ public class ClickHouseEngineServiceImpl implements ClickHouseEngineService {
     @Override
     public BaseResult tablesQuery(DSLObject dslObject) throws BusinessException {
         String executeSql = ClickHouseParser.TABLES_QUERY;
-        String jsonResult = executeService.executeClickHouseSql(executeSql);
+        String jsonResult = executeService.executeClickHouseQuery(executeSql);
         return assemble(jsonResult);
     }
 
@@ -71,7 +71,7 @@ public class ClickHouseEngineServiceImpl implements ClickHouseEngineService {
     public BaseResult schemaQuery(DSLObject dslObject) throws BusinessException {
         String dataSource = dslObject.getDataSource();
         String executeSql = MessageFormat.format(ClickHouseParser.SCHEAM_QUERY, dataSource);
-        return assemble(executeService.executeClickHouseSql(executeSql));
+        return assemble(executeService.executeClickHouseQuery(executeSql));
     }
 
     /**
diff --git a/galaxy-query-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 d9e7df0..f810bfd 100644
--- a/galaxy-query-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
@@ -40,7 +40,7 @@ public class DruidEngineServiceImpl implements DruidEngineService {
     @Override
     public BaseResult dslQuery(DSLObject dslObject) throws BusinessException {
         String executeSql = druidDSLParse.allQuery(dslObject);
-        String jsonResult = executeService.executeDruidSql(executeSql);
+        String jsonResult = executeService.executeDruidQuery(executeSql);
         List<Map<String, Object>> results = new Gson().fromJson(jsonResult, List.class);
         dataFormat(results);
         return BaseResultUtil.success(results);
@@ -57,7 +57,7 @@ public class DruidEngineServiceImpl implements DruidEngineService {
     @Override
     public BaseResult tablesQuery(DSLObject dslObject) throws BusinessException {
         String executeSql = DruidParser.TABLES_QUERY;
-        String jsonResult = executeService.executeDruidSql(executeSql);
+        String jsonResult = executeService.executeDruidQuery(executeSql);
         List<Map<String, Object>> results = new Gson().fromJson(jsonResult, List.class);
         return BaseResultUtil.success(results);
     }
@@ -73,7 +73,7 @@ public class DruidEngineServiceImpl implements DruidEngineService {
     public BaseResult schemaQuery(DSLObject dslObject) throws BusinessException {
         String dataSource = dslObject.getDataSource();
         String executeSql = MessageFormat.format(DruidParser.SCHEAM_QUERY, dataSource);
-        String jsonResult = executeService.executeDruidSql(executeSql);
+        String jsonResult = executeService.executeDruidQuery(executeSql);
         List<Map<String, Object>> results = new Gson().fromJson(jsonResult, List.class);
         return BaseResultUtil.success(results);
     }
diff --git a/galaxy-query-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 67627b8..f151449 100644
--- a/galaxy-query-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
@@ -26,19 +26,19 @@ public class EngineExecuteServiceImpl implements EngineExecuteService {
 
     final Header JSON_HEADER = new BasicHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
 
-    @Value("${druid.query.url}")
+    @Value("${druid.query}")
     String druidQueryUrl;
-    @Value("${clickhouse.query.url}")
+    @Value("${clickhouse.query}")
     String clickHouseQueryUrl;
     @Value("${clickhouse.dbname}")
     String clickHouseDbName;
-    @Value("${clickhouse.real.time.username}")
+    @Value("${clickhouse.realTimeAccount.username}")
     String ckRealTimeUsername;
-    @Value("${clickhouse.real.time.password}")
+    @Value("${clickhouse.realTimeAccount.password}")
     String ckRealTimePassword;
 
     @Override
-    public String executeDruidSql(String sql) throws BusinessException {
+    public String executeDruidQuery(String sql) throws BusinessException {
         Map<String, String> queryParams = new HashMap<>();
         queryParams.put("query", sql);
         String jsonParam = new Gson().toJson(queryParams);
@@ -46,7 +46,7 @@ public class EngineExecuteServiceImpl implements EngineExecuteService {
     }
 
     @Override
-    public String executeClickHouseSql(String sql) throws BusinessException {
+    public String executeClickHouseQuery(String sql) throws BusinessException {
         String url = clickHouseQueryUrl
                 .concat("/?user=")
                 .concat(ckRealTimeUsername)
diff --git a/pom.xml b/pom.xml
index 8f32874..7e68f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <commons.lang3.version>3.5</commons.lang3.version>
         <calcite.core.version>1.22.0</calcite.core.version>
-        <spring.cloud.version>Finchley.RC2</spring.cloud.version>
+        <spring.cloud.version>Finchley.RELEASE</spring.cloud.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>
@@ -90,6 +90,13 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring.cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>