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

优化http处理

This commit is contained in:
zhouhao 2022-11-02 17:45:16 +08:00
parent 1227a8e6ce
commit 6d46169cc5
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/jetlinks/protocol/official/http/JetLinksHttpDeviceMessageCodec.java
View File

@ -67,19 +67,24 @@ public class JetLinksHttpDeviceMessageCodec implements DeviceMessageCodec {
return Mono.empty(); return Mono.empty();
} }
private static final SimpleHttpResponseMessage unauthorized = SimpleHttpResponseMessage private static SimpleHttpResponseMessage unauthorized() {
return SimpleHttpResponseMessage
.builder() .builder()
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.body("{\"success\":true,\"code\":\"unauthorized\"}") .body("{\"success\":true,\"code\":\"unauthorized\"}")
.status(401) .status(401)
.build(); .build();
}
private static final SimpleHttpResponseMessage badRequest = SimpleHttpResponseMessage
private static SimpleHttpResponseMessage badRequest() {
return SimpleHttpResponseMessage
.builder() .builder()
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.body("{\"success\":false,\"code\":\"bad_request\"}") .body("{\"success\":false,\"code\":\"bad_request\"}")
.status(400) .status(400)
.build(); .build();
}
@Nonnull @Nonnull
@Override @Override
@ -91,14 +96,14 @@ public class JetLinksHttpDeviceMessageCodec implements DeviceMessageCodec {
Header header = message.getHeader(HttpHeaders.AUTHORIZATION).orElse(null); Header header = message.getHeader(HttpHeaders.AUTHORIZATION).orElse(null);
if (header == null || header.getValue() == null || header.getValue().length == 0) { if (header == null || header.getValue() == null || header.getValue().length == 0) {
return message return message
.response(unauthorized) .response(unauthorized())
.thenMany(Mono.empty()); .thenMany(Mono.empty());
} }
String[] token = header.getValue()[0].split(" "); String[] token = header.getValue()[0].split(" ");
if (token.length == 1) { if (token.length == 1) {
return message return message
.response(unauthorized) .response(unauthorized())
.thenMany(Mono.empty()); .thenMany(Mono.empty());
} }
String basicToken = token[1]; String basicToken = token[1];
@ -106,7 +111,7 @@ public class JetLinksHttpDeviceMessageCodec implements DeviceMessageCodec {
String[] paths = TopicMessageCodec.removeProductPath(message.getPath()); String[] paths = TopicMessageCodec.removeProductPath(message.getPath());
if (paths.length < 1) { if (paths.length < 1) {
return message return message
.response(badRequest) .response(badRequest())
.thenMany(Mono.empty()); .thenMany(Mono.empty());
} }
String deviceId = paths[1]; String deviceId = paths[1];
@ -122,7 +127,7 @@ public class JetLinksHttpDeviceMessageCodec implements DeviceMessageCodec {
handler = message.ok("{\"success\":true}"); handler = message.ok("{\"success\":true}");
} else { } else {
return message return message
.response(unauthorized) .response(unauthorized())
.then(Mono.error(new BusinessException("设备[" + deviceId + "]未激活或token [" + basicToken + "]错误"))); .then(Mono.error(new BusinessException("设备[" + deviceId + "]未激活或token [" + basicToken + "]错误")));
} }
return handler.thenMany(flux); return handler.thenMany(flux);