merge main into dev

This commit is contained in:
ari melody 2024-11-01 19:43:05 +00:00
commit 819ec891e7
Signed by: ari
GPG key ID: CF99829C92678188
22 changed files with 214 additions and 223 deletions

View file

@ -13,7 +13,7 @@ import (
"arimelody-web/admin"
"arimelody-web/api"
"arimelody-web/global"
musicView "arimelody-web/music/view"
"arimelody-web/view"
"arimelody-web/templates"
"github.com/jmoiron/sqlx"
@ -210,7 +210,7 @@ func createServeMux() *http.ServeMux {
mux.Handle("/admin/", http.StripPrefix("/admin", admin.Handler()))
mux.Handle("/api/", http.StripPrefix("/api", api.Handler()))
mux.Handle("/music/", http.StripPrefix("/music", musicView.Handler()))
mux.Handle("/music/", http.StripPrefix("/music", view.MusicHandler()))
mux.Handle("/uploads/", http.StripPrefix("/uploads", staticHandler("uploads")))
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {