estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V2.5.2beta (#1101)

Browse Source 
* fix: zap无法在运行时进行切割日志, config.docker.yaml与config.yaml同步 #1094

* feat: 为定时任务增加秒级控制

* feat: 调整代码结构，err更改为后置

* css 样式调整

Co-authored-by: SliverHorn <503551462@qq.com>
Co-authored-by: songzhibin97 <718428482@qq.com>
This commit is contained in:
奇淼（piexlmax
2022-05-28 19:22:23 +08:00
committed by GitHub
parent b25c128051
commit 83141b3564
49 changed files with 490 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/utils/breakpoint_continue.go
View File

@@ -22,14 +22,14 @@ const (
//@param: content []byte, fileName string, contentNumber int, contentTotal int, fileMd5 string
//@return: error, string
func BreakPointContinue(content []byte, fileName string, contentNumber int, contentTotal int, fileMd5 string) (error, string) {
func BreakPointContinue(content []byte, fileName string, contentNumber int, contentTotal int, fileMd5 string) (string, error) {
path := breakpointDir + fileMd5 + "/"
err := os.MkdirAll(path, os.ModePerm)
if err != nil {
return err, path
return path, err
}
err, pathc := makeFileContent(content, fileName, path, contentNumber)
return err, pathc
pathC, err := makeFileContent(content, fileName, path, contentNumber)
return pathC, err
}
//@author: [piexlmax](https://github.com/piexlmax)
@@ -51,21 +51,21 @@ func CheckMd5(content []byte, chunkMd5 string) (CanUpload bool) {
//@function: makeFileContent
//@description: 创建切片内容
//@param: content []byte, fileName string, FileDir string, contentNumber int
//@return: error, string
//@return: string, error
func makeFileContent(content []byte, fileName string, FileDir string, contentNumber int) (error, string) {
func makeFileContent(content []byte, fileName string, FileDir string, contentNumber int) (string, error) {
path := FileDir + fileName + "_" + strconv.Itoa(contentNumber)
f, err := os.Create(path)
if err != nil {
return err, path
return path, err
} else {
_, err = f.Write(content)
if err != nil {
return err, path
return path, err
}
}
defer f.Close()
return nil, path
return path, nil
}
//@author: [piexlmax](https://github.com/piexlmax)
@@ -74,15 +74,15 @@ func makeFileContent(content []byte, fileName string, FileDir string, contentNum
//@param: fileName string, FileMd5 string
//@return: error, string
func MakeFile(fileName string, FileMd5 string) (error, string) {
func MakeFile(fileName string, FileMd5 string) (string, error) {
rd, err := ioutil.ReadDir(breakpointDir + FileMd5)
if err != nil {
return err, finishDir + fileName
return finishDir + fileName, err
}
_ = os.MkdirAll(finishDir, os.ModePerm)
fd, err := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0o644)
if err != nil {
return err, finishDir + fileName
return finishDir + fileName, err
}
defer fd.Close()
for k := range rd {
@@ -90,10 +90,10 @@ func MakeFile(fileName string, FileMd5 string) (error, string) {
_, err = fd.Write(content)
if err != nil {
_ = os.Remove(finishDir + fileName)
return err, finishDir + fileName
return finishDir + fileName, err
}
}
return nil, finishDir + fileName
return finishDir + fileName, nil
}
//@author: [piexlmax](https://github.com/piexlmax)