Showing
1 changed file
with
2 additions
and
4 deletions
| @@ -93,7 +93,6 @@ public class ThingsboardInstallService { | @@ -93,7 +93,6 @@ public class ThingsboardInstallService { | ||
| 93 | } else if ("3.0.1-cassandra".equals(upgradeFromVersion)) { | 93 | } else if ("3.0.1-cassandra".equals(upgradeFromVersion)) { |
| 94 | log.info("Migrating ThingsBoard latest timeseries data from cassandra to SQL database ..."); | 94 | log.info("Migrating ThingsBoard latest timeseries data from cassandra to SQL database ..."); |
| 95 | latestMigrateService.migrate(); | 95 | latestMigrateService.migrate(); |
| 96 | - log.info("Updating system data..."); | ||
| 97 | } else { | 96 | } else { |
| 98 | switch (upgradeFromVersion) { | 97 | switch (upgradeFromVersion) { |
| 99 | case "1.2.3": //NOSONAR, Need to execute gradual upgrade starting from upgradeFromVersion | 98 | case "1.2.3": //NOSONAR, Need to execute gradual upgrade starting from upgradeFromVersion |
| @@ -182,13 +181,12 @@ public class ThingsboardInstallService { | @@ -182,13 +181,12 @@ public class ThingsboardInstallService { | ||
| 182 | } | 181 | } |
| 183 | databaseEntitiesUpgradeService.upgradeDatabase("3.1.1"); | 182 | databaseEntitiesUpgradeService.upgradeDatabase("3.1.1"); |
| 184 | dataUpdateService.updateData("3.1.1"); | 183 | dataUpdateService.updateData("3.1.1"); |
| 185 | - log.info("Updating system data..."); | ||
| 186 | - systemDataLoaderService.updateSystemWidgets(); | ||
| 187 | systemDataLoaderService.createOAuth2Templates(); | 184 | systemDataLoaderService.createOAuth2Templates(); |
| 188 | - break; | ||
| 189 | case "3.2.0": | 185 | case "3.2.0": |
| 190 | log.info("Upgrading ThingsBoard from version 3.2.0 to 3.2.1 ..."); | 186 | log.info("Upgrading ThingsBoard from version 3.2.0 to 3.2.1 ..."); |
| 191 | databaseEntitiesUpgradeService.upgradeDatabase("3.2.0"); | 187 | databaseEntitiesUpgradeService.upgradeDatabase("3.2.0"); |
| 188 | + log.info("Updating system data..."); | ||
| 189 | + systemDataLoaderService.updateSystemWidgets(); | ||
| 192 | break; | 190 | break; |
| 193 | default: | 191 | default: |
| 194 | throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion); | 192 | throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion); |