fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming
2023-11-20 17:16:57 +08:00
parent a410a8f758 e2552f50be
commit 80a4e40748
6 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/upload/internal/config/config.go
View File

@@ -26,11 +26,9 @@ type Config struct {
Urls []string
}
AliyunOSS struct {
Endpoint string `json:"endpoint"`
AccessKeyId string `json:"access_key_id"`
AccessKeySecret string `json:"access_key_secret"`
BucketName string `json:"bucket_name"`
BucketUrl string `json:"bucket_url"`
BasePath string `json:"base_path"`
AccessKeyId string
AccessKeySecret string
BasePath string
Endpoint string
}
}

6
server/upload/internal/logic/uploadfilebackendlogic.go
View File

@@ -110,14 +110,12 @@ func (l *UploadFileBackendLogic) UploadFileBackend(req *types.UploadFileBackendR
// 是否备份--异步任务
if req.BackupType != "" {
upload.UploadType = "oss"
upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint
upload.AliyunOSS.AccessKeyId = l.svcCtx.Config.AliyunOSS.AccessKeyId
upload.AliyunOSS.AccessKeySecret = l.svcCtx.Config.AliyunOSS.AccessKeySecret
upload.AliyunOSS.BucketName = l.svcCtx.Config.AliyunOSS.BucketName
upload.AliyunOSS.BucketUrl = l.svcCtx.Config.AliyunOSS.BucketUrl
upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint
upload.AliyunOSS.BasePath = l.svcCtx.Config.AliyunOSS.BasePath
time.AfterFunc(time.Second*1, func() {
err = upload.UploadFileByUrl(resourceId, uploadRes.ResourceUrl)
err = upload.UploadFileByUrl(resourceId, uploadRes.ResourceUrl, req.UploadBucket)
})
}

6
server/upload/internal/logic/uploadfilebaselogic.go
View File

@@ -92,14 +92,12 @@ func (l *UploadFileBaseLogic) UploadFileBase(req *types.UploadFileBaseReq, useri
// 是否备份--异步任务
if req.BackupType != "" {
upload.UploadType = "oss"
upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint
upload.AliyunOSS.AccessKeyId = l.svcCtx.Config.AliyunOSS.AccessKeyId
upload.AliyunOSS.AccessKeySecret = l.svcCtx.Config.AliyunOSS.AccessKeySecret
upload.AliyunOSS.BucketName = l.svcCtx.Config.AliyunOSS.BucketName
upload.AliyunOSS.BucketUrl = l.svcCtx.Config.AliyunOSS.BucketUrl
upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint
upload.AliyunOSS.BasePath = l.svcCtx.Config.AliyunOSS.BasePath
time.AfterFunc(time.Second*1, func() {
err = upload.UploadFileByUrl(resourceId, uploadRes.ResourceUrl)
err = upload.UploadFileByUrl(resourceId, uploadRes.ResourceUrl, req.UploadBucket)
})
}