dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added curent tb version to the UpdateMessage

Browse Source
This commit is contained in:
YevhenBondarenko 2023-03-11 21:29:39 +01:00
parent e058786956
commit b13c9d7368
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java
View File

@ -66,7 +66,7 @@ public class DefaultUpdateService implements UpdateService {
@PostConstruct @PostConstruct
private void init() { private void init() {
updateMessage = new UpdateMessage("", false); updateMessage = new UpdateMessage("", false, "");
if (updatesEnabled) { if (updatesEnabled) {
try { try {
platform = System.getProperty("platform", "unknown"); platform = System.getProperty("platform", "unknown");
@ -124,7 +124,8 @@ public class DefaultUpdateService implements UpdateService {
JsonNode response = restClient.postForObject(UPDATE_SERVER_BASE_URL+"/api/thingsboard/updates", request, JsonNode.class); JsonNode response = restClient.postForObject(UPDATE_SERVER_BASE_URL+"/api/thingsboard/updates", request, JsonNode.class);
updateMessage = new UpdateMessage( updateMessage = new UpdateMessage(
response.get("message").asText(), response.get("message").asText(),
response.get("updateAvailable").asBoolean() response.get("updateAvailable").asBoolean(),
version
); );
} catch (Exception e) { } catch (Exception e) {
log.trace(e.getMessage()); log.trace(e.getMessage());

5
common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java
View File

@ -25,7 +25,8 @@ public class UpdateMessage {
@ApiModelProperty(position = 1, value = "The message about new platform update available.") @ApiModelProperty(position = 1, value = "The message about new platform update available.")
private final String message; private final String message;
@ApiModelProperty(position = 1, value = "'True' if new platform update is available.") @ApiModelProperty(position = 2, value = "'True' if new platform update is available.")
private final boolean isUpdateAvailable; private final boolean isUpdateAvailable;
@ApiModelProperty(position = 3, value = "Current ThingsBoard version.")
private final String currentVersion;
} }