From b0f3b51736cadf15181482ec48f69dca3ebaa84d Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 8 Jul 2023 20:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E5=AE=9A=E6=97=B6=E5=88=A0=E9=99=A4=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/data/auth.ts | 2 +- back/data/cron.ts | 2 +- back/data/cronView.ts | 2 +- back/data/dependence.ts | 2 +- back/data/env.ts | 2 +- back/data/open.ts | 2 +- back/data/subscription.ts | 2 +- back/loaders/initTask.ts | 8 ++++---- back/services/system.ts | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/back/data/auth.ts b/back/data/auth.ts index a24187a2..0c0b2112 100644 --- a/back/data/auth.ts +++ b/back/data/auth.ts @@ -44,7 +44,7 @@ export interface LoginLogInfo { export type AuthModelInfo = SystemConfigInfo & Partial & LoginLogInfo; -interface AuthInstance extends Model, AuthInfo { } +export interface AuthInstance extends Model, AuthInfo { } export const AuthModel = sequelize.define('Auth', { ip: DataTypes.STRING, type: DataTypes.STRING, diff --git a/back/data/cron.ts b/back/data/cron.ts index faf81bf6..e26e2056 100644 --- a/back/data/cron.ts +++ b/back/data/cron.ts @@ -49,7 +49,7 @@ export enum CrontabStatus { 'disabled', } -interface CronInstance extends Model, Crontab {} +export interface CronInstance extends Model, Crontab {} export const CrontabModel = sequelize.define('Crontab', { name: { unique: 'compositeIndex', diff --git a/back/data/cronView.ts b/back/data/cronView.ts index 70c6c1ab..1fd61f61 100644 --- a/back/data/cronView.ts +++ b/back/data/cronView.ts @@ -39,7 +39,7 @@ export class CrontabView { } } -interface CronViewInstance +export interface CronViewInstance extends Model, CrontabView {} export const CrontabViewModel = sequelize.define( diff --git a/back/data/dependence.ts b/back/data/dependence.ts index eec33d1b..7fd0a6ed 100644 --- a/back/data/dependence.ts +++ b/back/data/dependence.ts @@ -52,7 +52,7 @@ export enum unInstallDependenceCommandTypes { 'apk del', } -interface DependenceInstance +export interface DependenceInstance extends Model, Dependence {} export const DependenceModel = sequelize.define( diff --git a/back/data/env.ts b/back/data/env.ts index eae6b48e..965c826a 100644 --- a/back/data/env.ts +++ b/back/data/env.ts @@ -34,7 +34,7 @@ export const initPosition = 4500000000000000; export const stepPosition = 10000000000; export const minPosition = 100; -interface EnvInstance extends Model, Env {} +export interface EnvInstance extends Model, Env {} export const EnvModel = sequelize.define('Env', { value: { type: DataTypes.STRING, unique: 'compositeIndex' }, timestamp: DataTypes.STRING, diff --git a/back/data/open.ts b/back/data/open.ts index 2666e7c8..d5149648 100644 --- a/back/data/open.ts +++ b/back/data/open.ts @@ -26,7 +26,7 @@ export interface AppToken { export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs'; -interface AppInstance extends Model, App {} +export interface AppInstance extends Model, App {} export const AppModel = sequelize.define('App', { name: { type: DataTypes.STRING, unique: 'name' }, scopes: DataTypes.JSON, diff --git a/back/data/subscription.ts b/back/data/subscription.ts index e75b3876..bb561d2f 100644 --- a/back/data/subscription.ts +++ b/back/data/subscription.ts @@ -70,7 +70,7 @@ export enum SubscriptionStatus { 'queued', } -interface SubscriptionInstance +export interface SubscriptionInstance extends Model, Subscription {} export const SubscriptionModel = sequelize.define( diff --git a/back/loaders/initTask.ts b/back/loaders/initTask.ts index 06441242..71ebc48e 100644 --- a/back/loaders/initTask.ts +++ b/back/loaders/initTask.ts @@ -30,15 +30,15 @@ export default async () => { // 运行删除日志任务 const data = await systemService.getSystemConfig(); - if (data && data.info && data.info.frequency) { + if (data && data.info && data.info.logRemoveFrequency) { const rmlogCron = { - id: data.id, + id: data.id as number, name: '删除日志', - command: `ql rmlog ${data.info.frequency}`, + command: `ql rmlog ${data.info.logRemoveFrequency}`, }; await scheduleService.cancelIntervalTask(rmlogCron); scheduleService.createIntervalTask(rmlogCron, { - days: data.info.frequency, + days: data.info.logRemoveFrequency, }); } diff --git a/back/services/system.ts b/back/services/system.ts index e754a51d..a39921e1 100644 --- a/back/services/system.ts +++ b/back/services/system.ts @@ -2,7 +2,7 @@ import { Service, Inject } from 'typedi'; import winston from 'winston'; import config from '../config'; import * as fs from 'fs'; -import { AuthDataType, AuthInfo, AuthModel, AuthModelInfo } from '../data/auth'; +import { AuthDataType, AuthInfo, AuthInstance, AuthModel, AuthModelInfo } from '../data/auth'; import { NotificationInfo } from '../data/notify'; import NotificationService from './notify'; import ScheduleService, { TaskCallbacks } from './schedule'; @@ -34,15 +34,15 @@ export default class SystemService { return doc || {}; } - private async updateAuthDb(payload: AuthInfo): Promise { + private async updateAuthDb(payload: AuthInfo): Promise { await AuthModel.upsert({ ...payload }); const doc = await this.getDb({ type: payload.type }); return doc; } - public async getDb(query: any): Promise { + public async getDb(query: any): Promise { const doc: any = await AuthModel.findOne({ where: { ...query } }); - return doc && (doc.get({ plain: true }) as any); + return doc && (doc.get({ plain: true })); } public async updateNotificationMode(notificationInfo: NotificationInfo) {