🐛 route conflict between web and pprof.

kamiertop · Mar 31, 2024 · 94db464 · 94db464
1 parent ab97f11
commit 94db464
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/internal/router/router.go b/internal/router/router.go
@@ -46,7 +46,7 @@ func initRouter(h *server.Hertz) {
 	})
 
 	h.GET("/", adaptor.NewHertzHTTPHandler(http.FileServer(http.FS(web.IndexHtml))))
-	h.GET("/*filepath", adaptor.NewHertzHTTPHandler(http.FileServerFS(web.Dist)))
+	h.GET("/static/*filepath", adaptor.NewHertzHTTPHandler(http.FileServerFS(web.Dist)))
 	h.POST("/ping", func(_ context.Context, c *app.RequestContext) {
 		var m map[string]any
 		if err := c.BindJSON(&m); err != nil {

diff --git a/web/embed.go b/web/embed.go
@@ -5,5 +5,5 @@ import "embed"
 //go:embed index.html
 var IndexHtml embed.FS
 
-//go:embed assets
+//go:embed static/assets/*
 var Dist embed.FS
diff --git a/web/index.html b/web/index.html
@@ -9,7 +9,7 @@
 </head>
 <body>
 	<div class="main">
-		<img id="go-img" src="assets/go-grow.png" alt="">
+		<img id="go-img" src="static/assets/go-grow.png" alt="">
 	</div>
 </body>
 <style>

diff --git a/web/assets/go-grow.png → web/static/assets/go-grow.png b/web/assets/go-grow.png → web/static/assets/go-grow.png