open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-23 06:46:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改日期打印

Browse Source
This commit is contained in:
whyour 2022-06-18 12:43:23 +08:00
parent 19afbd06c0
commit 6d2edaaaf8
4 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/services/cron.ts
View File

@ -10,6 +10,7 @@ import { promises, existsSync } from 'fs';
import { promisify } from 'util';
import { Op } from 'sequelize';
import path from 'path';
import dayjs from 'dayjs';
@Service()
export default class CronService {
@ -201,9 +202,7 @@ export default class CronService {
const str = err ? `\n${err}` : '';
fs.appendFileSync(
`${absolutePath}`,
`${str}\n## 执行结束... ${new Date()
.toLocaleString('zh', { hour12: false })
.replace(' 24:', ' 00:')} `,
`${str}\n## 执行结束... ${dayjs().format('YYYY-MM-DD HH:mm:ss')} `,
);
}
}

34
back/services/dependence.ts
View File

@ -14,6 +14,7 @@ import { spawn } from 'child_process';
import SockService from './sock';
import { Op } from 'sequelize';
import { concurrentRun } from '../config/util';
import dayjs from 'dayjs';
@Service()
export default class DependenceService {
@ -161,20 +162,17 @@ export default class DependenceService {
)[dependencies[0].type as any];
const actionText = isInstall ? '安装' : '删除';
const depIds = dependencies.map((x) => x.id) as number[];
const startTime = Date.now();
const startTime = dayjs();
const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format(
'YYYY-MM-DD HH:mm:ss',
)}\n\n`;
this.sockService.sendMessage({
type: socketMessageType,
message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
startTime,
).toLocaleString()}\n\n`,
message,
references: depIds,
});
await this.updateLog(
depIds,
`开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
startTime,
).toLocaleString()}\n\n`,
);
await this.updateLog(depIds, message);
const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
@ -207,23 +205,19 @@ export default class DependenceService {
});
cp.on('close', async (code) => {
const endTime = Date.now();
const endTime = dayjs();
const isSucceed = code === 0;
const resultText = isSucceed ? '成功' : '失败';
const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
'YYYY-MM-DD HH:mm:ss',
)}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
this.sockService.sendMessage({
type: socketMessageType,
message: `\n依赖${actionText}${resultText}，结束时间 ${new Date(
endTime,
).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
message,
references: depIds,
});
await this.updateLog(
depIds,
`\n依赖${actionText}${resultText}，结束时间 ${new Date(
endTime,
).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
);
await this.updateLog(depIds, message);
let status = null;
if (isSucceed) {

6
back/services/subscription.ts
View File

@ -28,6 +28,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
import { SimpleIntervalSchedule } from 'toad-scheduler';
import SockService from './sock';
import SshKeyService from './sshKey';
import dayjs from 'dayjs';
@Service()
export default class SubscriptionService {
@ -371,11 +372,10 @@ export default class SubscriptionService {
const err = await this.killTask(command);
const absolutePath = await this.handleLogPath(doc.log_path as string);
const str = err ? `\n${err}` : '';
fs.appendFileSync(
`${absolutePath}`,
`${str}\n## 执行结束... ${new Date()
.toLocaleString('zh', { hour12: false })
.replace(' 24:', ' 00:')} `,
`${str}\n## 执行结束... ${dayjs().format('YYYY-MM-DD HH:mm:ss')} `,
);
}

6
back/services/user.ts
View File

@ -13,7 +13,7 @@ import { Request } from 'express';
import ScheduleService from './schedule';
import { spawn } from 'child_process';
import SockService from './sock';
import got from 'got';
import dayjs from 'dayjs';
@Service()
export default class UserService {
@ -111,7 +111,7 @@ export default class UserService {
});
await this.notificationService.notify(
'登录通知',
`你于${new Date(timestamp).toLocaleString()}在 ${address} ${
`你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
req.platform
}端 登录成功，ip地址 ${ip}`,
);
@ -140,7 +140,7 @@ export default class UserService {
});
await this.notificationService.notify(
'登录通知',
`你于${new Date(timestamp).toLocaleString()}在 ${address} ${
`你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
req.platform
}端 登录失败，ip地址 ${ip}`,
);