简柏林 / thingskit · Commits

Commit b0e7bc0e31263e16f54696ec1b8e4d02b4b22273

Authored by Andrew Shvayka
1 parent 920ebc79

Build fix

Inline Side-by-side
Showing 2 changed files with 8 additions and 2 deletions
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.beans.factory.annotation.Value; 24 import org.springframework.beans.factory.annotation.Value;
25 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 25 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
26 import org.springframework.stereotype.Service; 26 import org.springframework.stereotype.Service;
  27 +import org.springframework.util.StringUtils;
27 import org.thingsboard.server.common.data.Device; 28 import org.thingsboard.server.common.data.Device;
28 import org.thingsboard.server.common.data.id.DeviceId; 29 import org.thingsboard.server.common.data.id.DeviceId;
29 import org.thingsboard.server.common.data.id.TenantId; 30 import org.thingsboard.server.common.data.id.TenantId;
@@ -142,8 +143,13 @@ public class LocalTransportApiService implements TransportApiService { @@ -142,8 +143,13 @@ public class LocalTransportApiService implements TransportApiService {
142 return getEmptyTransportApiResponse(); 143 return getEmptyTransportApiResponse();
143 } 144 }
144 try { 145 try {
  146 + ValidateDeviceCredentialsResponseMsg.Builder builder = ValidateDeviceCredentialsResponseMsg.newBuilder();
  147 + builder.setDeviceInfo(getDeviceInfoProto(device));
  148 + if(!StringUtils.isEmpty(credentials.getCredentialsValue())){
  149 + builder.setCredentialsBody(credentials.getCredentialsValue());
  150 + }
145 return TransportApiResponseMsg.newBuilder() 151 return TransportApiResponseMsg.newBuilder()
146 - .setValidateTokenResponseMsg(ValidateDeviceCredentialsResponseMsg.newBuilder().setDeviceInfo(getDeviceInfoProto(device)).setCredentialsBody(credentials.getCredentialsValue()).build()).build(); 152 + .setValidateTokenResponseMsg(builder.build()).build();
147 } catch (JsonProcessingException e) { 153 } catch (JsonProcessingException e) {
148 log.warn("[{}] Failed to lookup device by id", deviceId, e); 154 log.warn("[{}] Failed to lookup device by id", deviceId, e);
149 return getEmptyTransportApiResponse(); 155 return getEmptyTransportApiResponse();
@@ -40,7 +40,7 @@ public abstract class AbstractTransportService implements TransportService { @@ -40,7 +40,7 @@ public abstract class AbstractTransportService implements TransportService {
40 private boolean rateLimitEnabled; 40 private boolean rateLimitEnabled;
41 @Value("${transport.rate_limits.tenant}") 41 @Value("${transport.rate_limits.tenant}")
42 private String perTenantLimitsConf; 42 private String perTenantLimitsConf;
43 - @Value("${transport.rate_limits.tenant}") 43 + @Value("${transport.rate_limits.device}")
44 private String perDevicesLimitsConf; 44 private String perDevicesLimitsConf;
45 @Value("${transport.sessions.inactivity_timeout}") 45 @Value("${transport.sessions.inactivity_timeout}")
46 private long sessionInactivityTimeout; 46 private long sessionInactivityTimeout;