diff --git a/agent/app/repo/app.go b/agent/app/repo/app.go index 331ed8e21..c7bbc7c87 100644 --- a/agent/app/repo/app.go +++ b/agent/app/repo/app.go @@ -33,7 +33,7 @@ type IAppRepo interface { DeleteByIDs(ctx context.Context, ids []uint) error DeleteBy(opts ...DBOption) error - GetTopRecomment() ([]string, error) + GetTopRecommend() ([]string, error) } func NewIAppRepo() IAppRepo { @@ -124,7 +124,7 @@ func (a AppRepo) GetBy(opts ...DBOption) ([]model.App, error) { return apps, nil } -func (a AppRepo) GetTopRecomment() ([]string, error) { +func (a AppRepo) GetTopRecommend() ([]string, error) { var ( apps []model.App names []string diff --git a/agent/app/service/backup_postgresql.go b/agent/app/service/backup_postgresql.go index 8d2950dd5..2051f4d36 100644 --- a/agent/app/service/backup_postgresql.go +++ b/agent/app/service/backup_postgresql.go @@ -17,7 +17,6 @@ import ( "github.com/1Panel-dev/1Panel/agent/utils/common" "github.com/1Panel-dev/1Panel/agent/utils/files" "github.com/1Panel-dev/1Panel/agent/utils/postgresql/client" - pgclient "github.com/1Panel-dev/1Panel/agent/utils/postgresql/client" ) func (u *BackupService) PostgresqlBackup(req dto.CommonBackup) error { @@ -82,7 +81,7 @@ func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, recordID u } } - itemHandler := func() error { return doPostgresqlgBackup(db, targetDir, fileName, secret, backupTask) } + itemHandler := func() error { return doPostgresqlBackup(db, targetDir, fileName, secret, backupTask) } if parentTask != nil { return itemHandler() } @@ -195,13 +194,13 @@ func handlePostgresqlRecover(req dto.CommonRecover, parentTask *task.Task, isRol return nil } -func doPostgresqlgBackup(db DatabaseHelper, targetDir, fileName, secret string, task *task.Task) error { +func doPostgresqlBackup(db DatabaseHelper, targetDir, fileName, secret string, task *task.Task) error { cli, err := LoadPostgresqlClientByFrom(db.Database) if err != nil { return err } defer cli.Close() - backupInfo := pgclient.BackupInfo{ + backupInfo := client.BackupInfo{ Database: db.Database, Name: db.Name, TargetDir: targetDir, diff --git a/agent/app/service/container.go b/agent/app/service/container.go index 0092ef5fa..50b2b6b6a 100644 --- a/agent/app/service/container.go +++ b/agent/app/service/container.go @@ -1144,10 +1144,8 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error body, err := io.ReadAll(res.Body) if err != nil { - res.Body.Close() return nil, err } - res.Body.Close() var stats *container.StatsResponse if err := json.Unmarshal(body, &stats); err != nil { return nil, err diff --git a/agent/app/service/cronjob_backup.go b/agent/app/service/cronjob_backup.go index 052185763..cc99a46c0 100644 --- a/agent/app/service/cronjob_backup.go +++ b/agent/app/service/cronjob_backup.go @@ -178,7 +178,7 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, startTime time.Ti } } } else { - if err := doPostgresqlgBackup(dbInfo, backupDir, record.FileName, cronjob.Secret, taskItem); err != nil { + if err := doPostgresqlBackup(dbInfo, backupDir, record.FileName, cronjob.Secret, taskItem); err != nil { if retry < int(cronjob.RetryTimes) || !cronjob.IgnoreErr { retry++ return err diff --git a/agent/app/service/dashboard.go b/agent/app/service/dashboard.go index 42e385bcb..9a41c626a 100644 --- a/agent/app/service/dashboard.go +++ b/agent/app/service/dashboard.go @@ -285,7 +285,7 @@ func (u *DashboardService) LoadAppLauncher(ctx *gin.Context) ([]dto.AppLauncher, } showList, err := launcherRepo.ListName() - defaultList, err := appRepo.GetTopRecomment() + defaultList, err := appRepo.GetTopRecommend() if err != nil { return data, nil }