From aec1927b991eada99572f145a5130f0c6d0e125d Mon Sep 17 00:00:00 2001
From: ningmengchongshui <916415899@qq.com>
Date: Sun, 9 Jun 2024 21:45:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=8B=E4=BB=B6=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/check.ts              |  6 +-----
 src/config/init.ts               |  4 ++--
 src/core/{ => events}/login.ts   | 14 +++++++-------
 src/core/{ => events}/message.ts |  2 +-
 src/core/{ => events}/notice.ts  |  2 +-
 src/core/{ => events}/offline.ts |  6 +++---
 src/core/{ => events}/online.ts  |  8 ++++----
 src/core/{ => events}/request.ts |  2 +-
 src/core/loader.ts               |  4 ++--
 9 files changed, 22 insertions(+), 26 deletions(-)
 rename src/core/{ => events}/login.ts (97%)
 rename src/core/{ => events}/message.ts (87%)
 rename src/core/{ => events}/notice.ts (87%)
 rename src/core/{ => events}/offline.ts (91%)
 rename src/core/{ => events}/online.ts (88%)
 rename src/core/{ => events}/request.ts (87%)

diff --git a/src/config/check.ts b/src/config/check.ts
index c01709b..f30956b 100644
--- a/src/config/check.ts
+++ b/src/config/check.ts
@@ -27,17 +27,13 @@ export async function checkRun() {
      * 
      */
     if (status.stdout.includes('online')) {
-      //
       logger.mark('检测到后台正在运行')
       logger.mark('已停止后台进程，防止重复运行')
-
       execAsync(`pm2 stop ${cfg.apps[0].name}`).catch(logger.error)
-
-      //
     }
 
 
-  }).catch(logger.error)
+  }).catch(()=>{})
 
 }
 
diff --git a/src/config/init.ts b/src/config/init.ts
index 649836f..4bc49cb 100644
--- a/src/config/init.ts
+++ b/src/config/init.ts
@@ -1,6 +1,6 @@
 import fs, { promises } from "node:fs"
 import yaml from "yaml"
-import { BOT_NAME } from "./system.js"
+import { BOT_NAME, CONFIG_INIT_PATH } from "./system.js"
 import createQQ from "./qq.js"
 import setLog from "./log.js"
 import redisInit from "./redis.js"
@@ -17,7 +17,7 @@ export async function UpdateTitle() {
   let title = BOT_NAME
 
   //
-  const qq = await promises.readFile("./config/config/qq.yaml", 'utf-8').then(yaml.parse).catch(() => null)
+  const qq = await promises.readFile(`./${CONFIG_INIT_PATH}qq.yaml`, 'utf-8').then(yaml.parse).catch(() => null)
 
   /**
    * 
diff --git a/src/core/login.ts b/src/core/events/login.ts
similarity index 97%
rename from src/core/login.ts
rename to src/core/events/login.ts
index 9a6611d..69e2cba 100644
--- a/src/core/login.ts
+++ b/src/core/events/login.ts
@@ -1,5 +1,5 @@
-import EventListener from './listener.js'
-import { sleep } from '../utils/common.js'
+import EventListener from '../listener.js'
+import { sleep } from '../../utils/common.js'
 import inquirer from 'inquirer'
 import lodash from 'lodash'
 import fetch from 'node-fetch'
@@ -71,7 +71,7 @@ export default class loginEvent extends EventListener {
      */
     inquirer
       .prompt({
-        type: 'input',
+        // type: 'input',
         message: '回车刷新二维码，等待扫码中...\n',
         name: 'enter'
       })
@@ -134,7 +134,7 @@ export default class loginEvent extends EventListener {
 
     if (!ticket) {
       let res = await inquirer.prompt({
-        type: 'input',
+        // type: 'input',
         message: '请输入ticket:',
         name: 'ticket',
         validate(value) {
@@ -211,7 +211,7 @@ export default class loginEvent extends EventListener {
 
     //
     await inquirer.prompt({
-      type: 'input',
+      // type: 'input',
       message: '验证完成后按回车确认，等待在操作中...',
       name: 'enter'
     })
@@ -261,7 +261,7 @@ export default class loginEvent extends EventListener {
       console.log('\n' + logger.green(event.url) + '\n')
       console.log('请打开上面链接，完成验证后按回车')
       await inquirer.prompt({
-        type: 'input',
+        // type: 'input',
         message: '等待操作中...',
         name: 'enter'
       })
@@ -272,7 +272,7 @@ export default class loginEvent extends EventListener {
       await sleep(200)
       logger.info(`验证码已发送：${event.phone}\n`)
       let res = await inquirer.prompt({
-        type: 'input',
+        // type: 'input',
         message: '请输入短信验证码:',
         name: 'sms'
       })
diff --git a/src/core/message.ts b/src/core/events/message.ts
similarity index 87%
rename from src/core/message.ts
rename to src/core/events/message.ts
index 4515a1c..6687d2b 100644
--- a/src/core/message.ts
+++ b/src/core/events/message.ts
@@ -1,4 +1,4 @@
-import EventListener from './listener.js'
+import EventListener from '../listener.js'
 
 /**
  * 监听群聊消息
diff --git a/src/core/notice.ts b/src/core/events/notice.ts
similarity index 87%
rename from src/core/notice.ts
rename to src/core/events/notice.ts
index 892542d..a2076b7 100644
--- a/src/core/notice.ts
+++ b/src/core/events/notice.ts
@@ -1,4 +1,4 @@
-import EventListener from './listener.js'
+import EventListener from '../listener.js'
 
 /**
  * 监听群聊消息
diff --git a/src/core/offline.ts b/src/core/events/offline.ts
similarity index 91%
rename from src/core/offline.ts
rename to src/core/events/offline.ts
index 58183e9..219bfe9 100644
--- a/src/core/offline.ts
+++ b/src/core/events/offline.ts
@@ -1,7 +1,7 @@
-import EventListener from './listener.js'
+import EventListener from '../listener.js'
 import fetch from 'node-fetch'
-import cfg from '../config/config.js'
-import { BOT_NAME } from '../config/system.js'
+import cfg from '../../config/config.js'
+import { BOT_NAME } from '../../config/system.js'
 
 /**
  * 监听下线事件
diff --git a/src/core/online.ts b/src/core/events/online.ts
similarity index 88%
rename from src/core/online.ts
rename to src/core/events/online.ts
index d9b5936..29710e1 100644
--- a/src/core/online.ts
+++ b/src/core/events/online.ts
@@ -1,7 +1,7 @@
-import EventListener from './listener.js'
-import cfg from '../config/config.js'
-import { relpyPrivate } from '../core/common.js'
-import { BOT_NAME } from '../config/system.js'
+import EventListener from '../listener.js'
+import cfg from '../../config/config.js'
+import { relpyPrivate } from '../common.js'
+import { BOT_NAME } from '../../config/system.js'
 
 /**
  * 监听上线事件
diff --git a/src/core/request.ts b/src/core/events/request.ts
similarity index 87%
rename from src/core/request.ts
rename to src/core/events/request.ts
index d40b713..bb9c286 100644
--- a/src/core/request.ts
+++ b/src/core/events/request.ts
@@ -1,4 +1,4 @@
-import EventListener from './listener.js'
+import EventListener from '../listener.js'
 
 /**
  * 监听群聊消息
diff --git a/src/core/loader.ts b/src/core/loader.ts
index 3238e3d..4518dd4 100644
--- a/src/core/loader.ts
+++ b/src/core/loader.ts
@@ -15,12 +15,12 @@ class ListenerLoader {
     this.client = client
 
     const files = fs
-      .readdirSync('./lib/events')
+      .readdirSync('./src/core/events')
       .filter(file => file.endsWith('.js'))
 
     for (let File of files) {
       try {
-        let listener = await import(`../events/${File}`)
+        let listener = await import(`./events/${File}`)
 
         /* eslint-disable new-cap */
         if (!listener.default) continue