Commit 5f9b9cb85dcdfa7ff4891fda2673f6683e78f917
Committed by
GitHub
Merge pull request #195 from thingsboard/feature/TB-65
TB-65: Fix spring boot configuration.
Showing
2 changed files
with
4 additions
and
4 deletions
@@ -17,16 +17,14 @@ | @@ -17,16 +17,14 @@ | ||
17 | package org.thingsboard.server; | 17 | package org.thingsboard.server; |
18 | 18 | ||
19 | import org.springframework.boot.SpringApplication; | 19 | import org.springframework.boot.SpringApplication; |
20 | -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; | ||
21 | -import org.springframework.boot.autoconfigure.SpringBootApplication; | 20 | +import org.springframework.boot.SpringBootConfiguration; |
22 | import org.springframework.context.ConfigurableApplicationContext; | 21 | import org.springframework.context.ConfigurableApplicationContext; |
23 | import org.springframework.context.annotation.ComponentScan; | 22 | import org.springframework.context.annotation.ComponentScan; |
24 | import org.thingsboard.server.install.ThingsboardInstallService; | 23 | import org.thingsboard.server.install.ThingsboardInstallService; |
25 | 24 | ||
26 | import java.util.Arrays; | 25 | import java.util.Arrays; |
27 | 26 | ||
28 | -@EnableAutoConfiguration | ||
29 | -@SpringBootApplication | 27 | +@SpringBootConfiguration |
30 | @ComponentScan({"org.thingsboard.server.install", | 28 | @ComponentScan({"org.thingsboard.server.install", |
31 | "org.thingsboard.server.service.component", | 29 | "org.thingsboard.server.service.component", |
32 | "org.thingsboard.server.service.install", | 30 | "org.thingsboard.server.service.install", |
@@ -20,10 +20,12 @@ import lombok.extern.slf4j.Slf4j; | @@ -20,10 +20,12 @@ import lombok.extern.slf4j.Slf4j; | ||
20 | import org.springframework.beans.factory.annotation.Value; | 20 | import org.springframework.beans.factory.annotation.Value; |
21 | import org.springframework.context.annotation.Profile; | 21 | import org.springframework.context.annotation.Profile; |
22 | import org.springframework.stereotype.Service; | 22 | import org.springframework.stereotype.Service; |
23 | +import org.thingsboard.server.dao.util.SqlDao; | ||
23 | 24 | ||
24 | @Service | 25 | @Service |
25 | @Profile("install") | 26 | @Profile("install") |
26 | @Slf4j | 27 | @Slf4j |
28 | +@SqlDao | ||
27 | public class SqlDatabaseSchemaService implements DatabaseSchemaService { | 29 | public class SqlDatabaseSchemaService implements DatabaseSchemaService { |
28 | 30 | ||
29 | @Value("${install.data_dir}") | 31 | @Value("${install.data_dir}") |