From 5444cb5188872abcdd0a514bfc4fda82e47ce8d9 Mon Sep 17 00:00:00 2001 From: liuzhihang1 <1625167628@qq.com> Date: Fri, 7 Feb 2025 09:44:53 +0000 Subject: [PATCH] optimal resouces --- internal/app/route/route.go | 17 +++++++---------- resources/resources.go | 6 ++++++ .../templates/css/about.0de78886.css | 0 .../templates/css/app.254f733a.css | 0 .../templates/css/chunk-vendors.965b2fe9.css | 0 .../route => resources}/templates/favicon.ico | Bin .../fonts/MaterialIcons-Regular.4f3ab3a1.eot | Bin .../fonts/MaterialIcons-Regular.53ae192b.woff2 | Bin .../fonts/MaterialIcons-Regular.73676d33.ttf | Bin .../fonts/MaterialIcons-Regular.86426dd8.woff | Bin .../fonts/fa-brands-400.0e53fe4f.woff | Bin .../fonts/fa-brands-400.7edea186.woff2 | Bin .../templates/fonts/fa-brands-400.9c02eaf6.ttf | Bin .../templates/fonts/fa-brands-400.b2970adc.eot | Bin .../fonts/fa-regular-400.04dd5282.woff | Bin .../fonts/fa-regular-400.7346017c.ttf | Bin .../fonts/fa-regular-400.a0140e7c.eot | Bin .../fonts/fa-regular-400.e2b3a9dc.woff2 | Bin .../fonts/fa-solid-900.620019ed.woff2 | Bin .../templates/fonts/fa-solid-900.974801a4.eot | Bin .../templates/fonts/fa-solid-900.d5b0a356.ttf | Bin .../templates/fonts/fa-solid-900.e67670b0.woff | Bin .../materialdesignicons-webfont.0766edc9.eot | Bin .../materialdesignicons-webfont.714a4eee.ttf | Bin .../materialdesignicons-webfont.e659bf56.woff | Bin .../materialdesignicons-webfont.fbaef2a9.woff2 | Bin .../templates/img/fa-brands-400.a76d53bf.svg | 0 .../templates/img/fa-regular-400.ee37fbcc.svg | 0 .../templates/img/fa-solid-900.cd7322bf.svg | 0 .../route => resources}/templates/index.html | 0 .../templates/js/about.59baee17.js | 0 .../templates/js/app.6d305a90.js | 0 .../templates/js/chunk-vendors.5b52f07b.js | 0 33 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 resources/resources.go rename {internal/app/route => resources}/templates/css/about.0de78886.css (100%) rename {internal/app/route => resources}/templates/css/app.254f733a.css (100%) rename {internal/app/route => resources}/templates/css/chunk-vendors.965b2fe9.css (100%) rename {internal/app/route => resources}/templates/favicon.ico (100%) rename {internal/app/route => resources}/templates/fonts/MaterialIcons-Regular.4f3ab3a1.eot (100%) rename {internal/app/route => resources}/templates/fonts/MaterialIcons-Regular.53ae192b.woff2 (100%) rename {internal/app/route => resources}/templates/fonts/MaterialIcons-Regular.73676d33.ttf (100%) rename {internal/app/route => resources}/templates/fonts/MaterialIcons-Regular.86426dd8.woff (100%) rename {internal/app/route => resources}/templates/fonts/fa-brands-400.0e53fe4f.woff (100%) rename {internal/app/route => resources}/templates/fonts/fa-brands-400.7edea186.woff2 (100%) rename {internal/app/route => resources}/templates/fonts/fa-brands-400.9c02eaf6.ttf (100%) rename {internal/app/route => resources}/templates/fonts/fa-brands-400.b2970adc.eot (100%) rename {internal/app/route => resources}/templates/fonts/fa-regular-400.04dd5282.woff (100%) rename {internal/app/route => resources}/templates/fonts/fa-regular-400.7346017c.ttf (100%) rename {internal/app/route => resources}/templates/fonts/fa-regular-400.a0140e7c.eot (100%) rename {internal/app/route => resources}/templates/fonts/fa-regular-400.e2b3a9dc.woff2 (100%) rename {internal/app/route => resources}/templates/fonts/fa-solid-900.620019ed.woff2 (100%) rename {internal/app/route => resources}/templates/fonts/fa-solid-900.974801a4.eot (100%) rename {internal/app/route => resources}/templates/fonts/fa-solid-900.d5b0a356.ttf (100%) rename {internal/app/route => resources}/templates/fonts/fa-solid-900.e67670b0.woff (100%) rename {internal/app/route => resources}/templates/fonts/materialdesignicons-webfont.0766edc9.eot (100%) rename {internal/app/route => resources}/templates/fonts/materialdesignicons-webfont.714a4eee.ttf (100%) rename {internal/app/route => resources}/templates/fonts/materialdesignicons-webfont.e659bf56.woff (100%) rename {internal/app/route => resources}/templates/fonts/materialdesignicons-webfont.fbaef2a9.woff2 (100%) rename {internal/app/route => resources}/templates/img/fa-brands-400.a76d53bf.svg (100%) rename {internal/app/route => resources}/templates/img/fa-regular-400.ee37fbcc.svg (100%) rename {internal/app/route => resources}/templates/img/fa-solid-900.cd7322bf.svg (100%) rename {internal/app/route => resources}/templates/index.html (100%) rename {internal/app/route => resources}/templates/js/about.59baee17.js (100%) rename {internal/app/route => resources}/templates/js/app.6d305a90.js (100%) rename {internal/app/route => resources}/templates/js/chunk-vendors.5b52f07b.js (100%) diff --git a/internal/app/route/route.go b/internal/app/route/route.go index 3bf9ec6..188066b 100644 --- a/internal/app/route/route.go +++ b/internal/app/route/route.go @@ -1,7 +1,6 @@ package route import ( - "embed" "io/fs" "net/http" @@ -10,6 +9,7 @@ import ( "github.com/lzh-1625/go_process_manager/internal/app/constants" "github.com/lzh-1625/go_process_manager/internal/app/middle" "github.com/lzh-1625/go_process_manager/log" + "github.com/lzh-1625/go_process_manager/resources" "github.com/lzh-1625/go_process_manager/utils" "github.com/gin-contrib/pprof" @@ -29,20 +29,17 @@ func Route() { log.Logger.Fatalw("服务器启动失败", "err", err) } -//go:embed templates -var f embed.FS - func staticInit(r *gin.Engine) { r.NoRoute(func(c *gin.Context) { - b, _ := f.ReadFile("templates/index.html") + b, _ := resources.Templates.ReadFile("templates/index.html") c.Data(http.StatusOK, "text/html; charset=utf-8", b) }) - r.StaticFS("/js", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/js")))) - r.StaticFS("/css", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/css")))) - r.StaticFS("/media", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/media")))) - r.StaticFS("/fonts", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/fonts")))) + r.StaticFS("/js", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/js")))) + r.StaticFS("/css", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/css")))) + r.StaticFS("/media", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/media")))) + r.StaticFS("/fonts", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/fonts")))) r.GET("/favicon.ico", func(ctx *gin.Context) { - ctx.Data(200, "image/x-icon", utils.UnwarpIgnore(f.ReadFile("templates/favicon.ico"))) + ctx.Data(200, "image/x-icon", utils.UnwarpIgnore(resources.Templates.ReadFile("templates/favicon.ico"))) }) } diff --git a/resources/resources.go b/resources/resources.go new file mode 100644 index 0000000..9fd078f --- /dev/null +++ b/resources/resources.go @@ -0,0 +1,6 @@ +package resources + +import "embed" + +//go:embed templates +var Templates embed.FS diff --git a/internal/app/route/templates/css/about.0de78886.css b/resources/templates/css/about.0de78886.css similarity index 100% rename from internal/app/route/templates/css/about.0de78886.css rename to resources/templates/css/about.0de78886.css diff --git a/internal/app/route/templates/css/app.254f733a.css b/resources/templates/css/app.254f733a.css similarity index 100% rename from internal/app/route/templates/css/app.254f733a.css rename to resources/templates/css/app.254f733a.css diff --git a/internal/app/route/templates/css/chunk-vendors.965b2fe9.css b/resources/templates/css/chunk-vendors.965b2fe9.css similarity index 100% rename from internal/app/route/templates/css/chunk-vendors.965b2fe9.css rename to resources/templates/css/chunk-vendors.965b2fe9.css diff --git a/internal/app/route/templates/favicon.ico b/resources/templates/favicon.ico similarity index 100% rename from internal/app/route/templates/favicon.ico rename to resources/templates/favicon.ico diff --git a/internal/app/route/templates/fonts/MaterialIcons-Regular.4f3ab3a1.eot b/resources/templates/fonts/MaterialIcons-Regular.4f3ab3a1.eot similarity index 100% rename from internal/app/route/templates/fonts/MaterialIcons-Regular.4f3ab3a1.eot rename to resources/templates/fonts/MaterialIcons-Regular.4f3ab3a1.eot diff --git a/internal/app/route/templates/fonts/MaterialIcons-Regular.53ae192b.woff2 b/resources/templates/fonts/MaterialIcons-Regular.53ae192b.woff2 similarity index 100% rename from internal/app/route/templates/fonts/MaterialIcons-Regular.53ae192b.woff2 rename to resources/templates/fonts/MaterialIcons-Regular.53ae192b.woff2 diff --git a/internal/app/route/templates/fonts/MaterialIcons-Regular.73676d33.ttf b/resources/templates/fonts/MaterialIcons-Regular.73676d33.ttf similarity index 100% rename from internal/app/route/templates/fonts/MaterialIcons-Regular.73676d33.ttf rename to resources/templates/fonts/MaterialIcons-Regular.73676d33.ttf diff --git a/internal/app/route/templates/fonts/MaterialIcons-Regular.86426dd8.woff b/resources/templates/fonts/MaterialIcons-Regular.86426dd8.woff similarity index 100% rename from internal/app/route/templates/fonts/MaterialIcons-Regular.86426dd8.woff rename to resources/templates/fonts/MaterialIcons-Regular.86426dd8.woff diff --git a/internal/app/route/templates/fonts/fa-brands-400.0e53fe4f.woff b/resources/templates/fonts/fa-brands-400.0e53fe4f.woff similarity index 100% rename from internal/app/route/templates/fonts/fa-brands-400.0e53fe4f.woff rename to resources/templates/fonts/fa-brands-400.0e53fe4f.woff diff --git a/internal/app/route/templates/fonts/fa-brands-400.7edea186.woff2 b/resources/templates/fonts/fa-brands-400.7edea186.woff2 similarity index 100% rename from internal/app/route/templates/fonts/fa-brands-400.7edea186.woff2 rename to resources/templates/fonts/fa-brands-400.7edea186.woff2 diff --git a/internal/app/route/templates/fonts/fa-brands-400.9c02eaf6.ttf b/resources/templates/fonts/fa-brands-400.9c02eaf6.ttf similarity index 100% rename from internal/app/route/templates/fonts/fa-brands-400.9c02eaf6.ttf rename to resources/templates/fonts/fa-brands-400.9c02eaf6.ttf diff --git a/internal/app/route/templates/fonts/fa-brands-400.b2970adc.eot b/resources/templates/fonts/fa-brands-400.b2970adc.eot similarity index 100% rename from internal/app/route/templates/fonts/fa-brands-400.b2970adc.eot rename to resources/templates/fonts/fa-brands-400.b2970adc.eot diff --git a/internal/app/route/templates/fonts/fa-regular-400.04dd5282.woff b/resources/templates/fonts/fa-regular-400.04dd5282.woff similarity index 100% rename from internal/app/route/templates/fonts/fa-regular-400.04dd5282.woff rename to resources/templates/fonts/fa-regular-400.04dd5282.woff diff --git a/internal/app/route/templates/fonts/fa-regular-400.7346017c.ttf b/resources/templates/fonts/fa-regular-400.7346017c.ttf similarity index 100% rename from internal/app/route/templates/fonts/fa-regular-400.7346017c.ttf rename to resources/templates/fonts/fa-regular-400.7346017c.ttf diff --git a/internal/app/route/templates/fonts/fa-regular-400.a0140e7c.eot b/resources/templates/fonts/fa-regular-400.a0140e7c.eot similarity index 100% rename from internal/app/route/templates/fonts/fa-regular-400.a0140e7c.eot rename to resources/templates/fonts/fa-regular-400.a0140e7c.eot diff --git a/internal/app/route/templates/fonts/fa-regular-400.e2b3a9dc.woff2 b/resources/templates/fonts/fa-regular-400.e2b3a9dc.woff2 similarity index 100% rename from internal/app/route/templates/fonts/fa-regular-400.e2b3a9dc.woff2 rename to resources/templates/fonts/fa-regular-400.e2b3a9dc.woff2 diff --git a/internal/app/route/templates/fonts/fa-solid-900.620019ed.woff2 b/resources/templates/fonts/fa-solid-900.620019ed.woff2 similarity index 100% rename from internal/app/route/templates/fonts/fa-solid-900.620019ed.woff2 rename to resources/templates/fonts/fa-solid-900.620019ed.woff2 diff --git a/internal/app/route/templates/fonts/fa-solid-900.974801a4.eot b/resources/templates/fonts/fa-solid-900.974801a4.eot similarity index 100% rename from internal/app/route/templates/fonts/fa-solid-900.974801a4.eot rename to resources/templates/fonts/fa-solid-900.974801a4.eot diff --git a/internal/app/route/templates/fonts/fa-solid-900.d5b0a356.ttf b/resources/templates/fonts/fa-solid-900.d5b0a356.ttf similarity index 100% rename from internal/app/route/templates/fonts/fa-solid-900.d5b0a356.ttf rename to resources/templates/fonts/fa-solid-900.d5b0a356.ttf diff --git a/internal/app/route/templates/fonts/fa-solid-900.e67670b0.woff b/resources/templates/fonts/fa-solid-900.e67670b0.woff similarity index 100% rename from internal/app/route/templates/fonts/fa-solid-900.e67670b0.woff rename to resources/templates/fonts/fa-solid-900.e67670b0.woff diff --git a/internal/app/route/templates/fonts/materialdesignicons-webfont.0766edc9.eot b/resources/templates/fonts/materialdesignicons-webfont.0766edc9.eot similarity index 100% rename from internal/app/route/templates/fonts/materialdesignicons-webfont.0766edc9.eot rename to resources/templates/fonts/materialdesignicons-webfont.0766edc9.eot diff --git a/internal/app/route/templates/fonts/materialdesignicons-webfont.714a4eee.ttf b/resources/templates/fonts/materialdesignicons-webfont.714a4eee.ttf similarity index 100% rename from internal/app/route/templates/fonts/materialdesignicons-webfont.714a4eee.ttf rename to resources/templates/fonts/materialdesignicons-webfont.714a4eee.ttf diff --git a/internal/app/route/templates/fonts/materialdesignicons-webfont.e659bf56.woff b/resources/templates/fonts/materialdesignicons-webfont.e659bf56.woff similarity index 100% rename from internal/app/route/templates/fonts/materialdesignicons-webfont.e659bf56.woff rename to resources/templates/fonts/materialdesignicons-webfont.e659bf56.woff diff --git a/internal/app/route/templates/fonts/materialdesignicons-webfont.fbaef2a9.woff2 b/resources/templates/fonts/materialdesignicons-webfont.fbaef2a9.woff2 similarity index 100% rename from internal/app/route/templates/fonts/materialdesignicons-webfont.fbaef2a9.woff2 rename to resources/templates/fonts/materialdesignicons-webfont.fbaef2a9.woff2 diff --git a/internal/app/route/templates/img/fa-brands-400.a76d53bf.svg b/resources/templates/img/fa-brands-400.a76d53bf.svg similarity index 100% rename from internal/app/route/templates/img/fa-brands-400.a76d53bf.svg rename to resources/templates/img/fa-brands-400.a76d53bf.svg diff --git a/internal/app/route/templates/img/fa-regular-400.ee37fbcc.svg b/resources/templates/img/fa-regular-400.ee37fbcc.svg similarity index 100% rename from internal/app/route/templates/img/fa-regular-400.ee37fbcc.svg rename to resources/templates/img/fa-regular-400.ee37fbcc.svg diff --git a/internal/app/route/templates/img/fa-solid-900.cd7322bf.svg b/resources/templates/img/fa-solid-900.cd7322bf.svg similarity index 100% rename from internal/app/route/templates/img/fa-solid-900.cd7322bf.svg rename to resources/templates/img/fa-solid-900.cd7322bf.svg diff --git a/internal/app/route/templates/index.html b/resources/templates/index.html similarity index 100% rename from internal/app/route/templates/index.html rename to resources/templates/index.html diff --git a/internal/app/route/templates/js/about.59baee17.js b/resources/templates/js/about.59baee17.js similarity index 100% rename from internal/app/route/templates/js/about.59baee17.js rename to resources/templates/js/about.59baee17.js diff --git a/internal/app/route/templates/js/app.6d305a90.js b/resources/templates/js/app.6d305a90.js similarity index 100% rename from internal/app/route/templates/js/app.6d305a90.js rename to resources/templates/js/app.6d305a90.js diff --git a/internal/app/route/templates/js/chunk-vendors.5b52f07b.js b/resources/templates/js/chunk-vendors.5b52f07b.js similarity index 100% rename from internal/app/route/templates/js/chunk-vendors.5b52f07b.js rename to resources/templates/js/chunk-vendors.5b52f07b.js