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

Merge pull request #7630 from DDDHuang/backup_file_44 

fix: backup data filename, uri decode
This commit is contained in:
DDDHuang 2022-04-15 17:50:24 +08:00 committed by GitHub
parent 9b18bcd3c2 12874aa688
commit 9cf6b47e95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/src/emqx_management.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_management,
[{description, "EMQ X Management API and CLI"},
{vsn, "4.4.2"}, % strict semver, bump manually!
{vsn, "4.4.3"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_management_sup]},
{applications, [kernel,stdlib,emqx_plugin_libs,minirest]},

9
apps/emqx_management/src/emqx_mgmt_api_data.erl
View File

@ -115,7 +115,8 @@ import(_Bindings, Params) ->
do_import(Filename) ->
emqx_mgmt_data_backup:import(Filename, "{}").
download(#{filename := Filename}, _Params) ->
download(#{filename := Filename0}, _Params) ->
Filename = filename_decode(Filename0),
case emqx_mgmt_data_backup:read_backup_file(Filename) of
{ok, Res} ->
{ok, Res};
@ -139,7 +140,8 @@ do_upload(Bindings, Params = #{<<"file">> := _}) ->
do_upload(_Bindings, _Params) ->
minirest:return({error, missing_required_params}).
delete(#{filename := Filename}, _Params) ->
delete(#{filename := Filename0}, _Params) ->
Filename = filename_decode(Filename0),
case emqx_mgmt_data_backup:delete_backup_file(Filename) of
ok ->
minirest:return();
@ -161,3 +163,6 @@ tmp_filename() ->
Seconds = erlang:system_time(second),
{{Y, M, D}, {H, MM, S}} = emqx_mgmt_util:datetime(Seconds),
list_to_binary(io_lib:format("emqx-export-~p-~p-~p-~p-~p-~p.json", [Y, M, D, H, MM, S])).
filename_decode(Filename) ->
uri_string:percent_decode(Filename).