improve package gres

os/gres/gres_resource.go

@@ -1,4 +1,4 @@
-// Copyright 2019 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
 //
 // This Source Code Form is subject to the terms of the MIT License.
 // If a copy of the MIT was not distributed with this file,
@@ -74,6 +74,7 @@ func (r *Resource) Get(path string) *File {
 		return nil
 	}
 	path = strings.Replace(path, "\\", "/", -1)
+	path = strings.Replace(path, "//", "/", -1)
 	if path != "/" {
 		for path[len(path)-1] == '/' {
 			path = path[:len(path)-1]
@@ -93,6 +94,7 @@ func (r *Resource) Get(path string) *File {
 func (r *Resource) GetWithIndex(path string, indexFiles []string) *File {
 	// Necessary for double char '/' replacement in prefix.
 	path = strings.Replace(path, "\\", "/", -1)
+	path = strings.Replace(path, "//", "/", -1)
 	if path != "/" {
 		for path[len(path)-1] == '/' {
 			path = path[:len(path)-1]
@@ -114,7 +116,6 @@ func (r *Resource) GetWithIndex(path string, indexFiles []string) *File {
 
 // GetContent directly returns the content of <path>.
 func (r *Resource) GetContent(path string) []byte {
-	path = strings.Replace(path, "\\", "/", -1)
 	file := r.Get(path)
 	if file != nil {
 		return file.Content()
@@ -169,6 +170,7 @@ func (r *Resource) ScanDirFile(path string, pattern string, recursive ...bool) [
 // It scans directory recursively if given parameter <recursive> is true.
 func (r *Resource) doScanDir(path string, pattern string, recursive bool, onlyFile bool) []*File {
 	path = strings.Replace(path, "\\", "/", -1)
+	path = strings.Replace(path, "//", "/", -1)
 	if path != "/" {
 		for path[len(path)-1] == '/' {
 			path = path[:len(path)-1]

os/gres/gres_z_unit_2_test.go

@@ -1,4 +1,4 @@
-// Copyright 2019 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
 //
 // This Source Code Form is subject to the terms of the MIT License.
 // If a copy of the MIT was not distributed with this file,