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

Build fix

Browse Source
This commit is contained in:
Andrew Shvayka 2018-12-28 11:19:06 +02:00
parent 920ebc792a
commit b0e7bc0e31
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/main/java/org/thingsboard/server/service/transport/LocalTransportApiService.java
View File

@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
@ -142,8 +143,13 @@ public class LocalTransportApiService implements TransportApiService {
return getEmptyTransportApiResponse(); return getEmptyTransportApiResponse();
} }
try { try {
ValidateDeviceCredentialsResponseMsg.Builder builder = ValidateDeviceCredentialsResponseMsg.newBuilder();
builder.setDeviceInfo(getDeviceInfoProto(device));
if(!StringUtils.isEmpty(credentials.getCredentialsValue())){
builder.setCredentialsBody(credentials.getCredentialsValue());
}
return TransportApiResponseMsg.newBuilder() return TransportApiResponseMsg.newBuilder()
.setValidateTokenResponseMsg(ValidateDeviceCredentialsResponseMsg.newBuilder().setDeviceInfo(getDeviceInfoProto(device)).setCredentialsBody(credentials.getCredentialsValue()).build()).build(); .setValidateTokenResponseMsg(builder.build()).build();
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
log.warn("[{}] Failed to lookup device by id", deviceId, e); log.warn("[{}] Failed to lookup device by id", deviceId, e);
return getEmptyTransportApiResponse(); return getEmptyTransportApiResponse();

2
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/AbstractTransportService.java
View File

@ -40,7 +40,7 @@ public abstract class AbstractTransportService implements TransportService {
private boolean rateLimitEnabled; private boolean rateLimitEnabled;
@Value("${transport.rate_limits.tenant}") @Value("${transport.rate_limits.tenant}")
private String perTenantLimitsConf; private String perTenantLimitsConf;
@Value("${transport.rate_limits.tenant}") @Value("${transport.rate_limits.device}")
private String perDevicesLimitsConf; private String perDevicesLimitsConf;
@Value("${transport.sessions.inactivity_timeout}") @Value("${transport.sessions.inactivity_timeout}")
private long sessionInactivityTimeout; private long sessionInactivityTimeout;