From d074a56b83b647f50871aa4057d1c2d624c3a63a Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 21 Nov 2023 14:33:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?3D=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A4=87=E4=BB=BD=E9=95=9C=E5=83=8F=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/internal/logic/resourcebackuplogic.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/resource/internal/logic/resourcebackuplogic.go b/server/resource/internal/logic/resourcebackuplogic.go index 3c9119ac..d4f0db08 100644 --- a/server/resource/internal/logic/resourcebackuplogic.go +++ b/server/resource/internal/logic/resourcebackuplogic.go @@ -7,7 +7,6 @@ import ( "fusenapi/utils/s3url_to_s3id" "regexp" "strings" - "time" "context" @@ -140,13 +139,10 @@ func (l *ResourceBackupLogic) ResourceBackup(req *types.ResourceBackupReq, useri upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint upload.AliyunOSS.BasePath = l.svcCtx.Config.AliyunOSS.BasePath for k, v := range urls { - var resourceId = k - time.AfterFunc(time.Second*1, func() { - err := upload.UploadFileByUrl(resourceId, v, 2) - if err != nil { - l.Logger.Errorf("更新文件镜像备份, err: %v, key: %v, val:%v", err, k, v) - } - }) + err := upload.UploadFileByUrl(k, v, 2) + if err != nil { + l.Logger.Errorf("更新文件镜像备份, err: %v, key: %v, val:%v", err, k, v) + } } return resp.SetStatus(basic.CodeOK) } From c1a164da7a1964f5409392e060d4fc7f0a64fc71 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 21 Nov 2023 14:34:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?3D=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A4=87=E4=BB=BD=E9=95=9C=E5=83=8F=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/internal/logic/resourcebackuplogic.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/resource/internal/logic/resourcebackuplogic.go b/server/resource/internal/logic/resourcebackuplogic.go index d4f0db08..3146e7ed 100644 --- a/server/resource/internal/logic/resourcebackuplogic.go +++ b/server/resource/internal/logic/resourcebackuplogic.go @@ -141,7 +141,9 @@ func (l *ResourceBackupLogic) ResourceBackup(req *types.ResourceBackupReq, useri for k, v := range urls { err := upload.UploadFileByUrl(k, v, 2) if err != nil { - l.Logger.Errorf("更新文件镜像备份, err: %v, key: %v, val:%v", err, k, v) + l.Logger.Errorf("更新文件镜像备份失败, err: %v, key: %v, val:%v", err, k, v) + } else { + l.Logger.Infof("更新文件镜像备份成功, err: %v, key: %v, val:%v", err, k, v) } } return resp.SetStatus(basic.CodeOK) From 7ef4139f4e1878a85a91c757258bb58984cca9d6 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 21 Nov 2023 14:43:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?3D=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A4=87=E4=BB=BD=E9=95=9C=E5=83=8F=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_product_model3d_logic.go | 2 +- server/resource/internal/logic/resourcebackuplogic.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/gmodel/fs_product_model3d_logic.go b/model/gmodel/fs_product_model3d_logic.go index 756f3594..1800149b 100755 --- a/model/gmodel/fs_product_model3d_logic.go +++ b/model/gmodel/fs_product_model3d_logic.go @@ -20,7 +20,7 @@ type StepPriceJsonStruct struct { } func (t *FsProductModel3dModel) FindAll(ctx context.Context) (resp []FsProductModel3d, err error) { - err = t.db.WithContext(ctx).Model(&FsProductModel3d{}).Find(&resp).Error + err = t.db.WithContext(ctx).Model(&FsProductModel3d{}).Limit(10).Find(&resp).Error return resp, err } diff --git a/server/resource/internal/logic/resourcebackuplogic.go b/server/resource/internal/logic/resourcebackuplogic.go index 3146e7ed..918bfc81 100644 --- a/server/resource/internal/logic/resourcebackuplogic.go +++ b/server/resource/internal/logic/resourcebackuplogic.go @@ -139,7 +139,7 @@ func (l *ResourceBackupLogic) ResourceBackup(req *types.ResourceBackupReq, useri upload.AliyunOSS.Endpoint = l.svcCtx.Config.AliyunOSS.Endpoint upload.AliyunOSS.BasePath = l.svcCtx.Config.AliyunOSS.BasePath for k, v := range urls { - err := upload.UploadFileByUrl(k, v, 2) + err := upload.UploadFileByUrl(k, v, 1) if err != nil { l.Logger.Errorf("更新文件镜像备份失败, err: %v, key: %v, val:%v", err, k, v) } else { From ca1c10382a4bd16cdf27fddfbd54710a4d06ba93 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 21 Nov 2023 14:51:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?3D=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A4=87=E4=BB=BD=E9=95=9C=E5=83=8F=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_product_model3d_logic.go | 2 +- server/resource/internal/logic/resourcebackuplogic.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/model/gmodel/fs_product_model3d_logic.go b/model/gmodel/fs_product_model3d_logic.go index 1800149b..756f3594 100755 --- a/model/gmodel/fs_product_model3d_logic.go +++ b/model/gmodel/fs_product_model3d_logic.go @@ -20,7 +20,7 @@ type StepPriceJsonStruct struct { } func (t *FsProductModel3dModel) FindAll(ctx context.Context) (resp []FsProductModel3d, err error) { - err = t.db.WithContext(ctx).Model(&FsProductModel3d{}).Limit(10).Find(&resp).Error + err = t.db.WithContext(ctx).Model(&FsProductModel3d{}).Find(&resp).Error return resp, err } diff --git a/server/resource/internal/logic/resourcebackuplogic.go b/server/resource/internal/logic/resourcebackuplogic.go index 918bfc81..b0b63fff 100644 --- a/server/resource/internal/logic/resourcebackuplogic.go +++ b/server/resource/internal/logic/resourcebackuplogic.go @@ -142,8 +142,6 @@ func (l *ResourceBackupLogic) ResourceBackup(req *types.ResourceBackupReq, useri err := upload.UploadFileByUrl(k, v, 1) if err != nil { l.Logger.Errorf("更新文件镜像备份失败, err: %v, key: %v, val:%v", err, k, v) - } else { - l.Logger.Infof("更新文件镜像备份成功, err: %v, key: %v, val:%v", err, k, v) } } return resp.SetStatus(basic.CodeOK)