DDDHuang 4 лет назад
Родитель
Сommit
c777759707
2 измененных файлов с 57 добавлено и 34 удалено
  1. 8 4
      apps/emqx_authn/src/emqx_authn_api.erl
  2. 49 30
      apps/emqx_exhook/src/emqx_exhook_schema.erl

+ 8 - 4
apps/emqx_authn/src/emqx_authn_api.erl

@@ -431,8 +431,10 @@ schema("/authentication/:id/users") ->
             description => <<"List users in authenticator in global authentication chain">>,
             parameters => [
                 param_auth_id(),
-                {page, mk(pos_integer(), #{in => query, desc => <<"Page Index">>, required => false})},
-                {limit, mk(pos_integer(), #{in => query, desc => <<"Page Limit">>, required => false})},
+                {page,
+                    mk(pos_integer(), #{in => query, desc => <<"Page Index">>, required => false})},
+                {limit,
+                    mk(pos_integer(), #{in => query, desc => <<"Page Limit">>, required => false})},
                 {like_username,
                     mk(binary(), #{
                         in => query,
@@ -481,8 +483,10 @@ schema("/listeners/:listener_id/authentication/:id/users") ->
             parameters => [
                 param_listener_id(),
                 param_auth_id(),
-                {page, mk(pos_integer(), #{in => query, desc => <<"Page Index">>, required => false})},
-                {limit, mk(pos_integer(), #{in => query, desc => <<"Page Limit">>, required => false})}
+                {page,
+                    mk(pos_integer(), #{in => query, desc => <<"Page Index">>, required => false})},
+                {limit,
+                    mk(pos_integer(), #{in => query, desc => <<"Page Limit">>, required => false})}
             ],
             responses => #{
                 200 => emqx_dashboard_swagger:schema_with_example(

+ 49 - 30
apps/emqx_exhook/src/emqx_exhook_schema.erl

@@ -50,36 +50,55 @@ fields(exhook) ->
             )}
     ];
 fields(server) ->
-    [ {name, sc(binary(),
-                #{ desc => "Name of the exhook server."
-                 })}
-    , {enable, sc(boolean(),
-                  #{ default => true
-                   , desc => "Enable the exhook server."
-                   })}
-    , {url, sc(binary(),
-               #{ desc => "URL of the gRPC server."
-                })}
-    , {request_timeout, sc(duration(),
-                           #{ default => "5s"
-                            , desc => "The timeout to request gRPC server."
-                            })}
-    , {failed_action, failed_action()}
-    , {ssl,
-       sc(ref(ssl_conf), #{})}
-    , {auto_reconnect,
-       sc(hoconsc:union([false, duration()]),
-          #{ default => "60s"
-           , desc => "Whether to automatically reconnect (initialize) the gRPC server.<br/>"
-                     "When gRPC is not available, exhook tries to request the gRPC service at "
-                     "that interval and reinitialize the list of mounted hooks."
-           })}
-    , {pool_size,
-       sc(pos_integer(),
-          #{ default => 8
-           , example => 8
-           , desc => "The process pool size for gRPC client."
-           })}
+    [
+        {name,
+            sc(
+                binary(),
+                #{desc => "Name of the exhook server."}
+            )},
+        {enable,
+            sc(
+                boolean(),
+                #{
+                    default => true,
+                    desc => "Enable the exhook server."
+                }
+            )},
+        {url,
+            sc(
+                binary(),
+                #{desc => "URL of the gRPC server."}
+            )},
+        {request_timeout,
+            sc(
+                duration(),
+                #{
+                    default => "5s",
+                    desc => "The timeout to request gRPC server."
+                }
+            )},
+        {failed_action, failed_action()},
+        {ssl, sc(ref(ssl_conf), #{})},
+        {auto_reconnect,
+            sc(
+                hoconsc:union([false, duration()]),
+                #{
+                    default => "60s",
+                    desc =>
+                        "Whether to automatically reconnect (initialize) the gRPC server.<br/>"
+                        "When gRPC is not available, exhook tries to request the gRPC service at "
+                        "that interval and reinitialize the list of mounted hooks."
+                }
+            )},
+        {pool_size,
+            sc(
+                pos_integer(),
+                #{
+                    default => 8,
+                    example => 8,
+                    desc => "The process pool size for gRPC client."
+                }
+            )}
     ];
 fields(ssl_conf) ->
     Schema = emqx_schema:client_ssl_opts_schema(#{}),