Merge branch 'master' of github.com:thingsboard/thingsboard

This commit is contained in:
Andrii Shvaika 2021-07-13 18:01:16 +03:00
commit a91d23351f
6 changed files with 22 additions and 7 deletions

View File

@ -9,4 +9,7 @@ METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

View File

@ -6,4 +6,7 @@ HTTP_BIND_PORT=8081
HTTP_REQUEST_TIMEOUT=60000 HTTP_REQUEST_TIMEOUT=60000
METRICS_ENABLED=true METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
CACHE_TYPE=redis
REDIS_HOST=redis

View File

@ -10,3 +10,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

View File

@ -9,4 +9,7 @@ METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

View File

@ -6,3 +6,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

View File

@ -45,10 +45,10 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.thingsboard.common.transport</groupId>--> <groupId>org.springframework.boot</groupId>
<!-- <artifactId>transport-api</artifactId>--> <artifactId>spring-boot-starter-web</artifactId>
<!-- </dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.thingsboard.common.transport</groupId> <groupId>org.thingsboard.common.transport</groupId>
<artifactId>lwm2m</artifactId> <artifactId>lwm2m</artifactId>