dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #195 from thingsboard/feature/TB-65

Browse Source 
TB-65: Fix spring boot configuration.
This commit is contained in:
Igor Kulikov 2017-07-03 13:41:56 +03:00 committed by GitHub
commit 5f9b9cb85d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
View File

@ -17,16 +17,14 @@
package org.thingsboard.server; package org.thingsboard.server;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.thingsboard.server.install.ThingsboardInstallService; import org.thingsboard.server.install.ThingsboardInstallService;
import java.util.Arrays; import java.util.Arrays;
@EnableAutoConfiguration @SpringBootConfiguration
@SpringBootApplication
@ComponentScan({"org.thingsboard.server.install", @ComponentScan({"org.thingsboard.server.install",
"org.thingsboard.server.service.component", "org.thingsboard.server.service.component",
"org.thingsboard.server.service.install", "org.thingsboard.server.service.install",

2
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseSchemaService.java
View File

@ -20,10 +20,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.dao.util.SqlDao;
@Service @Service
@Profile("install") @Profile("install")
@Slf4j @Slf4j
@SqlDao
public class SqlDatabaseSchemaService implements DatabaseSchemaService { public class SqlDatabaseSchemaService implements DatabaseSchemaService {
@Value("${install.data_dir}") @Value("${install.data_dir}")