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

67 Commits

Author SHA1 Message Date
vzikratyi
9eb9302ee3 Used DB lock instead of Java lock 2020-07-10 15:54:34 +03:00
vzikratyi
5aba253928 Changed OAuth2ClientsDomainParams protocol 2020-07-09 12:11:49 +03:00
vzikratyi
328c827744 Made method 'getAllOAuth2Params' public 2020-06-25 18:05:21 +03:00
vzikratyi
c30e8b3a2d Added method to delete system oauth2 config 2020-06-25 18:04:39 +03:00
vzikratyi
0149c4b652 Get System OAuth2 config without tenantId 2020-06-25 16:45:50 +03:00
vzikratyi
55a2fe890e Added method to load oauth2 config with tenantId 2020-06-24 17:36:26 +03:00
vzikratyi
84a06e65fa Added removing full OAuth2 config on tenant deletion 2020-06-24 15:58:08 +03:00
vzikratyi
ba0f8a8ea5 Updated loading AttributeKvEntity by attribute_key 2020-06-24 12:41:19 +03:00
viktor
e650cb0c24 Added reading attributes by attribute_key 2020-06-23 19:20:00 +03:00
viktor
1d56a1937b Added license headers to new classes 2020-06-23 16:21:24 +03:00
viktor
5a00973b47 Implemented part of OAuth2Service 2020-06-23 14:38:50 +03:00
viktor
c3c889bbbf Added 'deleteAdminSettingByKey' method to AdminSettingsService 2020-06-23 14:37:56 +03:00
viktor
334361577f Changed OAuth2Service, clear Tenant oauth2 config on deletion 2020-06-23 12:39:30 +03:00
vzikratyi
a6eefa903e Added required methods to OAuth2Service 2020-06-22 17:37:35 +03:00
vzikratyi
6e7d0c633f Small refactoring 2020-06-22 16:19:03 +03:00
vzikratyi
7fcf8a9894 Removed oauth2 entities from DB 2020-06-22 16:00:52 +03:00
vzikratyi
6ad3de83b7 Moved getting ClientInfo to OAuth2Service 2020-06-19 17:35:31 +03:00
vzikratyi
d5abe337be Added OAuth2ClientRegistrationService 2020-06-19 16:04:10 +03:00
Igor Kulikov
bd98ce8deb Merge with develop/2.5.2 2020-06-04 10:11:35 +03:00
Igor Kulikov
78a91b8c27 Temporarily version set to 2.5.2-SNAPSHOT 2020-06-04 10:09:02 +03:00
Igor Kulikov
b32e0de731 Version set to 3.0.1-SNAPSHOT 2020-06-04 10:05:41 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Andrii Shvaika
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
viktor
4ed334a5d5 Merge branch 'develop/2.5.1' into oauth2-default-dashboard 2020-05-21 10:26:32 +03:00
viktor
cac7eb0d2b Added 'alwaysFullScreen' and 'defaultDashboardName' oauth2 properties 2020-05-20 18:27:26 +03:00
Igor Kulikov
cf593601b9 Sync multi-page guava cassandra session support 2020-05-18 16:03:51 +03:00
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
Igor Kulikov
2d235cf9eb Improve Cassandra resultSet pagination 2020-05-08 19:34:08 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +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
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
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
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
Igor Kulikov
15a31044b2 Cleanup 2020-04-21 11:41:43 +03:00
hamza.slama
5b8ce2fb69 Move AlarmId To Id Package 2020-04-13 10:40:03 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608) 
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
 2020-04-13 09:34:35 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00
ShvaykaD
11479935c2
SQL TTL Implemenation 
* init commit

* improvements for ttl-functions

* added drop partitions by ttl function

* add load ttl function to upgrade script

* fix typo

* add IF NOT EXISTS for json_v in timescale upgrade

* changed logic for removing customer records from ts_kv

* improvements in upgrade scenario

* improvements

* added intial delay for TTL task execution
 2020-04-07 11:55:26 +03:00
Igor Kulikov
7e8c90ec6d Merge branch 'master' into develop/3.0 2020-04-01 09:48:16 +03:00
VoBa
d94cb9ca47
Added correct ts on alarm clear and ack actions (#2550) 2020-04-01 09:33:46 +03:00
Igor Kulikov
96d3b245b0 Revert to version 3.0.0-SNAPSHOT 2020-02-20 12:35:01 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00
ShvaykaD
3955600a9c bug fixes & improvements / sql-timeseries (#2382) 
* fixed the partion date extracting

* fix imports

* ts-keys dictionary for latest, hsqldb

* removed AbstractSimpleSqlTimeseriesDao class & fix beanCreationException in ThingsboardInstallService

* timescale-db upgrade added

* added postgreSQL upgrade

* fix logging

* refactoring timeseries-dao implementation
 2020-02-07 15:39:04 +02:00
Dmytro Shvaika
41cbdd154e fixed the partion date extracting 2020-01-30 14:55:50 +02:00
ShvaykaD
84cb471e0d Sql timeseries improvements (#2033) 
* init commit

* cleaned code and add test-properties

* cleaned code

* psql-update

* timescale-update

* code-refactoring

* fix typo

* renamed dao

* revert indents

* refactored code

* fix typo

* init-partitioning

* code updated

* cleaned code

* fixed license

* fix typo

* fixed code after review

* add annotation to repository

* update psql version for docker

* postgres-10

* postgres-10

* update docker compose config

* fixed partition saving

* change key_id to serial column definition

* upgrade psql added

* add separate upgrade service

* added upgrade script

* change image on k8s

* change logs

* resolve conflict after merge with master

* revert datasource url in yml

* fix typo

* license header fix

* remove old methods for the timeseries inserts

* clean up code

* fix saveOrUpdate for PostgreSQL

* refactoring & revert Timescale to use latest table

* added PsqlTsAnyDao

* duplicated code method removed

* remove unused invert dictionary map

* change the upgrade directory from 2.4.1 to 2.4.3

* refactor JpaPsqlTimeseriesDao
 2020-01-29 17:06:51 +02:00