Commit a91d23351f6325992b1e1526d759ad678b1dd51c
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
6 changed files
with
22 additions
and
7 deletions
| @@ -9,4 +9,7 @@ METRICS_ENABLED=true | @@ -9,4 +9,7 @@ METRICS_ENABLED=true | ||
| 9 | METRICS_ENDPOINTS_EXPOSE=prometheus | 9 | METRICS_ENDPOINTS_EXPOSE=prometheus |
| 10 | WEB_APPLICATION_ENABLE=true | 10 | WEB_APPLICATION_ENABLE=true |
| 11 | WEB_APPLICATION_TYPE=servlet | 11 | WEB_APPLICATION_TYPE=servlet |
| 12 | -HTTP_BIND_PORT=8081 | ||
| 12 | +HTTP_BIND_PORT=8081 | ||
| 13 | + | ||
| 14 | +CACHE_TYPE=redis | ||
| 15 | +REDIS_HOST=redis |
| @@ -6,4 +6,7 @@ HTTP_BIND_PORT=8081 | @@ -6,4 +6,7 @@ HTTP_BIND_PORT=8081 | ||
| 6 | HTTP_REQUEST_TIMEOUT=60000 | 6 | HTTP_REQUEST_TIMEOUT=60000 |
| 7 | 7 | ||
| 8 | METRICS_ENABLED=true | 8 | METRICS_ENABLED=true |
| 9 | -METRICS_ENDPOINTS_EXPOSE=prometheus | ||
| 9 | +METRICS_ENDPOINTS_EXPOSE=prometheus | ||
| 10 | + | ||
| 11 | +CACHE_TYPE=redis | ||
| 12 | +REDIS_HOST=redis |
| @@ -10,3 +10,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus | @@ -10,3 +10,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus | ||
| 10 | WEB_APPLICATION_ENABLE=true | 10 | WEB_APPLICATION_ENABLE=true |
| 11 | WEB_APPLICATION_TYPE=servlet | 11 | WEB_APPLICATION_TYPE=servlet |
| 12 | HTTP_BIND_PORT=8081 | 12 | HTTP_BIND_PORT=8081 |
| 13 | + | ||
| 14 | +CACHE_TYPE=redis | ||
| 15 | +REDIS_HOST=redis |
| @@ -9,4 +9,7 @@ METRICS_ENABLED=true | @@ -9,4 +9,7 @@ METRICS_ENABLED=true | ||
| 9 | METRICS_ENDPOINTS_EXPOSE=prometheus | 9 | METRICS_ENDPOINTS_EXPOSE=prometheus |
| 10 | WEB_APPLICATION_ENABLE=true | 10 | WEB_APPLICATION_ENABLE=true |
| 11 | WEB_APPLICATION_TYPE=servlet | 11 | WEB_APPLICATION_TYPE=servlet |
| 12 | -HTTP_BIND_PORT=8081 | ||
| 12 | +HTTP_BIND_PORT=8081 | ||
| 13 | + | ||
| 14 | +CACHE_TYPE=redis | ||
| 15 | +REDIS_HOST=redis |
| @@ -6,3 +6,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus | @@ -6,3 +6,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus | ||
| 6 | WEB_APPLICATION_ENABLE=true | 6 | WEB_APPLICATION_ENABLE=true |
| 7 | WEB_APPLICATION_TYPE=servlet | 7 | WEB_APPLICATION_TYPE=servlet |
| 8 | HTTP_BIND_PORT=8081 | 8 | HTTP_BIND_PORT=8081 |
| 9 | + | ||
| 10 | +CACHE_TYPE=redis | ||
| 11 | +REDIS_HOST=redis |
| @@ -45,10 +45,10 @@ | @@ -45,10 +45,10 @@ | ||
| 45 | </properties> | 45 | </properties> |
| 46 | 46 | ||
| 47 | <dependencies> | 47 | <dependencies> |
| 48 | -<!-- <dependency>--> | ||
| 49 | -<!-- <groupId>org.thingsboard.common.transport</groupId>--> | ||
| 50 | -<!-- <artifactId>transport-api</artifactId>--> | ||
| 51 | -<!-- </dependency>--> | 48 | + <dependency> |
| 49 | + <groupId>org.springframework.boot</groupId> | ||
| 50 | + <artifactId>spring-boot-starter-web</artifactId> | ||
| 51 | + </dependency> | ||
| 52 | <dependency> | 52 | <dependency> |
| 53 | <groupId>org.thingsboard.common.transport</groupId> | 53 | <groupId>org.thingsboard.common.transport</groupId> |
| 54 | <artifactId>lwm2m</artifactId> | 54 | <artifactId>lwm2m</artifactId> |