Merge pull request #11991 from HJianBo/ocpp-gw-bug-fixes

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

apps/emqx_gateway/src/emqx_gateway_schema.erl

@@ -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.
 

apps/emqx_gateway_ocpp/src/emqx_ocpp_conf.erl

@@ -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),

apps/emqx_gateway_ocpp/src/emqx_ocpp_schemas.erl

@@ -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 ->