diff --git a/backend/app/service/app.go b/backend/app/service/app.go index fadbfe610..986586f33 100644 --- a/backend/app/service/app.go +++ b/backend/app/service/app.go @@ -508,7 +508,6 @@ func (a AppService) SyncAppListFromLocal() { } tx.Commit() global.LOG.Infof("sync local apps success") - return } func (a AppService) SyncAppListFromRemote() error { updateRes, err := a.GetAppUpdate() diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go index 42d8b5cf5..007f9421f 100644 --- a/backend/app/service/app_utils.go +++ b/backend/app/service/app_utils.go @@ -417,6 +417,9 @@ func upApp(ctx context.Context, appInstall model.AppInstall) { if err == nil { var composeService *composeV2.ComposeService composeService, err = getServiceFromInstall(appInstall) + if err != nil { + return err + } err = composeService.ComposeUp() if err != nil { return err diff --git a/backend/cron/cron.go b/backend/cron/cron.go index d10b1faab..6d65ddd6a 100644 --- a/backend/cron/cron.go +++ b/backend/cron/cron.go @@ -47,7 +47,7 @@ func Run() { for i := 0; i < len(cronJobs); i++ { entryID, err := service.NewICronjobService().StartJob(&cronJobs[i]) if err != nil { - global.LOG.Errorf("start %s job %s failed, err: %v", &cronJobs[i].Type, &cronJobs[i].Name, err) + global.LOG.Errorf("start %s job %s failed, err: %v", cronJobs[i].Type, cronJobs[i].Name, err) } if err := repo.NewICronjobRepo().Update(cronJobs[i].ID, map[string]interface{}{"entry_id": entryID}); err != nil { global.LOG.Errorf("update cronjob %s %s failed, err: %v", cronJobs[i].Type, cronJobs[i].Name, err) diff --git a/backend/utils/files/file_op.go b/backend/utils/files/file_op.go index ef67bed5f..9b85138a4 100644 --- a/backend/utils/files/file_op.go +++ b/backend/utils/files/file_op.go @@ -437,7 +437,6 @@ func (f FileOp) Compress(srcRiles []string, dst string, name string, cType Compr _ = f.DeleteFile(dstFile) return err } - break } return nil } diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue index 7257a7ff0..ab2c991c4 100644 --- a/frontend/src/views/website/website/index.vue +++ b/frontend/src/views/website/website/index.vue @@ -150,7 +150,7 @@ - +