add hub theme & add more check for wcache close
This commit is contained in:
9
main.go
9
main.go
@@ -213,6 +213,8 @@ func loadEmbeddedPages(cfg *config.Config) (fs.FS, fs.FS, error) {
|
|||||||
pages, err = fs.Sub(pagesFS, "pages/classic")
|
pages, err = fs.Sub(pagesFS, "pages/classic")
|
||||||
case "mino":
|
case "mino":
|
||||||
pages, err = fs.Sub(pagesFS, "pages/mino")
|
pages, err = fs.Sub(pagesFS, "pages/mino")
|
||||||
|
case "hub":
|
||||||
|
pages, err = fs.Sub(pagesFS, "pages/hub")
|
||||||
default:
|
default:
|
||||||
pages, err = fs.Sub(pagesFS, "pages/design") // 默认主题
|
pages, err = fs.Sub(pagesFS, "pages/design") // 默认主题
|
||||||
logWarning("Invalid Pages Theme: %s, using default theme 'design'", cfg.Pages.Theme)
|
logWarning("Invalid Pages Theme: %s, using default theme 'design'", cfg.Pages.Theme)
|
||||||
@@ -294,7 +296,7 @@ func setInternalRoute(cfg *config.Config, r *server.Hertz) error {
|
|||||||
staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
|
staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
|
||||||
})
|
})
|
||||||
r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) {
|
r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) {
|
||||||
staticServer := http.FileServer(http.FS(pages))
|
staticServer := http.FileServer(http.FS(assets))
|
||||||
req, err := adaptor.GetCompatRequest(&c.Request)
|
req, err := adaptor.GetCompatRequest(&c.Request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logError("%s", err)
|
logError("%s", err)
|
||||||
@@ -510,8 +512,9 @@ func main() {
|
|||||||
http.ListenAndServe("localhost:6060", nil)
|
http.ListenAndServe("localhost:6060", nil)
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
if wcache != nil {
|
||||||
defer wcache.StopCleanup()
|
defer wcache.StopCleanup()
|
||||||
|
}
|
||||||
defer logger.Close()
|
defer logger.Close()
|
||||||
defer func() {
|
defer func() {
|
||||||
if hertZfile != nil {
|
if hertZfile != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user