Merge branch 'master' of github.com:thingsboard/thingsboard
This commit is contained in:
commit
a91d23351f
@ -9,4 +9,7 @@ METRICS_ENABLED=true
|
||||
METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
WEB_APPLICATION_ENABLE=true
|
||||
WEB_APPLICATION_TYPE=servlet
|
||||
HTTP_BIND_PORT=8081
|
||||
HTTP_BIND_PORT=8081
|
||||
|
||||
CACHE_TYPE=redis
|
||||
REDIS_HOST=redis
|
||||
|
||||
@ -6,4 +6,7 @@ HTTP_BIND_PORT=8081
|
||||
HTTP_REQUEST_TIMEOUT=60000
|
||||
|
||||
METRICS_ENABLED=true
|
||||
METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
|
||||
CACHE_TYPE=redis
|
||||
REDIS_HOST=redis
|
||||
|
||||
@ -10,3 +10,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
WEB_APPLICATION_ENABLE=true
|
||||
WEB_APPLICATION_TYPE=servlet
|
||||
HTTP_BIND_PORT=8081
|
||||
|
||||
CACHE_TYPE=redis
|
||||
REDIS_HOST=redis
|
||||
|
||||
@ -9,4 +9,7 @@ METRICS_ENABLED=true
|
||||
METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
WEB_APPLICATION_ENABLE=true
|
||||
WEB_APPLICATION_TYPE=servlet
|
||||
HTTP_BIND_PORT=8081
|
||||
HTTP_BIND_PORT=8081
|
||||
|
||||
CACHE_TYPE=redis
|
||||
REDIS_HOST=redis
|
||||
|
||||
@ -6,3 +6,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
|
||||
WEB_APPLICATION_ENABLE=true
|
||||
WEB_APPLICATION_TYPE=servlet
|
||||
HTTP_BIND_PORT=8081
|
||||
|
||||
CACHE_TYPE=redis
|
||||
REDIS_HOST=redis
|
||||
|
||||
@ -45,10 +45,10 @@
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.thingsboard.common.transport</groupId>-->
|
||||
<!-- <artifactId>transport-api</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.thingsboard.common.transport</groupId>
|
||||
<artifactId>lwm2m</artifactId>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user