diff --git a/assets/assets.go b/assets/assets.go index f433b0e2..721c2f6c 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -40,6 +40,9 @@ func Load(path string) { } } -func Register(fs fs.FS) { - content = fs +func Register(fileSystem fs.FS) { + subFs, err := fs.Sub(fileSystem, "static") + if err == nil { + content = subFs + } } diff --git a/assets/frpc/embed.go b/assets/frpc/embed.go index c2404fdc..3fc0d3a5 100644 --- a/assets/frpc/embed.go +++ b/assets/frpc/embed.go @@ -6,7 +6,7 @@ import ( "github.com/fatedier/frp/assets" ) -//go:embed * +//go:embed static/* var content embed.FS func init() { diff --git a/assets/frpc/535877f50039c0cb49a6196a5b7517cd.woff b/assets/frpc/static/535877f50039c0cb49a6196a5b7517cd.woff similarity index 100% rename from assets/frpc/535877f50039c0cb49a6196a5b7517cd.woff rename to assets/frpc/static/535877f50039c0cb49a6196a5b7517cd.woff diff --git a/assets/frpc/732389ded34cb9c52dd88271f1345af9.ttf b/assets/frpc/static/732389ded34cb9c52dd88271f1345af9.ttf similarity index 100% rename from assets/frpc/732389ded34cb9c52dd88271f1345af9.ttf rename to assets/frpc/static/732389ded34cb9c52dd88271f1345af9.ttf diff --git a/assets/frpc/favicon.ico b/assets/frpc/static/favicon.ico similarity index 100% rename from assets/frpc/favicon.ico rename to assets/frpc/static/favicon.ico diff --git a/assets/frpc/index.html b/assets/frpc/static/index.html similarity index 100% rename from assets/frpc/index.html rename to assets/frpc/static/index.html diff --git a/assets/frpc/manifest.js b/assets/frpc/static/manifest.js similarity index 100% rename from assets/frpc/manifest.js rename to assets/frpc/static/manifest.js diff --git a/assets/frpc/vendor.js b/assets/frpc/static/vendor.js similarity index 100% rename from assets/frpc/vendor.js rename to assets/frpc/static/vendor.js diff --git a/assets/frps/embed.go b/assets/frps/embed.go index c2404fdc..3fc0d3a5 100644 --- a/assets/frps/embed.go +++ b/assets/frps/embed.go @@ -6,7 +6,7 @@ import ( "github.com/fatedier/frp/assets" ) -//go:embed * +//go:embed static/* var content embed.FS func init() { diff --git a/assets/frps/535877f50039c0cb49a6196a5b7517cd.woff b/assets/frps/static/535877f50039c0cb49a6196a5b7517cd.woff similarity index 100% rename from assets/frps/535877f50039c0cb49a6196a5b7517cd.woff rename to assets/frps/static/535877f50039c0cb49a6196a5b7517cd.woff diff --git a/assets/frps/732389ded34cb9c52dd88271f1345af9.ttf b/assets/frps/static/732389ded34cb9c52dd88271f1345af9.ttf similarity index 100% rename from assets/frps/732389ded34cb9c52dd88271f1345af9.ttf rename to assets/frps/static/732389ded34cb9c52dd88271f1345af9.ttf diff --git a/assets/frps/favicon.ico b/assets/frps/static/favicon.ico similarity index 100% rename from assets/frps/favicon.ico rename to assets/frps/static/favicon.ico diff --git a/assets/frps/index.html b/assets/frps/static/index.html similarity index 100% rename from assets/frps/index.html rename to assets/frps/static/index.html diff --git a/assets/frps/manifest.js b/assets/frps/static/manifest.js similarity index 100% rename from assets/frps/manifest.js rename to assets/frps/static/manifest.js diff --git a/assets/frps/vendor.js b/assets/frps/static/vendor.js similarity index 100% rename from assets/frps/vendor.js rename to assets/frps/static/vendor.js