yuanbiao
/
jetlinks-official-protocol
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化协议

This commit is contained in:
zhou-hao 2020-11-23 11:05:14 +08:00
parent bce0889563
commit ecf4e534b3
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
package/jetlinks-official-protocol-1.0-SNAPSHOT.jar
View File

Binary file not shown.

2
pom.xml
View File

@ -69,7 +69,7 @@
<dependency> <dependency>
<groupId>org.jetlinks</groupId> <groupId>org.jetlinks</groupId>
<artifactId>jetlinks-supports</artifactId> <artifactId>jetlinks-supports</artifactId>
<version>1.1.0</version> <version>1.1.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java
View File

@ -48,7 +48,7 @@ public class JetLinksAuthenticator implements Authenticator {
//签名 //签名
String digest = DigestUtils.md5Hex(username + "|" + secureKey); String digest = DigestUtils.md5Hex(username + "|" + secureKey);
if (requestSecureId.equals(secureId) && digest.equals(password)) { if (requestSecureId.equals(secureId) && digest.equals(password)) {
return AuthenticationResponse.success(); return AuthenticationResponse.success(deviceOperation.getDeviceId());
} else { } else {
return AuthenticationResponse.error(401, "密钥错误"); return AuthenticationResponse.error(401, "密钥错误");
} }

5
src/main/java/org/jetlinks/protocol/official/JetLinksProtocolSupportProvider.java
View File

@ -3,6 +3,7 @@ package org.jetlinks.protocol.official;
import org.jetlinks.core.defaults.CompositeProtocolSupport; import org.jetlinks.core.defaults.CompositeProtocolSupport;
import org.jetlinks.core.message.codec.DefaultTransport; import org.jetlinks.core.message.codec.DefaultTransport;
import org.jetlinks.core.metadata.DefaultConfigMetadata; 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.EnumType;
import org.jetlinks.core.metadata.types.PasswordType; import org.jetlinks.core.metadata.types.PasswordType;
import org.jetlinks.core.metadata.types.StringType; import org.jetlinks.core.metadata.types.StringType;
@ -27,8 +28,8 @@ public class JetLinksProtocolSupportProvider implements ProtocolSupportProvider
"CoAP认证配置", "CoAP认证配置",
"使用CoAP进行数据上报时,需要对数据进行加密:" + "使用CoAP进行数据上报时,需要对数据进行加密:" +
"encrypt(payload,secureKey);") "encrypt(payload,secureKey);")
.add("encAlg", "加密算法", "加密算法", .add("encAlg", "加密算法", "加密算法", new EnumType()
new EnumType().addElement(EnumType.Element.of("AES", "AES加密(ECB,PKCS#5)", "加密模式:ECB,填充方式:PKCS#5"))) .addElement(EnumType.Element.of("AES", "AES加密(ECB,PKCS#5)", "加密模式:ECB,填充方式:PKCS#5")), DeviceConfigScope.product)
.add("secureKey", "密钥", "16位密钥KEY", new PasswordType()); .add("secureKey", "密钥", "16位密钥KEY", new PasswordType());
private static final DefaultConfigMetadata coapDTLSConfig = new DefaultConfigMetadata( private static final DefaultConfigMetadata coapDTLSConfig = new DefaultConfigMetadata(