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

fix: .js files are required by dashboard as static 

revert parts of 8c1334c421
This commit is contained in:
JimMoen 2023-06-15 14:26:08 +08:00
parent 17a1b8becf
commit 903d8d899e
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/emqx_dashboard/src/emqx_dashboard.erl
View File

@ -68,19 +68,13 @@ start_listeners(Listeners) ->
} }
} }
}, },
Dispatch = [
{"/", cowboy_static, {priv_file, emqx_dashboard, "www/index.html"}},
{"/static/[...]", cowboy_static, {priv_dir, emqx_dashboard, "www/static"}},
{emqx_mgmt_api_status:path(), emqx_mgmt_api_status, []},
{'_', emqx_dashboard_not_found, []}
],
BaseMinirest = #{ BaseMinirest = #{
base_path => emqx_dashboard_swagger:base_path(), base_path => emqx_dashboard_swagger:base_path(),
modules => minirest_api:find_api_modules(apps()), modules => minirest_api:find_api_modules(apps()),
authorization => Authorization, authorization => Authorization,
security => [#{'basicAuth' => []}, #{'bearerAuth' => []}], security => [#{'basicAuth' => []}, #{'bearerAuth' => []}],
swagger_global_spec => GlobalSpec, swagger_global_spec => GlobalSpec,
dispatch => Dispatch, dispatch => dispatch(),
middlewares => [?EMQX_MIDDLE, cowboy_router, cowboy_handler] middlewares => [?EMQX_MIDDLE, cowboy_router, cowboy_handler]
}, },
{OkListeners, ErrListeners} = {OkListeners, ErrListeners} =
@ -259,3 +253,20 @@ ensure_ssl_cert(Listeners = #{https := Https0}) ->
Listeners#{https => maps:from_list(Https1)}; Listeners#{https => maps:from_list(Https1)};
ensure_ssl_cert(Listeners) -> ensure_ssl_cert(Listeners) ->
Listeners. Listeners.
dispatch() ->
static_dispatch() ++ dynamic_dispatch().
static_dispatch() ->
StaticFiles = ["/editor.worker.js", "/json.worker.js", "/version"],
[
{"/", cowboy_static, {priv_file, emqx_dashboard, "www/index.html"}},
{"/static/[...]", cowboy_static, {priv_dir, emqx_dashboard, "www/static"}}
] ++
[{Path, cowboy_static, {priv_file, emqx_dashboard, "www" ++ Path}} || Path <- StaticFiles].
dynamic_dispatch() ->
[
{emqx_mgmt_api_status:path(), emqx_mgmt_api_status, []},
{'_', emqx_dashboard_not_found, []}
].