perf: 优化简化静态资源引入

v03413 · Dec 1, 2024 · 3534d85 · 3534d85
1 parent 7260c60
commit 3534d85
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,8 +45,6 @@ jobs:
           go build -v -o ${{ env.BUILD_DIR }}/${{ env.APP_NAME }} -trimpath -ldflags "-s -w -buildid=" ./main
       - name: Prepare package
         run: |
-          cp -v -R ./templates ./${{ env.BUILD_DIR }}
-          cp -v -R ./static ./${{ env.BUILD_DIR }}
           cp -v ./docs/${{ env.APP_NAME }}.service ./${{ env.BUILD_DIR }}
           cp -v ./docs/Environment.conf ./${{ env.BUILD_DIR }}
           mv -v ./${{ env.BUILD_DIR }} ./${{ env.APP_NAME }}

diff --git a/Dockerfile b/Dockerfile
@@ -14,8 +14,6 @@ ENV TZ=Asia/Shanghai
 RUN apk add --no-cache tzdata ca-certificates
 
 COPY --from=builder /go/release/bepusdt /runtime/bepusdt
-ADD ./templates /runtime/templates
-ADD ./static /runtime/static
 
 # 设置时区
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

diff --git a/app/version.go b/app/version.go
@@ -1,4 +1,4 @@
 package app
 
 // Version 版本号说明 1.0.0 代表主版本号.功能版本号.修订号
-const Version = "1.13.32"
+const Version = "1.13.33"
diff --git a/app/web/web.go b/app/web/web.go
@@ -6,17 +6,26 @@ import (
 	"github.com/v03413/bepusdt/app/config"
 	"github.com/v03413/bepusdt/app/help"
 	"github.com/v03413/bepusdt/app/log"
+	"github.com/v03413/bepusdt/static"
+	"html/template"
+	"io/fs"
+	"net/http"
 )
 
 func Start() {
 	gin.SetMode(gin.ReleaseMode)
 
 	listen := config.GetListen()
 	r := gin.New()
-	r.Static("/img", config.GetStaticPath()+"img")
-	r.Static("/css", config.GetStaticPath()+"css")
-	r.Static("/js", config.GetStaticPath()+"js")
-	r.LoadHTMLGlob(config.GetTemplatePath())
+
+	// ----- 静态资源 -----
+	r.StaticFS("/img", http.FS(subFs(static.Img, "img")))
+	r.StaticFS("/css", http.FS(subFs(static.Css, "css")))
+	r.StaticFS("/js", http.FS(subFs(static.Js, "js")))
+	tmpl := template.Must(template.New("").ParseFS(static.Views, "views/*.html"))
+	r.SetHTMLTemplate(tmpl)
+	// ----- 静态资源 -----
+
 	r.Use(gin.LoggerWithWriter(log.GetWriter()), gin.Recovery())
 	r.Use(func(ctx *gin.Context) {
 		// 解析请求地址
@@ -91,3 +100,9 @@ func Start() {
 		}
 	}()
 }
+
+func subFs(src fs.FS, dir string) fs.FS {
+	subFS, _ := fs.Sub(src, dir)
+
+	return subFS
+}
diff --git a/static/embep.go b/static/embep.go
@@ -0,0 +1,17 @@
+package static
+
+import (
+	"embed"
+)
+
+//go:embed css/*
+var Css embed.FS
+
+//go:embed img/*
+var Img embed.FS
+
+//go:embed js/*
+var Js embed.FS
+
+//go:embed views/*
+var Views embed.FS
diff --git a/static/js/layer.min.js b/static/js/layer.min.js
diff --git a/static/js/layer/3.5.1/layer.min.js b/static/js/layer/3.5.1/layer.min.js
diff --git a/templates/index.html → static/views/index.html b/templates/index.html → static/views/index.html
diff --git a/templates/tron.trx.html → static/views/tron.trx.html b/templates/tron.trx.html → static/views/tron.trx.html
@@ -15,7 +15,7 @@
     <script src="/js/jquery.min.js"></script>
     <script src="/js/jquery.qrcode_1.0.min.js"></script>
     <script src="/js/clipboard.min.js"></script>
-    <script src="/js/layer/3.5.1/layer.min.js"></script>
+    <script src="/js/layer.min.js"></script>
 </head>
 <body>
 <div class="container">

diff --git a/templates/usdt.trc20.html → static/views/usdt.trc20.html b/templates/usdt.trc20.html → static/views/usdt.trc20.html
@@ -15,7 +15,7 @@
     <script src="/js/jquery.min.js"></script>
     <script src="/js/jquery.qrcode_1.0.min.js"></script>
     <script src="/js/clipboard.min.js"></script>
-    <script src="/js/layer/3.5.1/layer.min.js"></script>
+    <script src="/js/layer.min.js"></script>
 </head>
 <body>
 <div class="container">