Browse Source

lwm2m - profile fix bug server config

pull/5488/head
nickAS21 5 years ago
parent
commit
4efa360f5c
  1. 2
      application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java
  2. 6
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java

2
application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java

@ -55,7 +55,7 @@ public class LwM2MServiceImpl implements LwM2MService {
if (publicKeyBase64 == null) { if (publicKeyBase64 == null) {
bsServ.setServerPublicKey(""); bsServ.setServerPublicKey("");
} else { } else {
bsServ.setServerPublicKey(Base64.encodeBase64String(getPublicKey(serverConfig))); bsServ.setServerPublicKey(Base64.encodeBase64String(publicKeyBase64));
} }
return bsServ; return bsServ;
} }

6
common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java

@ -16,15 +16,13 @@
package org.thingsboard.server.common.data.device.data.lwm2m; package org.thingsboard.server.common.data.device.data.lwm2m;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.ServerConfig;
import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.ServerCredentials; import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.ServerCredentials;
import java.util.Map;
@Data @Data
public class BootstrapConfiguration { public class BootstrapConfiguration {
//TODO: define the objects; private ServerConfig servers;
private Map<String, Object> servers;
private ServerCredentials lwm2mServer; private ServerCredentials lwm2mServer;
private ServerCredentials bootstrapServer; private ServerCredentials bootstrapServer;

Loading…
Cancel
Save