Browse Source
Merge pull request #11778 from AndriiLandiak/fix/edge-version
Change edge version from V_3_7_1 to V_3_8_0
pull/11780/head
Viacheslav Klimov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
5 additions and
5 deletions
-
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
-
application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
-
common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
-
common/edge-api/src/main/proto/edge.proto
|
|
|
@ -38,7 +38,7 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils; |
|
|
|
public class OAuth2EdgeProcessor extends BaseEdgeProcessor { |
|
|
|
|
|
|
|
public DownlinkMsg convertOAuth2DomainEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion) { |
|
|
|
if (EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_7_1)) { |
|
|
|
if (EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_8_0)) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
DomainId domainId = new DomainId(edgeEvent.getEntityId()); |
|
|
|
@ -73,7 +73,7 @@ public class OAuth2EdgeProcessor extends BaseEdgeProcessor { |
|
|
|
} |
|
|
|
|
|
|
|
public DownlinkMsg convertOAuth2ClientEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion) { |
|
|
|
if (EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_7_1)) { |
|
|
|
if (EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_8_0)) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
OAuth2ClientId oAuth2ClientId = new OAuth2ClientId(edgeEvent.getEntityId()); |
|
|
|
|
|
|
|
@ -62,7 +62,7 @@ public class DefaultCacheCleanupService implements CacheCleanupService { |
|
|
|
clearAll(); |
|
|
|
break; |
|
|
|
case "3.7.0": |
|
|
|
log.info("Clearing cache to upgrade from version 3.7.0 to 3.7.1"); |
|
|
|
log.info("Clearing cache to upgrade from version 3.7.0 to 3.8.0"); |
|
|
|
clearAll(); |
|
|
|
break; |
|
|
|
default: |
|
|
|
|
|
|
|
@ -136,7 +136,7 @@ public class EdgeGrpcClient implements EdgeRpcClient { |
|
|
|
.setConnectRequestMsg(ConnectRequestMsg.newBuilder() |
|
|
|
.setEdgeRoutingKey(edgeKey) |
|
|
|
.setEdgeSecret(edgeSecret) |
|
|
|
.setEdgeVersion(EdgeVersion.V_3_7_1) |
|
|
|
.setEdgeVersion(EdgeVersion.V_3_8_0) |
|
|
|
.setMaxInboundMessageSize(maxInboundMessageSize) |
|
|
|
.build()) |
|
|
|
.build()); |
|
|
|
|
|
|
|
@ -39,7 +39,7 @@ enum EdgeVersion { |
|
|
|
V_3_6_2 = 5; |
|
|
|
V_3_6_4 = 6; |
|
|
|
V_3_7_0 = 7; |
|
|
|
V_3_7_1 = 8; |
|
|
|
V_3_8_0 = 8; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|