上传文件调整
This commit is contained in:
parent
57416fffea
commit
7c8a8044c9
|
@ -90,6 +90,7 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er
|
||||||
|
|
||||||
// 是否强制刷新
|
// 是否强制刷新
|
||||||
var refresh bool
|
var refresh bool
|
||||||
|
|
||||||
if req.ResourceId != "" {
|
if req.ResourceId != "" {
|
||||||
resourceId = req.ResourceId
|
resourceId = req.ResourceId
|
||||||
}
|
}
|
||||||
|
@ -145,34 +146,23 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er
|
||||||
uploadBaseRes.ResourceUrl = url
|
uploadBaseRes.ResourceUrl = url
|
||||||
var version string = "0.0.1"
|
var version string = "0.0.1"
|
||||||
var nowTime = time.Now().UTC()
|
var nowTime = time.Now().UTC()
|
||||||
|
var dbData = gmodel.FsResource{
|
||||||
|
ResourceId: resourceId,
|
||||||
|
UserId: &req.UserId,
|
||||||
|
GuestId: &req.GuestId,
|
||||||
|
ResourceType: &contentType,
|
||||||
|
ResourceUrl: &url,
|
||||||
|
Version: &version,
|
||||||
|
UploadedAt: &nowTime,
|
||||||
|
Metadata: &metadataB,
|
||||||
|
ApiType: &apiType,
|
||||||
|
BucketName: bucketName,
|
||||||
|
Source: &req.Source,
|
||||||
|
}
|
||||||
if refresh {
|
if refresh {
|
||||||
err = tx.Save(&gmodel.FsResource{
|
err = tx.Save(&dbData).Error
|
||||||
ResourceId: resourceId,
|
|
||||||
UserId: &req.UserId,
|
|
||||||
GuestId: &req.GuestId,
|
|
||||||
ResourceType: &contentType,
|
|
||||||
ResourceUrl: &url,
|
|
||||||
Version: &version,
|
|
||||||
UploadedAt: &nowTime,
|
|
||||||
Metadata: &metadataB,
|
|
||||||
ApiType: &apiType,
|
|
||||||
BucketName: bucketName,
|
|
||||||
Source: &req.Source,
|
|
||||||
}).Error
|
|
||||||
} else {
|
} else {
|
||||||
err = tx.Create(&gmodel.FsResource{
|
err = tx.Create(&dbData).Error
|
||||||
ResourceId: resourceId,
|
|
||||||
UserId: &req.UserId,
|
|
||||||
GuestId: &req.GuestId,
|
|
||||||
ResourceType: &contentType,
|
|
||||||
ResourceUrl: &url,
|
|
||||||
Version: &version,
|
|
||||||
UploadedAt: &nowTime,
|
|
||||||
Metadata: &metadataB,
|
|
||||||
ApiType: &apiType,
|
|
||||||
BucketName: bucketName,
|
|
||||||
Source: &req.Source,
|
|
||||||
}).Error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -275,34 +265,23 @@ func (upload *Upload) UploadFileByByte(req *UploadBaseReq) (*UploadBaseRes, erro
|
||||||
uploadBaseRes.ResourceUrl = url
|
uploadBaseRes.ResourceUrl = url
|
||||||
var version string = "0.0.1"
|
var version string = "0.0.1"
|
||||||
var nowTime = time.Now().UTC()
|
var nowTime = time.Now().UTC()
|
||||||
|
var dbData = gmodel.FsResource{
|
||||||
|
ResourceId: resourceId,
|
||||||
|
UserId: &req.UserId,
|
||||||
|
GuestId: &req.GuestId,
|
||||||
|
ResourceType: &contentType,
|
||||||
|
ResourceUrl: &url,
|
||||||
|
Version: &version,
|
||||||
|
UploadedAt: &nowTime,
|
||||||
|
Metadata: &metadataB,
|
||||||
|
ApiType: &apiType,
|
||||||
|
BucketName: bucketName,
|
||||||
|
Source: &req.Source,
|
||||||
|
}
|
||||||
if refresh {
|
if refresh {
|
||||||
err = tx.Save(&gmodel.FsResource{
|
err = tx.Save(&dbData).Error
|
||||||
ResourceId: resourceId,
|
|
||||||
UserId: &req.UserId,
|
|
||||||
GuestId: &req.GuestId,
|
|
||||||
ResourceType: &contentType,
|
|
||||||
ResourceUrl: &url,
|
|
||||||
Version: &version,
|
|
||||||
UploadedAt: &nowTime,
|
|
||||||
Metadata: &metadataB,
|
|
||||||
ApiType: &apiType,
|
|
||||||
BucketName: bucketName,
|
|
||||||
Source: &req.Source,
|
|
||||||
}).Error
|
|
||||||
} else {
|
} else {
|
||||||
err = tx.Create(&gmodel.FsResource{
|
err = tx.Create(&dbData).Error
|
||||||
ResourceId: resourceId,
|
|
||||||
UserId: &req.UserId,
|
|
||||||
GuestId: &req.GuestId,
|
|
||||||
ResourceType: &contentType,
|
|
||||||
ResourceUrl: &url,
|
|
||||||
Version: &version,
|
|
||||||
UploadedAt: &nowTime,
|
|
||||||
Metadata: &metadataB,
|
|
||||||
ApiType: &apiType,
|
|
||||||
BucketName: bucketName,
|
|
||||||
Source: &req.Source,
|
|
||||||
}).Error
|
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logx.Errorf("err:%+v,desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
|
logx.Errorf("err:%+v,desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user