Fixed js builds
Disabled autoconfiguration for hibernate
This commit is contained in:
parent
6a62b64953
commit
7d514d8cad
@ -18,12 +18,15 @@ package org.thingsboard.server;
|
|||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
import springfox.documentation.swagger2.annotations.EnableSwagger2;
|
import springfox.documentation.swagger2.annotations.EnableSwagger2;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@EnableSwagger2
|
@EnableSwagger2
|
||||||
@ComponentScan({"org.thingsboard.server"})
|
@ComponentScan({"org.thingsboard.server"})
|
||||||
|
|||||||
@ -227,7 +227,20 @@ spring.mvc.cors:
|
|||||||
# SQL DAO Configuration
|
# SQL DAO Configuration
|
||||||
sql:
|
sql:
|
||||||
enabled: "${SQL_ENABLED:false}"
|
enabled: "${SQL_ENABLED:false}"
|
||||||
|
|
||||||
|
spring:
|
||||||
|
data:
|
||||||
|
jpa:
|
||||||
|
repositories:
|
||||||
|
enabled: "false"
|
||||||
|
jpa:
|
||||||
|
show-sql: "false"
|
||||||
|
generate-ddl: "false"
|
||||||
|
database-platform: "org.hibernate.dialect.PostgreSQLDialect"
|
||||||
|
hibernate:
|
||||||
|
ddl-auto: "none"
|
||||||
datasource:
|
datasource:
|
||||||
url: "${SQL_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
|
driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
|
||||||
username: "${SQL_DATASOURCE_USERNAME:postgres}"
|
url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
|
||||||
password: "${SQL_DATASOURCE_PASSWORD:postgres}"
|
username: "${SPRING_DATASOURCE_USERNAME:postgres}"
|
||||||
|
password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
|
||||||
@ -63,17 +63,6 @@ function CustomerService($http, $q, types) {
|
|||||||
return deferred.promise;
|
return deferred.promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCustomerTitle(customerId) {
|
|
||||||
var deferred = $q.defer();
|
|
||||||
var url = '/api/customer/' + customerId + '/title';
|
|
||||||
$http.get(url, null).then(function success(response) {
|
|
||||||
deferred.resolve(response.data);
|
|
||||||
}, function fail(response) {
|
|
||||||
deferred.reject(response.data);
|
|
||||||
});
|
|
||||||
return deferred.promise;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getShortCustomerInfo(customerId) {
|
function getShortCustomerInfo(customerId) {
|
||||||
var deferred = $q.defer();
|
var deferred = $q.defer();
|
||||||
var url = '/api/customer/' + customerId + '/shortInfo';
|
var url = '/api/customer/' + customerId + '/shortInfo';
|
||||||
|
|||||||
@ -202,10 +202,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t
|
|||||||
onResetTimewindow: function() {
|
onResetTimewindow: function() {
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
if (vm.originalDashboardTimewindow) {
|
if (vm.originalDashboardTimewindow) {
|
||||||
$timeout(function() {
|
|
||||||
vm.dashboardTimewindow = angular.copy(vm.originalDashboardTimewindow);
|
vm.dashboardTimewindow = angular.copy(vm.originalDashboardTimewindow);
|
||||||
vm.originalDashboardTimewindow = null;
|
vm.originalDashboardTimewindow = null;
|
||||||
}, 0);
|
|
||||||
}
|
}
|
||||||
}, 0);
|
}, 0);
|
||||||
},
|
},
|
||||||
|
|||||||
@ -561,7 +561,6 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var dataIndex = 0;
|
|
||||||
//TODO: widgets visibility
|
//TODO: widgets visibility
|
||||||
/*function updateVisibility(forceRedraw) {
|
/*function updateVisibility(forceRedraw) {
|
||||||
if (visibleRect) {
|
if (visibleRect) {
|
||||||
|
|||||||
@ -34,12 +34,6 @@ export default class TbFlot {
|
|||||||
this.chartType = chartType || 'line';
|
this.chartType = chartType || 'line';
|
||||||
var settings = ctx.settings;
|
var settings = ctx.settings;
|
||||||
|
|
||||||
if (this.chartType === 'line' && settings.smoothLines && !series.points.show) {
|
|
||||||
series.curvedLines = {
|
|
||||||
apply: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.tooltip = $('#flot-series-tooltip');
|
ctx.tooltip = $('#flot-series-tooltip');
|
||||||
if (ctx.tooltip.length === 0) {
|
if (ctx.tooltip.length === 0) {
|
||||||
ctx.tooltip = $("<div id='flot-series-tooltip' class='flot-mouse-value'></div>");
|
ctx.tooltip = $("<div id='flot-series-tooltip' class='flot-mouse-value'></div>");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user