简柏林 / thingskit · Commits

Commit 2cd5b646e3acfb031ff25de0b58d75a72a3ca857

Authored by vzikratyi
1 parent faf0184c

Fixed merge

Inline Side-by-side
Showing 6 changed files with 90 additions and 85 deletions
@@ -14,70 +14,4 @@ @@ -14,70 +14,4 @@
14 -- limitations under the License. 14 -- limitations under the License.
15 -- 15 --
16 16
17 -DROP TABLE IF EXISTS oauth2_client_registration;  
18 -  
19 -CREATE TABLE IF NOT EXISTS oauth2_client_registration (  
20 - id uuid NOT NULL CONSTRAINT oauth2_client_registration_pkey PRIMARY KEY,  
21 - created_time bigint NOT NULL,  
22 - additional_info varchar,  
23 - tenant_id uuid,  
24 - domain_name varchar(255),  
25 - client_id varchar(255),  
26 - client_secret varchar(255),  
27 - authorization_uri varchar(255),  
28 - token_uri varchar(255),  
29 - redirect_uri_template varchar(255),  
30 - scope varchar(255),  
31 - user_info_uri varchar(255),  
32 - user_name_attribute_name varchar(255),  
33 - jwk_set_uri varchar(255),  
34 - client_authentication_method varchar(255),  
35 - login_button_label varchar(255),  
36 - login_button_icon varchar(255),  
37 - allow_user_creation boolean,  
38 - activate_user boolean,  
39 - type varchar(31),  
40 - basic_email_attribute_key varchar(31),  
41 - basic_first_name_attribute_key varchar(31),  
42 - basic_last_name_attribute_key varchar(31),  
43 - basic_tenant_name_strategy varchar(31),  
44 - basic_tenant_name_pattern varchar(255),  
45 - basic_customer_name_pattern varchar(255),  
46 - basic_default_dashboard_name varchar(255),  
47 - basic_always_full_screen boolean,  
48 - custom_url varchar(255),  
49 - custom_username varchar(255),  
50 - custom_password varchar(255),  
51 - custom_send_token boolean  
52 -);  
53 -  
54 -DROP TABLE IF EXISTS oauth2_client_registration_template;  
55 -  
56 -CREATE TABLE IF NOT EXISTS oauth2_client_registration_template (  
57 - id uuid NOT NULL CONSTRAINT oauth2_client_registration_template_pkey PRIMARY KEY,  
58 - created_time bigint NOT NULL,  
59 - additional_info varchar,  
60 - tenant_id uuid,  
61 - provider_id varchar(255),  
62 - authorization_uri varchar(255),  
63 - token_uri varchar(255),  
64 - scope varchar(255),  
65 - user_info_uri varchar(255),  
66 - user_name_attribute_name varchar(255),  
67 - jwk_set_uri varchar(255),  
68 - client_authentication_method varchar(255),  
69 - basic_email_attribute_key varchar(31),  
70 - basic_first_name_attribute_key varchar(31),  
71 - basic_last_name_attribute_key varchar(31),  
72 - basic_tenant_name_strategy varchar(31),  
73 - basic_tenant_name_pattern varchar(255),  
74 - basic_customer_name_pattern varchar(255),  
75 - basic_default_dashboard_name varchar(255),  
76 - basic_always_full_screen boolean,  
77 - comment varchar,  
78 - icon varchar(255),  
79 - help_link varchar(255),  
80 - CONSTRAINT oauth2_template_provider_id_unq_key UNIQUE (provider_id)  
81 -);  
82 -  
83 CREATE INDEX IF NOT EXISTS idx_alarm_tenant_alarm_type_created_time ON alarm(tenant_id, type, created_time DESC); 17 CREATE INDEX IF NOT EXISTS idx_alarm_tenant_alarm_type_created_time ON alarm(tenant_id, type, created_time DESC);
  1 +--
  2 +-- Copyright © 2016-2020 The Thingsboard Authors
  3 +--
  4 +-- Licensed under the Apache License, Version 2.0 (the "License");
  5 +-- you may not use this file except in compliance with the License.
  6 +-- You may obtain a copy of the License at
  7 +--
  8 +-- http://www.apache.org/licenses/LICENSE-2.0
  9 +--
  10 +-- Unless required by applicable law or agreed to in writing, software
  11 +-- distributed under the License is distributed on an "AS IS" BASIS,
  12 +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +-- See the License for the specific language governing permissions and
  14 +-- limitations under the License.
  15 +--
  16 +
  17 +DROP TABLE IF EXISTS oauth2_client_registration;
  18 +
  19 +CREATE TABLE IF NOT EXISTS oauth2_client_registration (
  20 + id uuid NOT NULL CONSTRAINT oauth2_client_registration_pkey PRIMARY KEY,
  21 + created_time bigint NOT NULL,
  22 + additional_info varchar,
  23 + tenant_id uuid,
  24 + domain_name varchar(255),
  25 + client_id varchar(255),
  26 + client_secret varchar(255),
  27 + authorization_uri varchar(255),
  28 + token_uri varchar(255),
  29 + redirect_uri_template varchar(255),
  30 + scope varchar(255),
  31 + user_info_uri varchar(255),
  32 + user_name_attribute_name varchar(255),
  33 + jwk_set_uri varchar(255),
  34 + client_authentication_method varchar(255),
  35 + login_button_label varchar(255),
  36 + login_button_icon varchar(255),
  37 + allow_user_creation boolean,
  38 + activate_user boolean,
  39 + type varchar(31),
  40 + basic_email_attribute_key varchar(31),
  41 + basic_first_name_attribute_key varchar(31),
  42 + basic_last_name_attribute_key varchar(31),
  43 + basic_tenant_name_strategy varchar(31),
  44 + basic_tenant_name_pattern varchar(255),
  45 + basic_customer_name_pattern varchar(255),
  46 + basic_default_dashboard_name varchar(255),
  47 + basic_always_full_screen boolean,
  48 + custom_url varchar(255),
  49 + custom_username varchar(255),
  50 + custom_password varchar(255),
  51 + custom_send_token boolean
  52 +);
  53 +
  54 +DROP TABLE IF EXISTS oauth2_client_registration_template;
  55 +
  56 +CREATE TABLE IF NOT EXISTS oauth2_client_registration_template (
  57 + id uuid NOT NULL CONSTRAINT oauth2_client_registration_template_pkey PRIMARY KEY,
  58 + created_time bigint NOT NULL,
  59 + additional_info varchar,
  60 + tenant_id uuid,
  61 + provider_id varchar(255),
  62 + authorization_uri varchar(255),
  63 + token_uri varchar(255),
  64 + scope varchar(255),
  65 + user_info_uri varchar(255),
  66 + user_name_attribute_name varchar(255),
  67 + jwk_set_uri varchar(255),
  68 + client_authentication_method varchar(255),
  69 + basic_email_attribute_key varchar(31),
  70 + basic_first_name_attribute_key varchar(31),
  71 + basic_last_name_attribute_key varchar(31),
  72 + basic_tenant_name_strategy varchar(31),
  73 + basic_tenant_name_pattern varchar(255),
  74 + basic_customer_name_pattern varchar(255),
  75 + basic_default_dashboard_name varchar(255),
  76 + basic_always_full_screen boolean,
  77 + comment varchar,
  78 + icon varchar(255),
  79 + help_link varchar(255),
  80 + CONSTRAINT oauth2_template_provider_id_unq_key UNIQUE (provider_id)
  81 +);
@@ -177,9 +177,9 @@ public class ThingsboardInstallService { @@ -177,9 +177,9 @@ public class ThingsboardInstallService {
177 databaseEntitiesUpgradeService.upgradeDatabase("3.1.0"); 177 databaseEntitiesUpgradeService.upgradeDatabase("3.1.0");
178 log.info("Updating system data..."); 178 log.info("Updating system data...");
179 systemDataLoaderService.updateSystemWidgets(); 179 systemDataLoaderService.updateSystemWidgets();
180 - case "3.1.0":  
181 - log.info("Upgrading ThingsBoard from version 3.1.0 to 3.2.0 ...");  
182 - databaseEntitiesUpgradeService.upgradeDatabase("3.1.0"); 180 + case "3.1.1":
  181 + log.info("Upgrading ThingsBoard from version 3.1.1 to 3.2.0 ...");
  182 + databaseEntitiesUpgradeService.upgradeDatabase("3.1.1");
183 log.info("Updating system data..."); 183 log.info("Updating system data...");
184 systemDataLoaderService.createOAuth2Templates(); 184 systemDataLoaderService.createOAuth2Templates();
185 break; 185 break;
@@ -294,22 +294,23 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService @@ -294,22 +294,23 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
294 } catch (Exception e) { 294 } catch (Exception e) {
295 log.error("Failed updating schema!!!", e); 295 log.error("Failed updating schema!!!", e);
296 } 296 }
  297 + break;
297 case "3.1.0": 298 case "3.1.0":
298 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { 299 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
299 log.info("Updating schema ..."); 300 log.info("Updating schema ...");
300 - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.0", "schema_update.sql"); 301 + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.0", SCHEMA_UPDATE_SQL);
301 loadSql(schemaUpdateFile, conn); 302 loadSql(schemaUpdateFile, conn);
302 log.info("Schema updated."); 303 log.info("Schema updated.");
303 - } catch (Exception e) {  
304 - log.error("Failed updating schema!!!", e);  
305 } 304 }
306 break; 305 break;
307 - case "3.1.0": 306 + case "3.1.1":
308 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { 307 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
309 log.info("Updating schema ..."); 308 log.info("Updating schema ...");
310 - schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.0", SCHEMA_UPDATE_SQL); 309 + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.1", "schema_update.sql");
311 loadSql(schemaUpdateFile, conn); 310 loadSql(schemaUpdateFile, conn);
312 log.info("Schema updated."); 311 log.info("Schema updated.");
  312 + } catch (Exception e) {
  313 + log.error("Failed updating schema!!!", e);
313 } 314 }
314 break; 315 break;
315 default: 316 default:
@@ -25,8 +25,6 @@ public interface AdminSettingsService { @@ -25,8 +25,6 @@ public interface AdminSettingsService {
25 25
26 AdminSettings findAdminSettingsByKey(TenantId tenantId, String key); 26 AdminSettings findAdminSettingsByKey(TenantId tenantId, String key);
27 27
28 - void deleteAdminSettingsByKey(TenantId tenantId, String key);  
29 -  
30 AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings); 28 AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings);
31 29
32 } 30 }
@@ -49,15 +49,6 @@ public class AdminSettingsServiceImpl implements AdminSettingsService { @@ -49,15 +49,6 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
49 } 49 }
50 50
51 @Override 51 @Override
52 - public void deleteAdminSettingsByKey(TenantId tenantId, String key) {  
53 - log.trace("Executing deleteAdminSettingsByKey [{}]", key);  
54 - AdminSettings adminSettings = findAdminSettingsByKey(tenantId, key);  
55 - if (adminSettings != null) {  
56 - adminSettingsDao.removeById(tenantId, adminSettings.getId().getId());  
57 - }  
58 - }  
59 -  
60 - @Override  
61 public AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings) { 52 public AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings) {
62 log.trace("Executing saveAdminSettings [{}]", adminSettings); 53 log.trace("Executing saveAdminSettings [{}]", adminSettings);
63 adminSettingsValidator.validate(adminSettings, data -> tenantId); 54 adminSettingsValidator.validate(adminSettings, data -> tenantId);