From ecf4e534b31ce36cbeb1eb031499fc6d0481bfea Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 23 Nov 2020 11:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...etlinks-official-protocol-1.0-SNAPSHOT.jar | Bin 28567 -> 28681 bytes pom.xml | 2 +- .../official/JetLinksAuthenticator.java | 2 +- .../JetLinksProtocolSupportProvider.java | 5 +++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar b/package/jetlinks-official-protocol-1.0-SNAPSHOT.jar index 80fd49b733f8c45184ac4a838d65711d633a967a..90321664dc09d24cb85d1c4ebac6764026c3fe3d 100644 GIT binary patch delta 6682 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 delta 6652 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 PHSExp{8^OEQ`7$gaS{mR 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(