fix: use path.Clean replace filepath.Clean

Author: tonny-zhang

router_static.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"path/filepath"
+	"path"
 	"strings"
 
 	"github.com/tonny-zhang/cotton/utils"
@@ -50,7 +50,7 @@ func (router *Router) StaticFile(prefix, root string, listDir bool) {
 	if !listDir {
 		fs = &onlyFilesFS{fs}
 	}
-	fileServer := http.StripPrefix(filepath.Join(router.prefix, prefix), http.FileServer(fs))
+	fileServer := http.StripPrefix(path.Join(router.prefix, prefix), http.FileServer(fs))
 
 	router.Get(utils.CleanPath(prefix+"/*filepath"), func(ctx *Context) {
 		fileServer.ServeHTTP(ctx.Response, ctx.Request)

router_template.go

@@ -1,14 +1,14 @@
 package cotton
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
 )
 
 func getTplFiles(dir string, ext string) (list []string, err error) {
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	for _, f := range files {
 		if strings.HasPrefix(f.Name(), ".") {
 			continue
@@ -32,11 +32,12 @@ func getTplFiles(dir string, ext string) (list []string, err error) {
 //
 // funcs is functions register to template
 // example:
-// 	router.LoadTemplates(root, map[string]interface{}{
-// 		"md5": func(str string) string {
-// 			return str + "_md5"
-// 		},
-// 	})
+//
+//	router.LoadTemplates(root, map[string]interface{}{
+//		"md5": func(str string) string {
+//			return str + "_md5"
+//		},
+//	})
 func (router *Router) LoadTemplates(tplRoot string, funcs map[string]interface{}) {
 	if router.globalTemplate == nil {
 		tpl := template.New("global")

utils/path.go

@@ -1,18 +1,19 @@
 package utils
 
 import (
-	"path/filepath"
+	libPath "path"
 	"strings"
 )
 
 // CleanPath clean path
 // example:
-// 		/a////b => /a/b
-// 		/a/b////c/ => /a/b/c/
+//
+//	/a////b => /a/b
+//	/a/b////c/ => /a/b/c/
 func CleanPath(path string) string {
 	suffix := ""
 	if strings.HasSuffix(path, "/") {
 		suffix = "/"
 	}
-	return filepath.Clean(path) + suffix
+	return libPath.Clean(path) + suffix
 }