From d84987567a2f0697a4d78b7a6cc8cb3ee6c94c0c Mon Sep 17 00:00:00 2001 From: ningmengchongshui <916415899@qq.com> Date: Fri, 14 Jun 2024 19:20:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 3 +++ .vscode/settings.json | 15 +++++++++++++++ .vscode/yunzai.code-snippets | 1 + config/pm2/pm2.json | 2 +- src/config/log.ts | 2 +- src/init.ts | 30 +++++++----------------------- src/init/logger.ts | 2 ++ src/init/modules.ts | 11 +++++++++++ 8 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/yunzai.code-snippets create mode 100644 src/init/logger.ts create mode 100644 src/init/modules.ts diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..c83e263 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["esbenp.prettier-vscode"] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1e30b80 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "editor.formatOnSave": true, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } +} diff --git a/.vscode/yunzai.code-snippets b/.vscode/yunzai.code-snippets new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.vscode/yunzai.code-snippets @@ -0,0 +1 @@ +{} diff --git a/config/pm2/pm2.json b/config/pm2/pm2.json index bb31ef3..e3c9548 100644 --- a/config/pm2/pm2.json +++ b/config/pm2/pm2.json @@ -2,7 +2,7 @@ "apps": [ { "name": "Miao-Yunzai", - "script": "./app.js", + "script": "./index.js", "max_memory_restart": "512M", "restart_delay": 60000 } diff --git a/src/config/log.ts b/src/config/log.ts index ce66d96..6930f6d 100644 --- a/src/config/log.ts +++ b/src/config/log.ts @@ -16,7 +16,7 @@ function createLog() { type: 'console', layout: { type: 'pattern', - pattern: '%[[MiaoYz][%d{hh:mm:ss.SSS}][%4.4p]%] %m' + pattern: '%[[MYZ-V4][%d{hh:mm:ss.SSS}][%4.4p]%] %m' } }, command: { diff --git a/src/init.ts b/src/init.ts index f555f1a..b42a0a2 100644 --- a/src/init.ts +++ b/src/init.ts @@ -1,38 +1,22 @@ -import { existsSync } from 'fs' -import { join } from 'path' -import { configInit } from './config/config' -import { loggerInit } from './config/log' -import { BOT_NAME } from './config' -import { redisInit } from './config/redis' +import './init/modules.js' +import './init/logger.js' import { promises } from 'node:fs' import yaml from 'yaml' +import { configInit } from './config/config' +import { BOT_NAME } from './config' +import { redisInit } from './config/redis' import { CONFIG_INIT_PATH } from './config/system.js' import { checkRun } from './config/check.js' - /** - * 检查node_modules + * */ -if (!existsSync(join(process.cwd(), './node_modules'))) { - console.log('未安装依赖。。。。') - console.log('请先运行命令:pnpm install -P 安装依赖') - process.exit() -} +logger.mark(`${BOT_NAME} 启动中...`) /** * 初始化配置 */ configInit() -/** - * 日志初始化 - */ -loggerInit() - -/** - * - */ -logger.mark(`${BOT_NAME} 启动中...`) - /** * 初始化客户端 */ diff --git a/src/init/logger.ts b/src/init/logger.ts new file mode 100644 index 0000000..840eedb --- /dev/null +++ b/src/init/logger.ts @@ -0,0 +1,2 @@ +import { loggerInit } from '../config/log' +loggerInit() diff --git a/src/init/modules.ts b/src/init/modules.ts new file mode 100644 index 0000000..cc0cc4e --- /dev/null +++ b/src/init/modules.ts @@ -0,0 +1,11 @@ +import { existsSync } from 'fs' +import { join } from 'path' +const node_modules = join(process.cwd(), './node_modules') +/** + * 检查node_modules + */ +if (!existsSync(node_modules)) { + console.log('未安装依赖。。。。') + console.log('请先运行命令:pnpm install -P 安装依赖') + process.exit() +}