From c10474db6981676d401c0d6801dbfa2c0e398f90 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Tue, 23 Dec 2025 13:35:06 +0800 Subject: [PATCH] fix: Fix typo (#11436) --- agent/app/service/backup_mysql.go | 4 ++-- agent/app/service/backup_postgresql.go | 4 ++-- agent/app/service/cronjob.go | 14 +++++++------- agent/app/service/cronjob_backup.go | 10 +++++----- agent/app/service/cronjob_helper.go | 2 +- agent/app/service/device_clean.go | 6 +++--- agent/app/service/iptables.go | 2 +- agent/app/service/monitor.go | 12 ++++++------ agent/app/task/task.go | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/agent/app/service/backup_mysql.go b/agent/app/service/backup_mysql.go index f003c75e7..109e5de95 100644 --- a/agent/app/service/backup_mysql.go +++ b/agent/app/service/backup_mysql.go @@ -57,11 +57,11 @@ func (u *BackupService) MysqlRecover(req dto.CommonRecover) error { } func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error { - recoveFile, err := loadSqlFile(req.File) + recoverFile, err := loadSqlFile(req.File) if err != nil { return err } - req.File = recoveFile + req.File = recoverFile if err := handleMysqlRecover(req, nil, false); err != nil { return err diff --git a/agent/app/service/backup_postgresql.go b/agent/app/service/backup_postgresql.go index 4d4489d39..ea8f7a7b6 100644 --- a/agent/app/service/backup_postgresql.go +++ b/agent/app/service/backup_postgresql.go @@ -55,11 +55,11 @@ func (u *BackupService) PostgresqlRecover(req dto.CommonRecover) error { } func (u *BackupService) PostgresqlRecoverByUpload(req dto.CommonRecover) error { - recoveFile, err := loadSqlFile(req.File) + recoverFile, err := loadSqlFile(req.File) if err != nil { return err } - req.File = recoveFile + req.File = recoverFile if err := handlePostgresqlRecover(req, nil, false); err != nil { return err } diff --git a/agent/app/service/cronjob.go b/agent/app/service/cronjob.go index 646ad8cce..90b52f2cf 100644 --- a/agent/app/service/cronjob.go +++ b/agent/app/service/cronjob.go @@ -447,7 +447,7 @@ func (u *CronjobService) SearchRecords(search dto.SearchRecord) (int64, interfac func (u *CronjobService) LoadNextHandle(specStr string) ([]string, error) { spec := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow) now := time.Now() - var nexts [5]string + var next [5]string if strings.HasPrefix(specStr, "@every ") { duration := time.Minute if strings.HasSuffix(specStr, "s") { @@ -462,10 +462,10 @@ func (u *CronjobService) LoadNextHandle(specStr string) ([]string, error) { } for i := 0; i < 5; i++ { nextTime := now.Add(time.Duration(durationItem) * duration) - nexts[i] = nextTime.Format(constant.DateTimeLayout) + next[i] = nextTime.Format(constant.DateTimeLayout) now = nextTime } - return nexts[:], nil + return next[:], nil } sched, err := spec.Parse(specStr) if err != nil { @@ -473,10 +473,10 @@ func (u *CronjobService) LoadNextHandle(specStr string) ([]string, error) { } for i := 0; i < 5; i++ { nextTime := sched.Next(now) - nexts[i] = nextTime.Format(constant.DateTimeLayout) + next[i] = nextTime.Format(constant.DateTimeLayout) now = nextTime } - return nexts[:], nil + return next[:], nil } func (u *CronjobService) LoadRecordLog(req dto.OperateByID) string { @@ -633,8 +633,8 @@ func (u *CronjobService) HandleStop(id uint) error { if len(record.TaskID) == 0 { return nil } - if cancle, ok := global.TaskCtxMap[record.TaskID]; ok { - cancle() + if cancel, ok := global.TaskCtxMap[record.TaskID]; ok { + cancel() } return nil } diff --git a/agent/app/service/cronjob_backup.go b/agent/app/service/cronjob_backup.go index cc99a46c0..e552fb6b2 100644 --- a/agent/app/service/cronjob_backup.go +++ b/agent/app/service/cronjob_backup.go @@ -440,10 +440,10 @@ func loadDbsForJob(cronjob model.Cronjob) []DatabaseHelper { } func loadWebsForJob(cronjob model.Cronjob) []model.Website { - var weblist []model.Website + var list []model.Website if cronjob.Website == "all" { - weblist, _ = websiteRepo.List() - return weblist + list, _ = websiteRepo.List() + return list } websites := strings.Split(cronjob.Website, ",") var idItems []uint @@ -451,8 +451,8 @@ func loadWebsForJob(cronjob model.Cronjob) []model.Website { itemID, _ := strconv.Atoi(websites[i]) idItems = append(idItems, uint(itemID)) } - weblist, _ = websiteRepo.GetBy(repo.WithByIDs(idItems)) - return weblist + list, _ = websiteRepo.GetBy(repo.WithByIDs(idItems)) + return list } func handleBackupLogs(taskItem *task.Task, targetDir, fileName string, secret string) error { diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go index 8d1e6b58f..308e83ca6 100644 --- a/agent/app/service/cronjob_helper.go +++ b/agent/app/service/cronjob_helper.go @@ -64,7 +64,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) { return } if err = u.loadTask(cronjob, &record, taskItem); err != nil { - global.LOG.Debugf("preper to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err) + global.LOG.Debugf("prepare to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err) item, _ := taskRepo.GetFirst(taskRepo.WithByID(record.TaskID)) if len(item.ID) == 0 { record.TaskID = "" diff --git a/agent/app/service/device_clean.go b/agent/app/service/device_clean.go index c34a3f847..02a96b279 100644 --- a/agent/app/service/device_clean.go +++ b/agent/app/service/device_clean.go @@ -78,9 +78,9 @@ func (u *DeviceService) Scan() dto.CleanData { return common.CompareVersion(upgradeTree.Children[i].Label, upgradeTree.Children[j].Label) }) if global.IsMaster { - var copiesSeeting model.Setting - _ = global.CoreDB.Where("key = ?", "UpgradeBackupCopies").First(&copiesSeeting).Error - copies, _ := strconv.Atoi(copiesSeeting.Value) + var copiesSetting model.Setting + _ = global.CoreDB.Where("key = ?", "UpgradeBackupCopies").First(&copiesSetting).Error + copies, _ := strconv.Atoi(copiesSetting.Value) if copies == 0 || copies > len(upgradeTree.Children) { copies = len(upgradeTree.Children) } diff --git a/agent/app/service/iptables.go b/agent/app/service/iptables.go index 2f50118cd..945ab1395 100644 --- a/agent/app/service/iptables.go +++ b/agent/app/service/iptables.go @@ -363,7 +363,7 @@ func initPreRules() error { return err } } - if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, fmt.Sprintf("-p udp -m udp --dport 443 -j ACCEPT")); err != nil { + if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, "-p udp -m udp --dport 443 -j ACCEPT"); err != nil { return err } if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, iptables.DropAllTcp); err != nil { diff --git a/agent/app/service/monitor.go b/agent/app/service/monitor.go index c8f07fab7..a619c6c5d 100644 --- a/agent/app/service/monitor.go +++ b/agent/app/service/monitor.go @@ -485,15 +485,15 @@ func loadTopCPU() []dto.Process { } name, err := p.Name() if err != nil { - name = "undifine" + name = "undefined" } cmd, err := p.Cmdline() if err != nil { - cmd = "undifine" + cmd = "undefined" } user, err := p.Username() if err != nil { - user = "undifine" + user = "undefined" } if len(top5) == 5 { top5[minIndex] = dto.Process{Percent: percent, Pid: p.Pid, User: user, Name: name, Cmd: cmd} @@ -536,15 +536,15 @@ func loadTopMem() []dto.Process { } name, err := p.Name() if err != nil { - name = "undifine" + name = "undefined" } cmd, err := p.Cmdline() if err != nil { - cmd = "undifine" + cmd = "undefined" } user, err := p.Username() if err != nil { - user = "undifine" + user = "undefined" } percent, _ := p.MemoryPercent() if len(top5) == 5 { diff --git a/agent/app/task/task.go b/agent/app/task/task.go index 5fecc4f7d..6abcea273 100644 --- a/agent/app/task/task.go +++ b/agent/app/task/task.go @@ -153,8 +153,8 @@ func NewTask(name, operate, taskScope, taskID string, resourceID uint) (*Task, e Operate: operate, } taskRepo := repo.NewITaskRepo() - ctx, cancle := context.WithCancel(context.Background()) - global.TaskCtxMap[taskID] = cancle + ctx, cancel := context.WithCancel(context.Background()) + global.TaskCtxMap[taskID] = cancel task := &Task{TaskCtx: ctx, Name: name, logFile: logFile, Logger: logger, taskRepo: taskRepo, Task: taskModel} return task, nil }