add delete logs num display

.github/workflows/custom_deploy.yml

@@ -7,7 +7,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
+  build-deploy:
     runs-on: ubuntu-latest
 
     steps:

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 (
+			WHERE id NOT IN (
-    SELECT id FROM (
+				SELECT id FROM (
-        SELECT id
+					SELECT id
-        FROM %s
+					FROM %s
-        ORDER BY created_on DESC
+					ORDER BY created_on DESC
-        LIMIT %d
+					LIMIT %d
-    ) tmp
+				) tmp
-);`, logt, logt, keepNum)
+			);`, 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
 }

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,

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)
 	}

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;
 }
 </style>