yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: bump minirest to 1.3.3(force generate dispatch rule)

This commit is contained in:
Zhongwen Deng 2022-05-12 16:16:46 +08:00
parent 09e5f35f5c
commit af8cad3856
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
View File

@ -431,23 +431,21 @@ desc_struct(Hocon) ->
case hocon_schema:field_schema(Hocon, desc) of
undefined ->
case hocon_schema:field_schema(Hocon, description) of
undefined ->
case Hocon of
?R_REF(Mod, Name) ->
case erlang:function_exported(Mod, desc, 1) of
true -> Mod:desc(Name);
false -> undefined
end;
_ ->
undefined
end;
Struct1 ->
Struct1
undefined -> get_ref_desc(Hocon);
Struct1 -> Struct1
end;
Struct ->
Struct
end.
get_ref_desc(?R_REF(Mod, Name)) ->
case erlang:function_exported(Mod, desc, 1) of
true -> Mod:desc(Name);
false -> undefined
end;
get_ref_desc(_) ->
undefined.
request_body(#{content := _} = Content, _Module, _Options) ->
{Content, []};
request_body([], _Module, _Options) ->

2
mix.exs
View File

@ -57,7 +57,7 @@ defmodule EMQXUmbrella.MixProject do
{:mria, github: "emqx/mria", tag: "0.2.5", override: true},
{:ekka, github: "emqx/ekka", tag: "0.12.6", override: true},
{:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true},
{:minirest, github: "emqx/minirest", tag: "1.3.2", override: true},
{:minirest, github: "emqx/minirest", tag: "1.3.3", override: true},
{:ecpool, github: "emqx/ecpool", tag: "0.5.2"},
{:replayq, "0.3.4", override: true},
{:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},

2
rebar.config
View File

@ -57,7 +57,7 @@
, {mria, {git, "https://github.com/emqx/mria", {tag, "0.2.5"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.6"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.2"}}}
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.3"}}}
, {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}}
, {replayq, "0.3.4"}
, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}