fix(ocpp): fix bad webscoket schema for HTTP API

This commit is contained in:
JianBo He 2023-11-21 11:24:23 +08:00
parent c2ad6142e5
commit 9716b051d9
3 changed files with 12 additions and 4 deletions

View File

@ -127,9 +127,15 @@ fields(ssl_listener) ->
)}
];
fields(ws_listener) ->
ws_listener() ++ ws_opts(<<>>, <<>>);
emqx_gateway_schema:ws_listener() ++
[{websocket, sc(ref(websocket), #{})}];
fields(wss_listener) ->
wss_listener() ++ ws_opts(<<>>, <<>>);
emqx_gateway_schema:wss_listener() ++
[{websocket, sc(ref(websocket), #{})}];
fields(websocket) ->
DefaultPath = <<>>,
SubProtocols = <<>>,
emqx_gateway_schema:ws_opts(DefaultPath, SubProtocols);
fields(udp_listener) ->
[
%% some special configs for udp listener
@ -193,6 +199,8 @@ desc(udp_opts) ->
"Settings for UDP sockets.";
desc(dtls_opts) ->
"Settings for DTLS protocol.";
desc(websocket) ->
"Websocket options";
desc(_) ->
undefined.

View File

@ -63,7 +63,7 @@ max_mqueue_len() ->
| dnstream_only
| disable.
message_format_checking() ->
conf(message_format_checking, all).
conf(message_format_checking, disable).
uptopic(Action) ->
Topic = upstream(topic),

View File

@ -32,7 +32,7 @@ load() ->
disable ->
ok;
_ ->
case feedvar(emqx_config:get([gateway, ocpp, json_schema_dir])) of
case feedvar(emqx_config:get([gateway, ocpp, json_schema_dir], undefined)) of
undefined ->
ok;
Dir ->