diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl index adbf73f53..81d7965d0 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_api.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_api.erl @@ -25,7 +25,6 @@ -import(hoconsc, [ mk/2, - % ref/2, array/1, enum/1 ]). diff --git a/apps/emqx_dashboard/src/emqx_dashboard_cli.erl b/apps/emqx_dashboard/src/emqx_dashboard_cli.erl index 63d48c36d..675f015a4 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_cli.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_cli.erl @@ -31,8 +31,6 @@ admins(["add", Username, Password, Desc]) -> case emqx_dashboard_admin:add_user(bin(Username), bin(Password), bin(Desc)) of {ok, _} -> emqx_ctl:print("ok~n"); - {error, already_existed} -> - emqx_ctl:print("Error: already existed~n"); {error, Reason} -> emqx_ctl:print("Error: ~p~n", [Reason]) end; diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl index c2482f91b..404648b14 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl @@ -147,12 +147,14 @@ bind(desc) -> ?DESC(bind); bind(_) -> undefined. default_username(type) -> binary(); +default_username(default) -> "admin"; default_username(required) -> true; default_username(desc) -> ?DESC(default_username); default_username('readOnly') -> true; default_username(_) -> undefined. default_password(type) -> binary(); +default_password(default) -> "public"; default_password(required) -> true; default_password('readOnly') -> true; default_password(sensitive) -> true; diff --git a/scripts/merge-i18n.escript b/scripts/merge-i18n.escript index 13a7df27b..e32e82d0f 100755 --- a/scripts/merge-i18n.escript +++ b/scripts/merge-i18n.escript @@ -3,8 +3,7 @@ -mode(compile). main(_) -> - {ok, BaseConf} = file:read_file("apps/emqx_dashboard/i18n/emqx_dashboard_i18n.conf"), - + BaseConf = <<"">>, Cfgs = get_all_cfgs("apps/"), Conf = [merge(BaseConf, Cfgs), io_lib:nl() @@ -23,7 +22,7 @@ merge(BaseConf, Cfgs) -> end, BaseConf, Cfgs). get_all_cfgs(Root) -> - Apps = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_dashboard"], + Apps = filelib:wildcard("*", Root) -- ["emqx_machine"], Dirs = [filename:join([Root, App]) || App <- Apps], lists:foldl(fun get_cfgs/2, [], Dirs).