dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,622 Commits 106 Branches 71 Tags
Commit Graph

481 Commits

Author SHA1 Message Date
Igor Kulikov
bf258a94a3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 11:10:21 +03:00
Andrii Shvaika
71f94358c4 Fix typos and added break statement 2020-05-07 10:49:44 +03:00
Igor Kulikov
2a7e220fc3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 16:47:29 +03:00
Andrii Shvaika
f07d7441b2 Change of the partition routing strategy 2020-05-05 16:11:10 +03:00
Igor Kulikov
3a129de654 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-04 15:01:47 +03:00
Andrii Shvaika
830d02ef6a Fix for HTTP and CoAP device activity 2020-05-04 14:00:18 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +03:00
VoBa
c0dfa4861b
[WIP] [3.0] Added OAuth2 Support (#2709) 
* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
 2020-05-04 11:51:08 +03:00
Andrew Shvayka
c1b5fd5c57
Merge pull request #2714 from thingsboard/feature/queue-consumers-refactoring 
Feature/queue consumers refactoring
 2020-05-04 10:17:46 +03:00
YevhenBondarenko
00e32ee8a3 merge with feature/queue-consumers-refactoring 2020-05-04 09:39:04 +03:00
Volodymyr Babak
8dbc550fd3 Refactoring to review. Added tenantId and customerId. Added email tenant name strategy 2020-05-04 00:21:58 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Andrii Shvaika
08ab9752fc Better logging of Rule Engine errors 2020-05-04 00:13:14 +03:00
Andrew Shvayka
e251bc5750 Improvement to deserialization and remove debug on dashboards 2020-05-02 18:12:43 +03:00
YevhenBondarenko
06c3caf082 refactored 2020-05-02 13:34:11 +03:00
Andrii Shvaika
8d5c38b743 Queue refactoring 2020-05-01 17:43:13 +03:00
YevhenBondarenko
eedb383845 AWS improvements 2020-05-01 14:15:31 +03:00
Andrii Shvaika
c7f282d393 Refactoring of the Queue Consumers 2020-05-01 12:45:06 +03:00
Andrii Shvaika
c6cf5c43ad Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 20:40:08 +03:00
Andrii Shvaika
09d8823205 Race condition fix 2020-04-30 20:38:53 +03:00
Andrii Shvaika
d866fc1503 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 18:11:56 +03:00
Andrii Shvaika
702a8b6139 Force unsubscribe from Kafka topics 2020-04-30 18:10:05 +03:00
Igor Kulikov
8b5793f203 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 15:39:00 +03:00
Andrii Shvaika
beb5d1d0ba Merge branch 'develop/2.5-js-executor' of https://github.com/YevhenBondarenko/thingsboard 2020-04-30 15:08:05 +03:00
Andrii Shvaika
5034fd6d37 Merge branch 'master' into develop/3.0 2020-04-30 11:21:34 +03:00
Andrew Shvayka
7a47cd503b Revert "Develop/2.5 js executor (#2685)" 
This reverts commit 1599b24c3a748599a84f877987f452579c997ccf.
 2020-04-30 11:19:50 +03:00
Igor Kulikov
6894b19b87 Merge with master 2020-04-30 09:46:07 +03:00
Yevhen Bondarenko
1599b24c3a
Develop/2.5 js executor (#2685) 
* moved kafka from service.js to own module

* created awsSqs, pubSub, rabbitmq js-executors

* revert RemoteJsInvokeService

* revert thingsboard.yml

* added queue settings to js-executor

* refactored queue factories

* added queue params to pubsub js-executor

* azure service bus js-executor
 2020-04-29 21:02:47 +03:00
YevhenBondarenko
43b2eedbd5 azure service bus js-executor 2020-04-29 18:27:53 +03:00
Igor Kulikov
d3cbfdce27 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-29 11:43:10 +03:00
YevhenBondarenko
cce6a44adc refactored queue factories 2020-04-29 10:14:05 +03:00
Andrii Shvaika
a38ee80e09 Refactoring of device creation using gateway 2020-04-29 10:02:00 +03:00
Andrii Shvaika
79b4411c69 Synchronization of device connect processing in gateways 2020-04-29 09:45:24 +03:00
Igor Kulikov
a4cd853a20 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-28 18:48:44 +03:00
Andrii Shvaika
eb3cc332d1 Fix gateway/device last activity time checks 2020-04-28 18:19:30 +03:00
YevhenBondarenko
6322da3d04 merge with master 2020-04-28 16:51:04 +03:00
YevhenBondarenko
0dc31fbdde created awsSqs, pubSub, rabbitmq js-executors 2020-04-28 16:13:16 +03:00
Igor Kulikov
45f3d5324e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-28 14:29:02 +03:00
bdrlamb
cb6e91277f Fix MQTT inactivity disconnects 
MQTT clients don't send PINGREQ messages if they've recently sent [UN]SUBSCRIBE/PUBLISH messages.  The MQTT server last activity timestamp is currently only updated in response to PINGREQ messages.  This causes the server to disconnect any clients that regularly send PUBLISH messages since they don't send PINGREQ. 

This change adds reportActivity calls in response to PUBLISH, SUBSCRIBE and UNSUBSCRIBE in addition to PINGREQ.
 2020-04-28 14:15:57 +03:00
Andrii Shvaika
8abb718349 Merge with develop 2020-04-28 14:09:20 +03:00
Andrii Shvaika
2728c7cd29 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-27 14:45:18 +03:00
Andrii Shvaika
86f21023fe Improved PartitionService and fixed startup order in docker-compose.yml 2020-04-27 14:44:29 +03:00
YevhenBondarenko
ba140644c7 added Azure Service Bus queue settings 2020-04-27 11:16:53 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00
Andrii Shvaika
a779839081 Fixed transport 2020-04-24 19:16:25 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Andrii Shvaika
53eb09bcb9 Improvements to tests due to new architecture 2020-04-21 22:31:25 +03:00
YevhenBondarenko
283ad27cb5 added rabbitmq queue arguments 2020-04-21 20:55:02 +03:00