简柏林 / thingskit · Commits

Commit 50238a689e0051e6d98283e477c8b0ff2b31edda

Authored by Andrew Shvayka
2 parents 37f82f3b b643b827

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

Inline Side-by-side
Showing 26 changed files with 56 additions and 43 deletions
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -413,20 +413,6 @@ INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_ @@ -413,20 +413,6 @@ INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_
413 VALUES ( 413 VALUES (
414 minTimeuuid ( '2016-11-01 01:02:11+0000' ), 414 minTimeuuid ( '2016-11-01 01:02:11+0000' ),
415 minTimeuuid ( '2016-11-01 01:02:01+0000' ), 415 minTimeuuid ( '2016-11-01 01:02:01+0000' ),
416 - 'Demo Time RPC Rule',  
417 - 'time',  
418 - 'ACTIVE',  
419 - 'demo time rpc rule',  
420 - 0,  
421 - '[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',  
422 - null,  
423 - '{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}'  
424 -);  
425 -  
426 -INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)  
427 -VALUES (  
428 - minTimeuuid ( '2016-11-01 01:02:12+0000' ),  
429 - minTimeuuid ( '2016-11-01 01:02:01+0000' ),  
430 'Demo Messaging RPC Rule', 416 'Demo Messaging RPC Rule',
431 'messaging', 417 'messaging',
432 'ACTIVE', 418 'ACTIVE',
@@ -18,7 +18,7 @@ version: '2' @@ -18,7 +18,7 @@ version: '2'
18 18
19 services: 19 services:
20 thingsboard: 20 thingsboard:
21 - image: "thingsboard/application:0.1" 21 + image: "thingsboard/application:1.0"
22 ports: 22 ports:
23 - "8080:8080" 23 - "8080:8080"
24 - "1883:1883" 24 - "1883:1883"
@@ -31,15 +31,11 @@ services: @@ -31,15 +31,11 @@ services:
31 - thingsboard.env 31 - thingsboard.env
32 entrypoint: ./run_thingsboard.sh 32 entrypoint: ./run_thingsboard.sh
33 thingsboard-db-schema: 33 thingsboard-db-schema:
34 - build: thingsboard-db-schema 34 + image: "thingsboard/thingsboard-db-schema:1.0"
35 links: 35 links:
36 - cassandra:db 36 - cassandra:db
37 env_file: 37 env_file:
38 - thingsboard-db-schema.env 38 - thingsboard-db-schema.env
39 - volumes:  
40 - - "../dao/src/main/resources/schema.cql:/root/schema.cql"  
41 - - "../dao/src/main/resources/demo-data.cql:/root/demo-data.cql"  
42 - - "../dao/src/main/resources/system-data.cql:/root/system-data.cql"  
43 entrypoint: ./install_schema.sh 39 entrypoint: ./install_schema.sh
44 cassandra: 40 cassandra:
45 image: "cassandra:3.9" 41 image: "cassandra:3.9"
@@ -23,4 +23,8 @@ RUN apt-get update \ @@ -23,4 +23,8 @@ RUN apt-get update \
23 23
24 RUN chmod +x /root/install_schema.sh 24 RUN chmod +x /root/install_schema.sh
25 25
  26 +ADD schema.cql /root/schema.cql
  27 +ADD demo-data.cql /root/demo-data.cql
  28 +ADD system-data.cql /root/system-data.cql
  29 +
26 WORKDIR /root 30 WORKDIR /root
  1 +#!/bin/bash
  2 +#
  3 +# Copyright © 2016 The Thingsboard Authors
  4 +#
  5 +# Licensed under the Apache License, Version 2.0 (the "License");
  6 +# you may not use this file except in compliance with the License.
  7 +# You may obtain a copy of the License at
  8 +#
  9 +# http://www.apache.org/licenses/LICENSE-2.0
  10 +#
  11 +# Unless required by applicable law or agreed to in writing, software
  12 +# distributed under the License is distributed on an "AS IS" BASIS,
  13 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  14 +# See the License for the specific language governing permissions and
  15 +# limitations under the License.
  16 +#
  17 +
  18 +
  19 +cp ../../dao/src/main/resources/schema.cql schema.cql
  20 +cp ../../dao/src/main/resources/demo-data.cql demo-data.cql
  21 +cp ../../dao/src/main/resources/system-data.cql system-data.cql
  22 +
  23 +docker build -t thingsboard/thingsboard-db-schema:1.0 .
  24 +
  25 +docker login
  26 +
  27 +docker push thingsboard/thingsboard-db-schema:1.0
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 18
19 cp ../../application/target/thingsboard.deb thingsboard.deb 19 cp ../../application/target/thingsboard.deb thingsboard.deb
20 20
21 -docker build -t thingsboard/application:0.1 . 21 +docker build -t thingsboard/application:1.0 .
22 22
23 docker login 23 docker login
24 24
25 -docker push thingsboard/application:0.1  
  25 +docker push thingsboard/application:1.0
@@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..." @@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..."
40 service thingsboard start 40 service thingsboard start
41 41
42 # Wait until log file is created 42 # Wait until log file is created
43 -sleep 3 43 +sleep 10
44 tail -f /var/log/thingsboard/thingsboard.log 44 tail -f /var/log/thingsboard/thingsboard.log
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <modelVersion>4.0.0</modelVersion> 22 <modelVersion>4.0.0</modelVersion>
23 <parent> 23 <parent>
24 <groupId>org.thingsboard</groupId> 24 <groupId>org.thingsboard</groupId>
25 - <version>0.0.1-SNAPSHOT</version> 25 + <version>1.0.0</version>
26 <artifactId>extensions</artifactId> 26 <artifactId>extensions</artifactId>
27 </parent> 27 </parent>
28 <groupId>org.thingsboard.extensions</groupId> 28 <groupId>org.thingsboard.extensions</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>extensions</artifactId> 24 <artifactId>extensions</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.extensions</groupId> 26 <groupId>org.thingsboard.extensions</groupId>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <modelVersion>4.0.0</modelVersion> 22 <modelVersion>4.0.0</modelVersion>
23 <parent> 23 <parent>
24 <groupId>org.thingsboard</groupId> 24 <groupId>org.thingsboard</groupId>
25 - <version>0.0.1-SNAPSHOT</version> 25 + <version>1.0.0</version>
26 <artifactId>extensions</artifactId> 26 <artifactId>extensions</artifactId>
27 </parent> 27 </parent>
28 <groupId>org.thingsboard.extensions</groupId> 28 <groupId>org.thingsboard.extensions</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <groupId>org.thingsboard</groupId> 21 <groupId>org.thingsboard</groupId>
22 <artifactId>thingsboard</artifactId> 22 <artifactId>thingsboard</artifactId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <packaging>pom</packaging> 24 <packaging>pom</packaging>
25 25
26 <name>Thingsboard</name> 26 <name>Thingsboard</name>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
1 { 1 {
2 "name": "thingsboard", 2 "name": "thingsboard",
3 "private": true, 3 "private": true,
4 - "version": "0.0.1", 4 + "version": "1.0.0",
5 "description": "Thingsboard UI", 5 "description": "Thingsboard UI",
6 "licenses": [ 6 "licenses": [
7 { 7 {
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>0.0.1-SNAPSHOT</version> 23 + <version>1.0.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>