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

Merge with master

Browse Source
This commit is contained in:
Andrii Shvaika 2021-03-16 13:46:56 +02:00
commit 59f85f1cee
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
View File

@ -304,7 +304,8 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
}
private String getTokenFromRequest(Request request) {
return request.getSource().getHostAddress() + ":" + request.getSourcePort() + ":" + request.getTokenString();
return (request.getSourceContext() != null ? request.getSourceContext().getPeerAddress().getAddress().getHostAddress() : "null")
+ ":" + (request.getSourceContext() != null ? request.getSourceContext().getPeerAddress().getPort() : -1) + ":" + request.getTokenString();
}
private Optional<DeviceTokenCredentials> decodeCredentials(Request request) {

2
msa/black-box-tests/pom.xml
View File

@ -37,7 +37,7 @@
<blackBoxTests.skip>true</blackBoxTests.skip>
<testcontainers.version>1.9.1</testcontainers.version>
<zeroturnaround.version>1.10</zeroturnaround.version>
<httpclient.version>4.5.6</httpclient.version>
<httpclient.version>4.5.13</httpclient.version>
</properties>
<dependencies>

4
pom.xml
View File

@ -39,7 +39,7 @@
<javax-annotation.version>1.3.2</javax-annotation.version>
<jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
<jaxb-runtime.version>2.3.2</jaxb-runtime.version>
<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
<spring-boot.version>2.3.9.RELEASE</spring-boot.version>
<spring.version>5.2.10.RELEASE</spring.version>
<spring-security.version>5.4.1</spring-security.version>
<spring-data-redis.version>2.4.1</spring-data-redis.version>
@ -75,7 +75,7 @@
<grpc.version>1.22.1</grpc.version>
<lombok.version>1.18.18</lombok.version>
<paho.client.version>1.2.4</paho.client.version>
<netty.version>4.1.53.Final</netty.version>
<netty.version>4.1.60.Final</netty.version>
<os-maven-plugin.version>1.5.0</os-maven-plugin.version>
<rabbitmq.version>4.8.0</rabbitmq.version>
<surfire.version>2.19.1</surfire.version>