bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-06 13:42:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve CORS feature for ghttp.Server

Browse Source
This commit is contained in:
John
2019-09-03 17:18:16 +08:00
parent e2906fba0b
commit cd00ac446b
10 changed files with 83 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
encoding/gcompress/gcompress_file.go
View File

@ -9,12 +9,13 @@ package gcompress
import (
"archive/zip"
"bytes"
"github.com/gogf/gf/os/gfile"
"github.com/gogf/gf/text/gstr"
"io"
"os"
"path/filepath"
"strings"
"github.com/gogf/gf/os/gfile"
"github.com/gogf/gf/text/gstr"
)
// ZipPath compresses <path> to <dest> using zip compressing algorithm.
@ -31,7 +32,7 @@ func ZipPath(path, dest string, prefix ...string) error {
// ZipPathWriter compresses <path> to <writer> using zip compressing algorithm.
// The unnecessary parameter <prefix> indicates the path prefix for zip file.
func ZipPathWriter(path string, writer io.Writer, prefix ...string) error {
pathRealPath, err := gfile.Search(path)
realPath, err := gfile.Search(path)
if err != nil {
return err
}
@ -45,8 +46,13 @@ func ZipPathWriter(path string, writer io.Writer, prefix ...string) error {
if len(prefix) > 0 {
headerPrefix = prefix[0]
}
headerPrefix = strings.Trim(headerPrefix, "\\/")
// If path is a directory, add it to the zip prefix.
if gfile.IsDir(realPath) {
headerPrefix = headerPrefix + "/" + gfile.Basename(realPath)
}
for _, file := range files {
err := zipFile(file, headerPrefix+gfile.Dir(file[len(pathRealPath):]), zipWriter)
err := zipFile(file, headerPrefix+gfile.Dir(file[len(realPath):]), zipWriter)
if err != nil {
return err
}