From fac2d00027abe173674ead8f563bdc89d54c5c93 Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Sun, 28 Sep 2025 15:29:25 +0800 Subject: [PATCH 1/5] feat:111 --- apps/coreRestart.js | 15 ++++ apps/login.js | 202 +++++++++++++++++++++++++++++++++++++++++++- config/login.json | 4 + lib/core/meme.js | 25 ++++++ 4 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 config/login.json create mode 100644 lib/core/meme.js diff --git a/apps/coreRestart.js b/apps/coreRestart.js index ed16173..21128ab 100644 --- a/apps/coreRestart.js +++ b/apps/coreRestart.js @@ -13,6 +13,11 @@ export default class CoreRestart extends plugin { fnc: 'restart', permission: 'master', }, + { + reg: '^test$', + fnc: 'test', + permission: 'master', + }, ], }); } @@ -35,4 +40,14 @@ export default class CoreRestart extends plugin { await e.reply(`核心重启花的时间有点久了呢..${restartTime?.data?.data}`, true); } } + + async test(e) { + logger.info(configControl.get()); + + await configControl.set('napcat', { + basePath: '114514', + userPath: '44444', + }); + logger.info(configControl.get()); + } } diff --git a/apps/login.js b/apps/login.js index e4a428f..2fdae68 100644 --- a/apps/login.js +++ b/apps/login.js @@ -1,11 +1,209 @@ +import plugin from '../../../lib/plugins/plugin.js'; +import path from 'path'; +import ConfigControl from '../lib/config/configControl.js'; +import config from '../../../lib/config/config.js'; +import configControl from '../lib/config/configControl.js'; +import axios from 'axios'; +import Meme from '../lib/core/meme.js'; + +const configPath = path.join(process.cwd(), 'data/crystelf/config'); +const loginSessions = new Map(); //正在进行的登录会话 + export default class LoginService extends plugin { constructor() { super({ name: 'Onebot登录相关服务', dsc: '方便操作', - rule: [], + event: 'message', + priority: 50, + rule: [ + { + reg: '^#登录(\\d+)?$', + fnc: 'loginHandler', + }, + { + reg: '^#绑定账号\\s+\\d+$', + fnc: 'bindAccount', + }, + { + reg: '^#解绑账号\\s+\\d+$', + fnc: 'unbindAccount', + }, + ], }); } - async test(e) {} + /** + * 登录命令入口 + * @param e + * @returns {Promise} + */ + async loginHandler(e) { + let config = await configControl.get(); + if (!config?.login?.allowGroups.includes(e.group_id)) { + const img = await Meme.getMeme('zhenxun', 'default'); + return e.reply(segment.img(img)); //都不在群里玩什么;[ + } + const isAdmin = e.isAdmin; + const userId = e.user_id; + const match = e.msg.match(/^#登录(\d+)?$/); + let targetQq = match[1]; + + if (!targetQq) { + const binds = config?.login?.userBinds[userId] || []; + if (binds.length === 0) { + if (isAdmin) { + e.reply('请告诉我要登录的 QQ 号', true); + loginSessions.set(userId, { step: 'askQq', admin: true }); + } else { + return e.reply('你没有绑定可登录的账号，请联系管理员分配..', true); + } + } else if (binds.length === 1) { + targetQq = binds[0]; + } else { + e.reply(`你绑定了多个账号，请选择要登录的 QQ:\n${binds.join('\n')}`, true); + loginSessions.set(userId, { step: 'chooseQq', options: binds }); + } + } + + if (isAdmin) { + await this.startAdminLogin(e, targetQq); + } else { + const binds = config?.login?.userBinds[userId] || []; + if (!binds.includes(targetQq)) { + return e.reply('你没有权限登录该账号，请联系管理员分配', true); + } + await this.startUserLogin(e, targetQq); + } + } + + /** 管理员登录交互 */ + async startAdminLogin(e, qq) { + loginSessions.set(e.user_id, { + step: 'askNickname', + qq, + admin: true, + }); + e.reply(`请告诉我 QQ[${qq}] 的英文昵称`, true); + } + + /** 普通用户登录 */ + async startUserLogin(e, qq) { + loginSessions.set(e.user_id, { + step: 'askMethod', + qq, + admin: false, + }); + e.reply(`请选择登录方式\nnc或lgr\n来登录 QQ[${qq}]`, true); + } + + /** 绑定账号 */ + async bindAccount(e) { + let config = await configControl.get()?.login; + if (!e.isAdmin) return; + const match = e.msg.match(/^#绑定账号\s+(\d+)$/); + if (!match) return; + const qq = match[1]; + const at = e.at || e.user_id; + if (!config?.userBinds[at]) config.userBinds[at] = []; + if (!config?.userBinds[at].includes(qq)) { + config.userBinds[at].push(qq); + await ConfigControl.set('login', config); + e.reply(`已为 ${at} 绑定账号 ${qq}`, true); + } else { + e.reply(`该用户已绑定此账号`, true); + } + } + + /** 解绑账号 */ + async unbindAccount(e) { + if (!e.isAdmin) return false; + let config = await configControl.get()?.login; + const match = e.msg.match(/^#解绑账号\s+(\d+)$/); + if (!match) return; + const qq = match[1]; + const at = e.at || e.user_id; + if (!config?.userBinds[at]) { + e.reply('该用户没有绑定账号', true); + return; + } + config.userBinds[at] = config.userBinds[at].filter((q) => q !== qq); + await ConfigControl.set('login', config); + e.reply(`已为 ${at} 解绑账号 ${qq}`, true); + } + + /** 捕获消息继续交互 */ + async accept(e) { + const session = loginSessions.get(e.user_id); + if (!session) return; + + if (session.step === 'askQq') { + session.qq = e.msg.trim(); + session.step = 'askNickname'; + e.reply(`请告诉我 QQ[${session.qq}] 的英文昵称`, true); + return; + } + + if (session.step === 'chooseQq') { + if (!session.options.includes(e.msg.trim())) { + e.reply('请选择列表中的 QQ', true); + return; + } + session.qq = e.msg.trim(); + session.step = 'askMethod'; + e.reply(`请选择登录方式（回复 "nc" 或 "lgr"）来登录 QQ[${session.qq}]`, true); + return; + } + + if (session.step === 'askNickname') { + session.nickname = e.msg.trim(); + session.step = 'askMethod'; + e.reply('请选择登录方式（回复 "nc" 或 "lgr"）', true); + return; + } + + if (session.step === 'askMethod') { + const method = e.msg.trim().toLowerCase(); + if (!['nc', 'lgr'].includes(method)) { + e.reply('登录方式无效，请回复 "nc" 或 "lgr"', true); + return; + } + session.method = method; + loginSessions.delete(e.user_id); + await this.doLogin(e, session); + } + } + + /** 执行登录 */ + async doLogin(e, session) { + const { qq, method, nickname } = session; + e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true); + + let loginInstance; + if (method === 'nc') { + loginInstance = NapcatService(); + } else { + loginInstance = LgrService(); + } + + const qrPath = await loginInstance.login(); + e.reply(segment.image(qrPath), true); + const timerKey = `login:timer:${qq}`; + redis.setex(timerKey, 120, 'pending'); + + const check = setInterval(async () => { + const status = await loginInstance.checkStatus(); + if (status === 'success') { + clearInterval(check); + redis.del(timerKey); + e.reply(`QQ[${qq}] 登录成功！`, true); + } + const ttl = await redis.ttl(timerKey); + if (ttl <= 0) { + clearInterval(check); + await loginInstance.disconnect(); + e.reply(`QQ[${qq}] 登录超时，已断开`, true); + } + }, 5000); + } } diff --git a/config/login.json b/config/login.json new file mode 100644 index 0000000..8b499c7 --- /dev/null +++ b/config/login.json @@ -0,0 +1,4 @@ +{ + "allowGroups": [], + "userBinds": {} +} diff --git a/lib/core/meme.js b/lib/core/meme.js new file mode 100644 index 0000000..8cb00b4 --- /dev/null +++ b/lib/core/meme.js @@ -0,0 +1,25 @@ +import ConfigControl from '../config/configControl.js'; +import axios from 'axios'; + +const Meme = { + /** + * 获取随机表情 + * @param character 角色名称 + * @param status 角色状态 + * @returns {Promise>} + */ + async getMeme(character, status) { + const coreConfig = await ConfigControl.get()?.coreConfig; + const coreUrl = coreConfig?.coreUrl; + const token = coreConfig?.token; + return await axios.get(`${coreUrl}/api/meme`, { + params: { + character: character, + status: status, + token: token, + }, + }); + }, +}; + +export default Meme; From 7c77f26975a23a310b6dc06c75ca934b1175938a Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Sun, 28 Sep 2025 18:43:21 +0800 Subject: [PATCH 2/5] feat:111 --- apps/login.js | 39 ++++++++++++++++++++++----------------- lib/login/lgr.js | 9 +++++++++ lib/login/napcat.js | 9 +++++++++ 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/apps/login.js b/apps/login.js index 2fdae68..bc5256f 100644 --- a/apps/login.js +++ b/apps/login.js @@ -5,6 +5,8 @@ import config from '../../../lib/config/config.js'; import configControl from '../lib/config/configControl.js'; import axios from 'axios'; 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(); //正在进行的登录会话 @@ -53,15 +55,15 @@ export default class LoginService extends plugin { const binds = config?.login?.userBinds[userId] || []; if (binds.length === 0) { if (isAdmin) { - e.reply('请告诉我要登录的 QQ 号', true); + e.reply('你想登哪个qq?', true); loginSessions.set(userId, { step: 'askQq', admin: true }); } else { - return e.reply('你没有绑定可登录的账号，请联系管理员分配..', true); + return e.reply('管理员似乎没有给你分配可用账户,请联系管理员添加..', true); } } else if (binds.length === 1) { targetQq = binds[0]; } else { - e.reply(`你绑定了多个账号，请选择要登录的 QQ:\n${binds.join('\n')}`, true); + e.reply(`你小子账号还挺多,选一个qq登录吧:\n${binds.join('\n')}`, true); loginSessions.set(userId, { step: 'chooseQq', options: binds }); } } @@ -71,7 +73,7 @@ export default class LoginService extends plugin { } else { const binds = config?.login?.userBinds[userId] || []; if (!binds.includes(targetQq)) { - return e.reply('你没有权限登录该账号，请联系管理员分配', true); + return e.reply('你没有权限登录该账号,请联系管理员分配..', true); } await this.startUserLogin(e, targetQq); } @@ -84,7 +86,7 @@ export default class LoginService extends plugin { qq, admin: true, }); - e.reply(`请告诉我 QQ[${qq}] 的英文昵称`, true); + e.reply(`QQ[${qq}]的英文名叫什么?`, true); } /** 普通用户登录 */ @@ -124,6 +126,7 @@ export default class LoginService extends plugin { const qq = match[1]; const at = e.at || e.user_id; if (!config?.userBinds[at]) { + ``; e.reply('该用户没有绑定账号', true); return; } @@ -140,7 +143,7 @@ export default class LoginService extends plugin { if (session.step === 'askQq') { session.qq = e.msg.trim(); session.step = 'askNickname'; - e.reply(`请告诉我 QQ[${session.qq}] 的英文昵称`, true); + e.reply(`QQ[${session.qq}]的英文名叫什么?`, true); return; } @@ -151,21 +154,21 @@ export default class LoginService extends plugin { } session.qq = e.msg.trim(); session.step = 'askMethod'; - e.reply(`请选择登录方式（回复 "nc" 或 "lgr"）来登录 QQ[${session.qq}]`, true); + e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); return; } if (session.step === 'askNickname') { session.nickname = e.msg.trim(); session.step = 'askMethod'; - e.reply('请选择登录方式（回复 "nc" 或 "lgr"）', true); + e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); return; } if (session.step === 'askMethod') { const method = e.msg.trim().toLowerCase(); if (!['nc', 'lgr'].includes(method)) { - e.reply('登录方式无效，请回复 "nc" 或 "lgr"', true); + e.reply('登录方式无效', true); return; } session.method = method; @@ -176,33 +179,35 @@ export default class LoginService extends plugin { /** 执行登录 */ async doLogin(e, session) { + const redis = global.redis | undefined; + if (!redis) return e.reply('未找到全局redis服务..', true); const { qq, method, nickname } = session; e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true); let loginInstance; if (method === 'nc') { - loginInstance = NapcatService(); + loginInstance = new NapcatService(); } else { - loginInstance = LgrService(); + loginInstance = new LgrService(); } - const qrPath = await loginInstance.login(); + const qrPath = await loginInstance.login(qq, nickname); e.reply(segment.image(qrPath), true); const timerKey = `login:timer:${qq}`; - redis.setex(timerKey, 120, 'pending'); + redis.set(timerKey, 120, 'pending'); const check = setInterval(async () => { const status = await loginInstance.checkStatus(); - if (status === 'success') { + if (status) { clearInterval(check); redis.del(timerKey); - e.reply(`QQ[${qq}] 登录成功！`, true); + e.reply(`QQ[${qq}] 登录成功!`, true); } const ttl = await redis.ttl(timerKey); if (ttl <= 0) { clearInterval(check); - await loginInstance.disconnect(); - e.reply(`QQ[${qq}] 登录超时，已断开`, true); + await loginInstance.disconnect(nickname); + e.reply(`QQ[${qq}] 登录超时,已断开,请重新发起登录..`, true); } }, 5000); } diff --git a/lib/login/lgr.js b/lib/login/lgr.js index 422c60c..d8e1802 100644 --- a/lib/login/lgr.js +++ b/lib/login/lgr.js @@ -98,4 +98,13 @@ export default class LgrService { return `关闭会话失败: ${err.message}`; } } + + /** + * qq是否登录成功 + * @param qq + * @returns {Promise} + */ + async checkStatus(qq) { + return Bot.uin.includes(qq); + } } diff --git a/lib/login/napcat.js b/lib/login/napcat.js index 20372c5..22f72a0 100644 --- a/lib/login/napcat.js +++ b/lib/login/napcat.js @@ -104,4 +104,13 @@ export default class NapcatService { return `关闭会话失败: ${err.message}`; } } + + /** + * qq是否登录成功 + * @param qq + * @returns {Promise} + */ + async checkStatus(qq) { + return Bot.uin.includes(qq); + } } From 1481eb024a81e6fec1a8d8515ce38f5ab8c305be Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Mon, 29 Sep 2025 13:31:08 +0800 Subject: [PATCH 3/5] feat:111 --- apps/login.js | 153 +++++++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 58 deletions(-) diff --git a/apps/login.js b/apps/login.js index bc5256f..a97c703 100644 --- a/apps/login.js +++ b/apps/login.js @@ -46,7 +46,7 @@ export default class LoginService extends plugin { const img = await Meme.getMeme('zhenxun', 'default'); return e.reply(segment.img(img)); //都不在群里玩什么;[ } - const isAdmin = e.isAdmin; + const isAdmin = e.isMaster; const userId = e.user_id; const match = e.msg.match(/^#登录(\d+)?$/); let targetQq = match[1]; @@ -55,16 +55,16 @@ export default class LoginService extends plugin { const binds = config?.login?.userBinds[userId] || []; if (binds.length === 0) { if (isAdmin) { - e.reply('你想登哪个qq?', true); loginSessions.set(userId, { step: 'askQq', admin: true }); + return e.reply('你想登哪个qq?', true); } else { return e.reply('管理员似乎没有给你分配可用账户,请联系管理员添加..', true); } } else if (binds.length === 1) { targetQq = binds[0]; } else { - e.reply(`你小子账号还挺多,选一个qq登录吧:\n${binds.join('\n')}`, true); loginSessions.set(userId, { step: 'chooseQq', options: binds }); + return e.reply(`你小子账号还挺多,选一个qq登录吧:\n${binds.join('\n')}`, true); } } @@ -79,30 +79,47 @@ export default class LoginService extends plugin { } } - /** 管理员登录交互 */ + /** + * 管理员登录 + * @param e + * @param qq + * @returns {Promise<*>} + */ async startAdminLogin(e, qq) { loginSessions.set(e.user_id, { step: 'askNickname', qq, admin: true, }); - e.reply(`QQ[${qq}]的英文名叫什么?`, true); + return e.reply(`QQ[${qq}]的英文名叫什么?`, true); } - /** 普通用户登录 */ + /** + * 普通用户 + * @param e + * @param qq + * @returns {Promise<*>} + */ async startUserLogin(e, qq) { loginSessions.set(e.user_id, { step: 'askMethod', qq, admin: false, }); - e.reply(`请选择登录方式\nnc或lgr\n来登录 QQ[${qq}]`, true); + return e.reply(`请选择登录方式\nnc或lgr\n来登录 QQ[${qq}]`, true); } - /** 绑定账号 */ + /** + * 绑定账号 + * @param e + * @returns {Promise<*>} + */ async bindAccount(e) { let config = await configControl.get()?.login; - if (!e.isAdmin) return; + if (!e.isMaster) { + const img = await Meme.getMeme('zhenxun', 'default'); + return e.reply(segment.img(img)); + } const match = e.msg.match(/^#绑定账号\s+(\d+)$/); if (!match) return; const qq = match[1]; @@ -111,15 +128,22 @@ export default class LoginService extends plugin { if (!config?.userBinds[at].includes(qq)) { config.userBinds[at].push(qq); await ConfigControl.set('login', config); - e.reply(`已为 ${at} 绑定账号 ${qq}`, true); + return e.reply(`已为 ${at} 绑定账号 ${qq}`, true); } else { - e.reply(`该用户已绑定此账号`, true); + return e.reply(`该用户已绑定此账号`, true); } } - /** 解绑账号 */ + /** + * 解绑账号 + * @param e + * @returns {Promise<*|boolean>} + */ async unbindAccount(e) { - if (!e.isAdmin) return false; + if (!e.isMaster) { + const img = await Meme.getMeme('zhenxun', 'default'); + return e.reply(segment.img(img)); + } let config = await configControl.get()?.login; const match = e.msg.match(/^#解绑账号\s+(\d+)$/); if (!match) return; @@ -127,49 +151,52 @@ export default class LoginService extends plugin { const at = e.at || e.user_id; if (!config?.userBinds[at]) { ``; - e.reply('该用户没有绑定账号', true); - return; + return e.reply('该用户没有绑定账号', true); } config.userBinds[at] = config.userBinds[at].filter((q) => q !== qq); await ConfigControl.set('login', config); - e.reply(`已为 ${at} 解绑账号 ${qq}`, true); + return e.reply(`已为 ${at} 解绑账号 ${qq}`, true); } - /** 捕获消息继续交互 */ + /** + * 登录流程 + * @param e + * @returns {Promise<*>} + */ async accept(e) { const session = loginSessions.get(e.user_id); - if (!session) return; + if ( + !session || + !e.group_id || + !(await ConfigControl.get()?.login?.allowGroups.includes(e.group_id)) + ) + return; if (session.step === 'askQq') { session.qq = e.msg.trim(); session.step = 'askNickname'; - e.reply(`QQ[${session.qq}]的英文名叫什么?`, true); - return; + return e.reply(`QQ[${session.qq}]的英文名叫什么?`, true); } if (session.step === 'chooseQq') { if (!session.options.includes(e.msg.trim())) { - e.reply('请选择列表中的 QQ', true); - return; + return e.reply('请选择列表中的 QQ', true); } session.qq = e.msg.trim(); session.step = 'askMethod'; - e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); - return; + return e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); } if (session.step === 'askNickname') { session.nickname = e.msg.trim(); session.step = 'askMethod'; - e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); - return; + return e.reply(`请选择登录方式\n[nc]或[lgr]\n来登录 QQ[${session.qq}]`, true); } if (session.step === 'askMethod') { const method = e.msg.trim().toLowerCase(); if (!['nc', 'lgr'].includes(method)) { - e.reply('登录方式无效', true); - return; + return e.reply('登录方式无效', true); } session.method = method; loginSessions.delete(e.user_id); @@ -177,38 +204,48 @@ export default class LoginService extends plugin { } } - /** 执行登录 */ + /** + * 执行登录 + * @param e + * @param session + * @returns {Promise<*>} + */ async doLogin(e, session) { - const redis = global.redis | undefined; - if (!redis) return e.reply('未找到全局redis服务..', true); - const { qq, method, nickname } = session; - e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true); + try { + const redis = global.redis; + //if (!redis) return e.reply('未找到全局redis服务..', true); + const { qq, method, nickname } = session; + e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true); - let loginInstance; - if (method === 'nc') { - loginInstance = new NapcatService(); - } else { - loginInstance = new LgrService(); + let loginInstance; + if (method === 'nc') { + loginInstance = new NapcatService(); + } else { + loginInstance = new LgrService(); + } + + const qrPath = await loginInstance.login(qq, nickname); + e.reply(segment.image(qrPath), true); + const timerKey = `login:timer:${qq}`; + await redis.set(timerKey, 120, 'pending'); + + const check = setInterval(async () => { + const status = await loginInstance.checkStatus(); + if (status) { + clearInterval(check); + await redis.del(timerKey); + return e.reply(`QQ[${qq}] 登录成功!`, true); + } + const ttl = await redis.ttl(timerKey); + if (ttl <= 0) { + clearInterval(check); + await loginInstance.disconnect(nickname); + return e.reply(`QQ[${qq}] 登录超时,已断开,请重新发起登录..`, true); + } + }, 5000); + } catch (err) { + logger.error('[crystelf-admin]登录流程出现错误', err); + return e.reply(`出了点小问题，过会儿再来试试吧..`); } - - const qrPath = await loginInstance.login(qq, nickname); - e.reply(segment.image(qrPath), true); - const timerKey = `login:timer:${qq}`; - redis.set(timerKey, 120, 'pending'); - - const check = setInterval(async () => { - const status = await loginInstance.checkStatus(); - if (status) { - clearInterval(check); - redis.del(timerKey); - e.reply(`QQ[${qq}] 登录成功!`, true); - } - const ttl = await redis.ttl(timerKey); - if (ttl <= 0) { - clearInterval(check); - await loginInstance.disconnect(nickname); - e.reply(`QQ[${qq}] 登录超时,已断开,请重新发起登录..`, true); - } - }, 5000); } } From 1c0c71a405acb8ed005638e364ec79a1fbe4bdaf Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Mon, 29 Sep 2025 16:39:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/login.js | 6 +++--- lib/config/configControl.js | 2 +- lib/core/meme.js | 15 ++------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/apps/login.js b/apps/login.js index a97c703..1d95e26 100644 --- a/apps/login.js +++ b/apps/login.js @@ -44,7 +44,7 @@ export default class LoginService extends plugin { let config = await configControl.get(); if (!config?.login?.allowGroups.includes(e.group_id)) { const img = await Meme.getMeme('zhenxun', 'default'); - return e.reply(segment.img(img)); //都不在群里玩什么;[ + return e.reply(segment.image(img)); //都不在群里玩什么;[ } const isAdmin = e.isMaster; const userId = e.user_id; @@ -118,7 +118,7 @@ export default class LoginService extends plugin { let config = await configControl.get()?.login; if (!e.isMaster) { const img = await Meme.getMeme('zhenxun', 'default'); - return e.reply(segment.img(img)); + return e.reply(segment.image(img)); } const match = e.msg.match(/^#绑定账号\s+(\d+)$/); if (!match) return; @@ -142,7 +142,7 @@ export default class LoginService extends plugin { async unbindAccount(e) { if (!e.isMaster) { const img = await Meme.getMeme('zhenxun', 'default'); - return e.reply(segment.img(img)); + return e.reply(segment.image(img)); } let config = await configControl.get()?.login; const match = e.msg.match(/^#解绑账号\s+(\d+)$/); diff --git a/lib/config/configControl.js b/lib/config/configControl.js index 85e0847..546f263 100644 --- a/lib/config/configControl.js +++ b/lib/config/configControl.js @@ -70,7 +70,7 @@ async function init() { } } if (!Array.isArray(configCache)) { - configCache = fc.mergeConfig(configCache, defaultConfig); + configCache = fc.mergeConfig(configCache, configCache.config || {}); } if (configCache.debug) { logger.info('[crystelf-admin] 配置模块初始化成功..'); diff --git a/lib/core/meme.js b/lib/core/meme.js index 8cb00b4..375c27c 100644 --- a/lib/core/meme.js +++ b/lib/core/meme.js @@ -2,23 +2,12 @@ import ConfigControl from '../config/configControl.js'; import axios from 'axios'; const Meme = { - /** - * 获取随机表情 - * @param character 角色名称 - * @param status 角色状态 - * @returns {Promise>} - */ async getMeme(character, status) { const coreConfig = await ConfigControl.get()?.coreConfig; const coreUrl = coreConfig?.coreUrl; const token = coreConfig?.token; - return await axios.get(`${coreUrl}/api/meme`, { - params: { - character: character, - status: status, - token: token, - }, - }); + //logger.info(`${coreUrl}/api/meme`); + return `${coreUrl}/api/meme?token=${token}?character=${character}&status=${status}`; }, }; From 304f2c9e6cec1a1afbfbb9f8c33a5b34cd46c1fc Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Mon, 29 Sep 2025 16:44:39 +0800 Subject: [PATCH 5/5] fix:111 --- apps/coreRestart.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/apps/coreRestart.js b/apps/coreRestart.js index 21128ab..ed16173 100644 --- a/apps/coreRestart.js +++ b/apps/coreRestart.js @@ -13,11 +13,6 @@ export default class CoreRestart extends plugin { fnc: 'restart', permission: 'master', }, - { - reg: '^test$', - fnc: 'test', - permission: 'master', - }, ], }); } @@ -40,14 +35,4 @@ export default class CoreRestart extends plugin { await e.reply(`核心重启花的时间有点久了呢..${restartTime?.data?.data}`, true); } } - - async test(e) { - logger.info(configControl.get()); - - await configControl.set('napcat', { - basePath: '114514', - userPath: '44444', - }); - logger.info(configControl.get()); - } }