hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 上传文件判断

Browse Source
This commit is contained in:
yxh 2025-06-25 22:30:39 +08:00
parent bc8a3be3bc
commit b8de590d99
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/app/common/logic/upload/upload.go
View File

@ -16,6 +16,7 @@ import (
"github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/text/gregex" "github.com/gogf/gf/v2/text/gregex"
"github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
@ -73,14 +74,19 @@ func (s *sUpload) UploadFile(ctx context.Context,
existsFile, err = service.SysAttachment().GetByMd5(ctx, md5) existsFile, err = service.SysAttachment().GetByMd5(ctx, md5)
liberr.ErrIsNil(ctx, err, "获取文件信息失败") liberr.ErrIsNil(ctx, err, "获取文件信息失败")
if existsFile != nil { if existsFile != nil {
result = &model.UploadResponse{ if !gfile.Exists(g.Cfg().MustGet(ctx, "server.serverRoot").String() + "/" + existsFile.Path) {
Size: existsFile.Size, //文件不存在，删除sysAttachment表中不存在的条目
Path: existsFile.Path, _ = service.SysAttachment().Delete(ctx, []int64{existsFile.Id})
FullPath: libUtils.GetDomain(ctx, true) + "/" + existsFile.Path, } else {
Name: existsFile.Name, result = &model.UploadResponse{
Type: existsFile.MimeType, Size: existsFile.Size,
Path: existsFile.Path,
FullPath: libUtils.GetDomain(ctx, true) + "/" + existsFile.Path,
Name: existsFile.Name,
Type: existsFile.MimeType,
}
return
} }
return
} }
uploader := upload.GetUploader(upload.UploaderType(source)) uploader := upload.GetUploader(upload.UploaderType(source))
if uploader == nil { if uploader == nil {
@ -266,14 +272,19 @@ func (s *sUpload) CheckMultipart(ctx context.Context, req *model.CheckMultipartR
liberr.ErrIsNil(ctx, err, "获取文件信息失败") liberr.ErrIsNil(ctx, err, "获取文件信息失败")
res = new(model.CheckMultipartRes) res = new(model.CheckMultipartRes)
if existsFile != nil { if existsFile != nil {
res.Attachment = &model.UploadResponse{ if !gfile.Exists(g.Cfg().MustGet(ctx, "server.serverRoot").String() + "/" + existsFile.Path) {
Size: existsFile.Size, // 文件不存在，删除sysAttachment表中不存在的条目
Path: existsFile.Path, _ = service.SysAttachment().Delete(ctx, []int64{existsFile.Id})
FullPath: libUtils.GetDomain(ctx, true) + "/" + existsFile.Path, } else {
Name: existsFile.Name, res.Attachment = &model.UploadResponse{
Type: existsFile.MimeType, Size: existsFile.Size,
Path: existsFile.Path,
FullPath: libUtils.GetDomain(ctx, true) + "/" + existsFile.Path,
Name: existsFile.Name,
Type: existsFile.MimeType,
}
return
} }
return
} }
uploader := upload.GetUploader(upload.UploaderType(req.DriverType)) uploader := upload.GetUploader(upload.UploaderType(req.DriverType))

6
internal/app/common/model/common.go
View File

@ -9,9 +9,9 @@ package model
// PageReq 公共请求参数 // PageReq 公共请求参数
type PageReq struct { type PageReq struct {
DateRange []string `p:"dateRange"` //日期范围 DateRange []string `p:"dateRange"` //日期范围
PageNum int `p:"pageNum"` //当前页码 PageNum int `p:"pageNum"` //当前页码
PageSize int `p:"pageSize"` //每页数 PageSize int `p:"pageSize"` //每页数
OrderBy string `p:"orderBy" v:"regex:^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC)(?:\\s*,\\s*[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC))*$#排序参数不合法"` // 排序方式 OrderBy string `p:"orderBy" v:"regex:^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC)(?:\\s*,\\s*[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC))*$#排序参数不合法"` // 排序方式
} }