lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-05-16 05:07:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 1

Browse Source
This commit is contained in:
xiaojunnuo
2024-10-31 22:35:05 +08:00
parent 584378a32b
commit b817cb4a1b
13 changed files with 125 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-server/src/modules/pipeline/service/history-service.ts
+8 -7
View File
@@ -6,10 +6,10 @@ import { HistoryEntity } from '../entity/history.js';
import { PipelineEntity } from '../entity/pipeline.js';
import { HistoryDetail } from '../entity/vo/history-detail.js';
import { HistoryLogService } from './history-log-service.js';
import { FileItem, Pipeline, RunnableCollection } from '@certd/pipeline';
import { FileStore } from '@certd/pipeline';
import { logger } from '@certd/pipeline';
import { FileItem, FileStore, logger, Pipeline, RunnableCollection } from '@certd/pipeline';
import dayjs from 'dayjs';
import { DbAdapter } from '../../db/index.js';
/**
* 证书申请
*/
@@ -24,6 +24,9 @@ export class HistoryService extends BaseService<HistoryEntity> {
@Inject()
logService: HistoryLogService;
@Inject()
dbAdapter: DbAdapter;
@Config('certd')
private certdConfig: any;
@@ -178,8 +181,6 @@ export class HistoryService extends BaseService<HistoryEntity> {
async countPerDay(param: { days: number; userId?: any }) {
const todayEnd = dayjs().endOf('day');
const where: any = {
// 0点
// userId: param.userId,
createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),
};
if (param.userId > 0) {
@@ -187,8 +188,8 @@ export class HistoryService extends BaseService<HistoryEntity> {
}
const result = await this.getRepository()
.createQueryBuilder('main')
.select('date(main.createTime) AS date') // 将UNIX时间戳转换为日期
.addSelect('COUNT(*) AS count')
.select(`${this.dbAdapter.date('main.createTime')} AS date`) // 将UNIX时间戳转换为日期
.addSelect('COUNT(1) AS count')
.where(where)
.groupBy('date')
.getRawMany();
packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+6 -2
View File
@@ -20,6 +20,7 @@ import { CnameRecordService } from '../../cname/service/cname-record-service.js'
import { CnameProxyService } from './cname-proxy-service.js';
import { PluginConfigGetter } from '../../plugin/service/plugin-config-getter.js';
import dayjs from 'dayjs';
import { DbAdapter } from '../../db/index.js';
const runningTasks: Map<string | number, Executor> = new Map();
const freeCount = 10;
@@ -60,6 +61,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
@Config('certd')
private certdConfig: any;
@Inject()
dbAdapter: DbAdapter;
//@ts-ignore
getRepository() {
return this.repository;
@@ -522,8 +526,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
const todayEnd = dayjs().endOf('day');
const result = await this.getRepository()
.createQueryBuilder('main')
.select('date(main.createTime) AS date') // 将UNIX时间戳转换为日期
.addSelect('COUNT(*) AS count')
.select(`${this.dbAdapter.date('main.createTime')} AS date`) // 将UNIX时间戳转换为日期
.addSelect('COUNT(1) AS count')
.where({
// 0点
createTime: MoreThan(todayEnd.add(-param.days, 'day').toDate()),