兼容window

fusikai · fusikai · commit eeb322dcf533 · 2023-05-05T14:22:09.000+08:00
diff --git a/api/apiv1/static/filesystem.go b/api/apiv1/static/filesystem.go
@@ -28,6 +28,8 @@ func (d Dir) Exists(name string) bool {
 	}
 	fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
 	fullName = strings.TrimPrefix(fullName, strings.TrimPrefix(Prefix, "/"))
+	fullName = strings.TrimPrefix(fullName, string(filepath.Separator))
+	fullName = strings.ReplaceAll(fullName, "\\", "/")
 	_, err := statikFS.Open(fullName)
 	return err == nil
 }
@@ -38,7 +40,10 @@ func (d Dir) Open(name string) (http.File, error) {
 	if dir == "" {
 		dir = "."
 	}
+
 	fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
 	fullName = strings.TrimPrefix(fullName, strings.TrimPrefix(Prefix, "/"))
+	fullName = strings.TrimPrefix(fullName, string(filepath.Separator))
+	fullName = strings.ReplaceAll(fullName, "\\", "/")
 	return statikFS.Open(fullName)
 }
diff --git a/assets/assets.go b/assets/assets.go
@@ -5,10 +5,12 @@ package assets
 
 import (
 	"net/http"
+	"path/filepath"
 )
 
 var AssetsEmbedded = false
 
 func Assets() (http.FileSystem, error) {
-	return http.Dir("./assets/dist"), nil
+	pathDir := filepath.Join(".", "assets", "dist")
+	return http.Dir(pathDir), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ func (d Dir) Exists(name string) bool {`
`28`	`28`	`}`
`29`	`29`	`fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))`
`30`	`30`	`fullName = strings.TrimPrefix(fullName, strings.TrimPrefix(Prefix, "/"))`
	`31`	`+ fullName = strings.TrimPrefix(fullName, string(filepath.Separator))`
	`32`	`+ fullName = strings.ReplaceAll(fullName, "\\", "/")`
`31`	`33`	`_, err := statikFS.Open(fullName)`
`32`	`34`	`return err == nil`
`33`	`35`	`}`
`@@ -38,7 +40,10 @@ func (d Dir) Open(name string) (http.File, error) {`
`38`	`40`	`if dir == "" {`
`39`	`41`	`dir = "."`
`40`	`42`	`}`
	`43`	`+`
`41`	`44`	`fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))`
`42`	`45`	`fullName = strings.TrimPrefix(fullName, strings.TrimPrefix(Prefix, "/"))`
	`46`	`+ fullName = strings.TrimPrefix(fullName, string(filepath.Separator))`
	`47`	`+ fullName = strings.ReplaceAll(fullName, "\\", "/")`
`43`	`48`	`return statikFS.Open(fullName)`
`44`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,12 @@ package assets`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"net/http"`
	`8`	`+ "path/filepath"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`var AssetsEmbedded = false`
`11`	`12`
`12`	`13`	`func Assets() (http.FileSystem, error) {`
`13`		`- return http.Dir("./assets/dist"), nil`
	`14`	`+ pathDir := filepath.Join(".", "assets", "dist")`
	`15`	`+ return http.Dir(pathDir), nil`
`14`	`16`	`}`