diff --git a/internal/db/models/log_dao.go b/internal/db/models/log_dao.go index 4df92a4f..e78cb5b3 100644 --- a/internal/db/models/log_dao.go +++ b/internal/db/models/log_dao.go @@ -33,7 +33,7 @@ func init() { }) } -// 创建管理员日志 +// CreateLog 创建管理员日志 func (this *LogDAO) CreateLog(tx *dbs.Tx, adminType string, adminId int64, level string, description string, action string, ip string) error { op := NewLogOperator() op.Level = level @@ -57,7 +57,7 @@ func (this *LogDAO) CreateLog(tx *dbs.Tx, adminType string, adminId int64, level return err } -// 计算所有日志数量 +// CountLogs 计算所有日志数量 func (this *LogDAO) CountLogs(tx *dbs.Tx, dayFrom string, dayTo string, keyword string, userType string) (int64, error) { dayFrom = this.formatDay(dayFrom) dayTo = this.formatDay(dayTo) @@ -86,7 +86,7 @@ func (this *LogDAO) CountLogs(tx *dbs.Tx, dayFrom string, dayTo string, keyword return query.Count() } -// 列出单页日志 +// ListLogs 列出单页日志 func (this *LogDAO) ListLogs(tx *dbs.Tx, offset int64, size int64, dayFrom string, dayTo string, keyword string, userType string) (result []*Log, err error) { dayFrom = this.formatDay(dayFrom) dayTo = this.formatDay(dayTo) @@ -120,7 +120,7 @@ func (this *LogDAO) ListLogs(tx *dbs.Tx, offset int64, size int64, dayFrom strin return } -// 物理删除日志 +// DeleteLogPermanently 物理删除日志 func (this *LogDAO) DeleteLogPermanently(tx *dbs.Tx, logId int64) error { if logId <= 0 { return errors.New("invalid logId") @@ -129,14 +129,14 @@ func (this *LogDAO) DeleteLogPermanently(tx *dbs.Tx, logId int64) error { return err } -// 物理删除所有日志 +// DeleteAllLogsPermanently 物理删除所有日志 func (this *LogDAO) DeleteAllLogsPermanently(tx *dbs.Tx) error { _, err := this.Query(tx). Delete() return err } -// 物理删除某些天之前的日志 +// DeleteLogsPermanentlyBeforeDays 物理删除某些天之前的日志 func (this *LogDAO) DeleteLogsPermanentlyBeforeDays(tx *dbs.Tx, days int) error { if days <= 0 { days = 0 @@ -148,7 +148,7 @@ func (this *LogDAO) DeleteLogsPermanentlyBeforeDays(tx *dbs.Tx, days int) error return err } -// 计算当前日志容量大小 +// SumLogsSize 计算当前日志容量大小 func (this *LogDAO) SumLogsSize() (int64, error) { col, err := this.Instance.FindCol(0, "SELECT DATA_LENGTH FROM information_schema.TABLES WHERE TABLE_SCHEMA=? AND TABLE_NAME=? LIMIT 1", this.Instance.Name(), this.Table) if err != nil { diff --git a/internal/tasks/log_task.go b/internal/tasks/log_task.go index 393ba0f3..2b1bd1b9 100644 --- a/internal/tasks/log_task.go +++ b/internal/tasks/log_task.go @@ -38,34 +38,17 @@ func (this *LogTask) Run() { } func (this *LogTask) runClean() { - ticker := utils.NewTicker(24 * time.Hour) + var ticker = utils.NewTicker(24 * time.Hour) for ticker.Wait() { - err := this.loopClean(86400) + err := this.loopClean() if err != nil { logs.Println("[TASK][LOG]" + err.Error()) } } } -func (this *LogTask) loopClean(seconds int64) error { - // 检查上次运行时间,防止重复运行 - settingKey := "logTaskCleanLoop" - timestamp := time.Now().Unix() - c, err := models.SharedSysSettingDAO.CompareInt64Setting(nil, settingKey, timestamp-seconds) - if err != nil { - return err - } - if c > 0 { - return nil - } - - // 记录时间 - err = models.SharedSysSettingDAO.UpdateSetting(nil, settingKey, []byte(numberutils.FormatInt64(timestamp))) - if err != nil { - return err - } - - configKey := "adminLogConfig" +func (this *LogTask) loopClean() error { + var configKey = "adminLogConfig" valueJSON, err := models.SharedSysSettingDAO.ReadSetting(nil, configKey) if err != nil { return err @@ -74,7 +57,7 @@ func (this *LogTask) loopClean(seconds int64) error { return nil } - config := &systemconfigs.LogConfig{} + var config = &systemconfigs.LogConfig{} err = json.Unmarshal(valueJSON, config) if err != nil { return err @@ -89,7 +72,7 @@ func (this *LogTask) loopClean(seconds int64) error { } func (this *LogTask) runMonitor() { - ticker := utils.NewTicker(1 * time.Minute) + var ticker = utils.NewTicker(1 * time.Minute) for ticker.Wait() { err := this.loopMonitor(60) if err != nil { @@ -100,8 +83,8 @@ func (this *LogTask) runMonitor() { func (this *LogTask) loopMonitor(seconds int64) error { // 检查上次运行时间,防止重复运行 - settingKey := "logTaskMonitorLoop" - timestamp := time.Now().Unix() + var settingKey = "logTaskMonitorLoop" + var timestamp = time.Now().Unix() c, err := models.SharedSysSettingDAO.CompareInt64Setting(nil, settingKey, timestamp-seconds) if err != nil { return err @@ -116,7 +99,7 @@ func (this *LogTask) loopMonitor(seconds int64) error { return err } - configKey := "adminLogConfig" + var configKey = "adminLogConfig" valueJSON, err := models.SharedSysSettingDAO.ReadSetting(nil, configKey) if err != nil { return err @@ -125,7 +108,7 @@ func (this *LogTask) loopMonitor(seconds int64) error { return nil } - config := &systemconfigs.LogConfig{} + var config = &systemconfigs.LogConfig{} err = json.Unmarshal(valueJSON, config) if err != nil { return err