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

297 Commits

Author SHA1 Message Date
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
Andrii Shvaika
c6ebf049a2 Version Control Service refactoring 2022-05-18 14:46:54 +03:00
Andrii Shvaika
7ec45fd5f1 Rename Data structures. Create separate module. 2022-05-18 10:40:02 +03:00
Viacheslav Klimov
41fede9b43 Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template 2022-05-17 18:31:49 +03:00
Andrii Shvaika
0905aff7a0 Merge with develop/3.4 2022-05-17 17:00:25 +03:00
Viacheslav Klimov
f82be0153b Entities VC with Git - initial implementation 2022-05-14 17:26:18 +03:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Sergey Matvienko
8adc0c739f removed sql test suites in favour independent test run, fixed NoSqlDaoServiceTestSuite 2022-04-28 18:45:58 +03:00
Andrew Shvayka
b9b813385f
Merge pull request #5671 from ViacheslavKlimov/smpp-sms-sender 
[3.4] SMPP SMS provider
 2022-04-28 12:03:57 +03:00
Viacheslav Klimov
d746a04186 Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
 2022-03-22 15:54:53 +02:00
Viacheslav Klimov
e2c9a5ffdf TOTP and SMS 2FA providers; 2FA set-up API 2022-03-10 17:59:59 +02:00
Viacheslav Klimov
89c74cac8d Merge branch 'develop/3.4' into smpp-sms-sender 2022-03-02 17:39:41 +02:00
Igor Kulikov
dabd25e760 Version set to 3.4.0-SNAPSHOT 2022-02-21 12:19:59 +02:00
Igor Kulikov
312924a19b Version set to 3.3.4-SNAPSHOT 2022-02-07 09:55:37 +02:00
ArtemDzhereleiko
ddca2d318f Merge branch 'smpp-sms-sender' of git://github.com/ViacheslavKlimov/thingsboard into ViacheslavKlimov-smpp-sms-sender 2022-01-28 18:37:07 +02:00
Igor Kulikov
da4c742872 Update license year to 2022 2022-01-17 14:07:46 +02:00
Sergey Matvienko
f51edb3a45 Merge branch 'master' into sql_tests_on_postgres_testcontainer 2021-12-13 14:03:02 +02:00
Viacheslav Klimov
f7911cc1ac SMPP SMS sender 2021-12-02 16:08:18 +02:00
Igor Kulikov
7187ecfdb1 Version set to 3.3.3-SNAPSHOT 2021-11-24 12:24:27 +02:00
Igor Kulikov
7c2b3a9fbf Improve REST API error response handling. Update swagger api. 2021-11-04 15:26:36 +02:00
Igor Kulikov
d110f5a005 Update springfox swagger version. 2021-11-01 18:58:11 +02:00
Sergey Matvienko
d52c64ef03 CustomSqlUnit removed from test suites. dependency added for testcontainers for application test scope. 2021-10-15 19:48:49 +03:00
Sergey Matvienko
2d2aa50520 tests: added psql exclude in application pom. dao pom copied the same rules as fo rapplication 2021-10-12 18:36:07 +03:00
Igor Kulikov
049627db97 Version set to 3.3.2-SNAPSHOT 2021-09-06 18:55:10 +03:00
Igor Kulikov
7b6e8248d3
Merge branch 'master' into dependency-management-transitive-ce-3-3-1 2021-09-01 15:02:27 +03:00
Igor Kulikov
02b8b8b873
Merge branch 'master' into dependency-upgrade-test-scope 2021-09-01 14:57:02 +03:00
Sergey Matvienko
aefb7e4bb3 added netty-tcnative-boringssl-static.version 2.0.41.Final along with netty-all to support SSL 2021-09-01 13:55:45 +03:00
Sergey Matvienko
bf938a45e7 grpc: grpc-netty replaced with grpc-netty-shaded to decouple grpc and netty versions in the project (CE) 2021-08-23 12:31:11 +03:00
Andrii Shvaika
3661647c3a Version set to 3.3.1-SNAPSHOT 2021-08-16 12:39:43 +03:00
Igor Kulikov
82a66a9421 Fix device service cache. Configure maven surefire plugin to execute both test suits and single tests. 2021-08-12 18:27:27 +03:00
Andrii Shvaika
2078c71d32 Added module cluster-api and used it in rule engine and other services 2021-08-06 17:33:52 +03:00
Sergey Matvienko
e223dda96f test scope: dependency upgrade a refactor for all POMs in project 2021-08-06 13:53:35 +03:00
Sergey Matvienko
c9c13457e1 org.awaitility to test asynchronous API 2021-08-02 17:44:23 +03:00
YevhenBondarenko
e9f5fd2706 added ability to use redis cluster for lwm2m redis stores. 2021-05-26 15:31:06 +03:00
Viacheslav Klimov
a00e3be7ba Merge branch 'master' into master-to-develop-snmp 
# Conflicts:
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
#	common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
#	pom.xml
 2021-04-12 15:45:39 +03:00
Viacheslav Klimov
44c1cbcbc0 Merge remote-tracking branch 'thingsboard/develop/3.3' into develop/snmp 
# Conflicts:
#	application/pom.xml
#	application/src/main/resources/thingsboard.yml
#	common/transport/pom.xml
#	msa/transport/pom.xml
#	pom.xml
#	transport/pom.xml
#	ui-ngx/src/app/modules/home/components/home-components.module.ts
#	ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
#	ui-ngx/src/app/shared/models/device.models.ts
 2021-03-10 15:22:03 +02:00
vkukhtyn
5a72479951
[WIP] SNMP initial implementation (#3755) 
* Add SNMP type to transport profiles

* Update reference config for transport profiles

* Initial implementation to retrieve a value using SNMP GET message

* Fix license header

* Move config files

* Use async handler for SNMP response

* Send SNMP agent response to attributes and telemetry

* UI: add SNMP option for device profile

* UI: use JSON field to set SNMP profile configuration

* Handle device profile update event

* Use concurrent hash map for SNMP device sessions

* UI: Add device transport configuration control

* Cancel async request to avoid memory leak and timeout handling

* Start SNMP pooling after application started

* Move OID per profile mapping to SNMP transport context

* Fix build after merge with 3.2.1-SNAPSHOT

* Init device sessions on TB start

* Fix build error, refactoring

* Update session context on device update

* Set device info on session context creating

* Refresh pooling params on device or profile update

* Update license header

* Process device and profile transport config update

* Process SNMP response asynchronously

* Change polling implementation
 2021-03-10 14:56:25 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
Igor Kulikov
43178107c3 Merge with master 2021-02-08 20:02:54 +02:00
Igor Kulikov
22e5771120 JDK 11 Support 2021-02-04 19:31:20 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
Igor Kulikov
61723da391 Version set to 3.3.0-SNAPSHOT 2021-01-26 10:17:52 +02:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Volodymyr Babak
b2de96fbff Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2020-12-24 15:13:57 +02:00
Igor Kulikov
6814c21ee9 restore ver 3.2.1-SNAPSHOT 2020-12-23 18:24:42 +02:00
Igor Kulikov
bfee301625 Set ver to 2.5.6-SNAPSHOT 2020-12-23 17:47:58 +02:00