diff --git a/.github/workflows/custom_deploy.yml b/.github/workflows/custom_deploy.yml index 7691912..530de09 100644 --- a/.github/workflows/custom_deploy.yml +++ b/.github/workflows/custom_deploy.yml @@ -7,7 +7,7 @@ on: branches: [ "main" ] jobs: - build: + build-deploy: runs-on: ubuntu-latest steps: diff --git a/models/send_tasks_logs.go b/models/send_tasks_logs.go index b4f5c2d..a3b3740 100644 --- a/models/send_tasks_logs.go +++ b/models/send_tasks_logs.go @@ -80,21 +80,23 @@ func GetSendLogsTotal(name string, taskId string, maps interface{}) (int, error) } // GetSendLogsTotal 获取所有日志总数 -func DeleteOutDateLogs(keepNum int) error { +func DeleteOutDateLogs(keepNum int) (int, error) { + var affectedRows int logt := table.LogsTableName sql := fmt.Sprintf(`DELETE FROM %s -WHERE id NOT IN ( - SELECT id FROM ( - SELECT id - FROM %s - ORDER BY created_on DESC - LIMIT %d - ) tmp -);`, logt, logt, keepNum) + WHERE id NOT IN ( + SELECT id FROM ( + SELECT id + FROM %s + ORDER BY created_on DESC + LIMIT %d + ) tmp + );`, logt, logt, keepNum) result := db.Exec(sql) if result.Error != nil { - return result.Error + return affectedRows, result.Error } - return nil + affectedRows = int(result.RowsAffected) + return affectedRows, nil } diff --git a/pkg/util/jwt.go b/pkg/util/jwt.go index f69a469..ff59624 100644 --- a/pkg/util/jwt.go +++ b/pkg/util/jwt.go @@ -17,7 +17,7 @@ type Claims struct { // GenerateToken generate tokens used for auth func GenerateToken(username, password string) (string, error) { nowTime := time.Now() - expireTime := nowTime.Add(7 * 24 * time.Hour) + expireTime := nowTime.Add(1 * 24 * time.Hour) claims := Claims{ username, diff --git a/service/cron_service/cron_service.go b/service/cron_service/cron_service.go index 68e8f08..675d2fb 100644 --- a/service/cron_service/cron_service.go +++ b/service/cron_service/cron_service.go @@ -32,13 +32,13 @@ func ClearLogs() { } keepNum := com.StrTo(setting.Value).MustInt() - err = models.DeleteOutDateLogs(keepNum) + affectedRows, err := models.DeleteOutDateLogs(keepNum) if err != nil { errStr = fmt.Sprintf("删除日志失败,原因:%s", err) logging.Logger.Error(errStr) sm.LogsAndStatusMark(errStr, send_message_service.SendFail) } else { - errStr = fmt.Sprintf("删除日志成功,保留数目:%d", keepNum) + errStr = fmt.Sprintf("删除日志成功,删除条数:%d,保留数目:%d", affectedRows, keepNum) logging.Logger.Error(errStr) sm.LogsAndStatusMark(errStr, sm.Status) } diff --git a/web/src/views/404.vue b/web/src/views/404.vue index e11077d..8c21c43 100644 --- a/web/src/views/404.vue +++ b/web/src/views/404.vue @@ -15,6 +15,5 @@ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1); max-width: 800px; width: 100%; - margin-top: -10vh; } \ No newline at end of file