diff --git a/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar b/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar index 80fd49b..9032166 100644 Binary files a/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar and b/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar differ diff --git a/pom.xml b/pom.xml index ede3ef7..f716adf 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ org.jetlinks jetlinks-supports - 1.1.0 + 1.1.4-SNAPSHOT diff --git a/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java b/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java index 6b880a0..0db4192 100644 --- a/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java +++ b/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java @@ -48,7 +48,7 @@ public class JetLinksAuthenticator implements Authenticator { //签名 String digest = DigestUtils.md5Hex(username + "|" + secureKey); if (requestSecureId.equals(secureId) && digest.equals(password)) { - return AuthenticationResponse.success(); + return AuthenticationResponse.success(deviceOperation.getDeviceId()); } else { return AuthenticationResponse.error(401, "密钥错误"); } diff --git a/src/main/java/org/jetlinks/protocol/official/JetLinksProtocolSupportProvider.java b/src/main/java/org/jetlinks/protocol/official/JetLinksProtocolSupportProvider.java index 2be1b9d..a885f52 100644 --- a/src/main/java/org/jetlinks/protocol/official/JetLinksProtocolSupportProvider.java +++ b/src/main/java/org/jetlinks/protocol/official/JetLinksProtocolSupportProvider.java @@ -3,6 +3,7 @@ package org.jetlinks.protocol.official; import org.jetlinks.core.defaults.CompositeProtocolSupport; import org.jetlinks.core.message.codec.DefaultTransport; import org.jetlinks.core.metadata.DefaultConfigMetadata; +import org.jetlinks.core.metadata.DeviceConfigScope; import org.jetlinks.core.metadata.types.EnumType; import org.jetlinks.core.metadata.types.PasswordType; import org.jetlinks.core.metadata.types.StringType; @@ -27,8 +28,8 @@ public class JetLinksProtocolSupportProvider implements ProtocolSupportProvider "CoAP认证配置", "使用CoAP进行数据上报时,需要对数据进行加密:" + "encrypt(payload,secureKey);") - .add("encAlg", "加密算法", "加密算法", - new EnumType().addElement(EnumType.Element.of("AES", "AES加密(ECB,PKCS#5)", "加密模式:ECB,填充方式:PKCS#5"))) + .add("encAlg", "加密算法", "加密算法", new EnumType() + .addElement(EnumType.Element.of("AES", "AES加密(ECB,PKCS#5)", "加密模式:ECB,填充方式:PKCS#5")), DeviceConfigScope.product) .add("secureKey", "密钥", "16位密钥KEY", new PasswordType()); private static final DefaultConfigMetadata coapDTLSConfig = new DefaultConfigMetadata(