mirroring/cool-admin-midway
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-midway.git synced 2024-11-01 22:20:30 +08:00
Code Issues Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
cool 2024-01-23 10:45:29 +08:00
parent df540acb09
commit 5b599c4a20
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/base/service/sys/log.ts
View File

@ -1,7 +1,7 @@
import { Inject, Provide } from '@midwayjs/decorator'; import { Inject, Provide } from '@midwayjs/decorator';
import { BaseService } from '@cool-midway/core'; import { BaseService } from '@cool-midway/core';
import { InjectEntityModel } from '@midwayjs/typeorm'; import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm'; import { LessThan, Repository } from 'typeorm';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { BaseSysLogEntity } from '../../entity/sys/log'; import { BaseSysLogEntity } from '../../entity/sys/log';
import * as moment from 'moment'; import * as moment from 'moment';
@ -57,14 +57,8 @@ export class BaseSysLogService extends BaseService {
} }
const keepDay = await this.baseSysConfService.getValue('logKeep'); const keepDay = await this.baseSysConfService.getValue('logKeep');
if (keepDay) { if (keepDay) {
const beforeDate = `${moment() const beforeDate = moment().add(-keepDay, 'days').startOf('day').toDate();
.add(-keepDay, 'days') await this.baseSysLogEntity.delete({ createTime: LessThan(beforeDate) });
.format('YYYY-MM-DD')} 00:00:00`;
await this.baseSysLogEntity
.createQueryBuilder()
.delete()
.where('createTime < :createTime', { createTime: beforeDate })
.execute();
} else { } else {
await this.baseSysLogEntity.clear(); await this.baseSysLogEntity.clear();
} }

12
src/modules/recycle/service/data.ts
View File

@ -2,7 +2,7 @@ import { RecycleDataEntity } from './../entity/data';
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/decorator'; import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/decorator';
import { BaseService } from '@cool-midway/core'; import { BaseService } from '@cool-midway/core';
import { InjectEntityModel, TypeORMDataSourceManager } from '@midwayjs/typeorm'; import { InjectEntityModel, TypeORMDataSourceManager } from '@midwayjs/typeorm';
import { Repository } from 'typeorm'; import { LessThan, Repository } from 'typeorm';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as moment from 'moment'; import * as moment from 'moment';
import { BaseSysConfService } from '../../base/service/sys/conf'; import { BaseSysConfService } from '../../base/service/sys/conf';
@ -74,14 +74,8 @@ export class RecycleDataService extends BaseService {
} }
const keepDay = await this.baseSysConfService.getValue('recycleKeep'); const keepDay = await this.baseSysConfService.getValue('recycleKeep');
if (keepDay) { if (keepDay) {
const beforeDate = `${moment() const beforeDate = moment().add(-keepDay, 'days').startOf('day').toDate();
.add(-keepDay, 'days') await this.recycleDataEntity.delete({ createTime: LessThan(beforeDate) });
.format('YYYY-MM-DD')} 00:00:00`;
await this.recycleDataEntity
.createQueryBuilder('a')
.delete()
.where('a.createTime < :createTime', { createTime: beforeDate })
.execute();
} else { } else {
await this.recycleDataEntity.clear(); await this.recycleDataEntity.clear();
} }