From e50940631f59776eb1716cfeb411195603afc29b Mon Sep 17 00:00:00 2001
From: Jerryplusy <Jerryplusy@outlook.com>
Date: Wed, 1 Oct 2025 16:15:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96login=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/login.js       | 14 +++++++++-----
 lib/login/napcat.js |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/login.js b/apps/login.js
index 9509b68..fa624ad 100644
--- a/apps/login.js
+++ b/apps/login.js
@@ -1,12 +1,9 @@
 import plugin from '../../../lib/plugins/plugin.js';
-import path from 'path';
 import ConfigControl from '../lib/config/configControl.js';
 import configControl from '../lib/config/configControl.js';
 import Meme from '../lib/core/meme.js';
 import NapcatService from '../lib/login/napcat.js';
 import LgrService from '../lib/login/lgr.js';
-
-const configPath = path.join(process.cwd(), 'data/crystelf/config');
 const loginSessions = new Map(); //正在进行的登录会话
 const bindSessions = new Map(); //正在进行的绑定会话
 const activeLogins = new Map(); //在线登录实例
@@ -270,7 +267,7 @@ export default class LoginService extends plugin {
   async doLogin(e, session) {
     try {
       const { qq, method, nickname } = session;
-      e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true);
+      e.reply(`开始尝试使用 ${method} 登录 QQ[${qq}]`, true);
       let loginInstance;
       if (method === 'nc') {
         loginInstance = new NapcatService();
@@ -281,7 +278,14 @@ export default class LoginService extends plugin {
       const qrPath = await loginInstance.login(qq, nickname);
       const loginTimers = new Map();
       if (qrPath && qrPath !== 'none') {
-        await e.reply(segment.image(`file:///${qrPath}`), true);
+        await e.reply(
+          [
+            segment.image(`file:///${qrPath}`),
+            '\n请使用手机qq摄像头扫码登录并勾选保存登录状态\n二维码有效期2分钟..',
+          ],
+          true,
+          { recallMsg: 120 }
+        );
         const timerKey = `login:timer:${qq}`;
         if (loginTimers.has(timerKey)) {
           clearTimeout(loginTimers.get(timerKey).timeout);
diff --git a/lib/login/napcat.js b/lib/login/napcat.js
index f175717..793c7c5 100644
--- a/lib/login/napcat.js
+++ b/lib/login/napcat.js
@@ -3,6 +3,7 @@ import path from 'path';
 import { exec } from 'child_process';
 import util from 'util';
 import configControl from '../config/configControl.js';
+import Path from '../../constants/path.js';
 
 const execAsync = util.promisify(exec);
 
@@ -32,7 +33,7 @@ export default class NapcatService {
     const userConfigFile = path.join(this.configPath, `onebot11_${qq}.json`);
     if (!fs.existsSync(userConfigFile)) {
       try {
-        const defaultConfigFile = path.join(configControl.get('config')?.path || '', 'napcat.json');
+        const defaultConfigFile = path.join(Path.config || '', 'napcat.json');
         if (!fs.existsSync(defaultConfigFile)) {
           logger.error(`[crystelf-admin] 默认配置文件不存在: ${defaultConfigFile}`);
         }