From 5add485556839639f6c23b7f813a997712f864a0 Mon Sep 17 00:00:00 2001 From: Jerryplusy Date: Thu, 25 Sep 2025 13:55:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/coreRestart.js | 2 +- lib/system/init.js | 2 ++ modules/ws/wsClient.js | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/coreRestart.js b/apps/coreRestart.js index 26679ca..b5e8a1e 100644 --- a/apps/coreRestart.js +++ b/apps/coreRestart.js @@ -18,7 +18,7 @@ export default class CoreRestart extends plugin { } async restart(e) { - if (!configControl.get('core')) { + if (!configControl.get('config')?.core) { return e.reply(`晶灵核心未启用..`, true); } const returnData = await systemControl.systemRestart(); diff --git a/lib/system/init.js b/lib/system/init.js index 1c20632..8b49eca 100644 --- a/lib/system/init.js +++ b/lib/system/init.js @@ -1,7 +1,9 @@ import configControl from '../config/configControl.js'; +import wsClient from '../../modules/ws/wsClient.js'; export const crystelfInit = { async CSH() { await configControl.init(); + await wsClient.initialize(); }, }; diff --git a/modules/ws/wsClient.js b/modules/ws/wsClient.js index 7fd77c5..8c3b86f 100644 --- a/modules/ws/wsClient.js +++ b/modules/ws/wsClient.js @@ -19,12 +19,12 @@ class WsClient { return; } - this.wsURL = configControl.get('coreConfig')?.wsUrl; - this.secret = configControl.get('coreConfig')?.wsSecret; - this.clientId = configControl.get('coreConfig')?.wsClientId; - this.reconnectInterval = configControl.get('coreConfig')?.wsReConnectInterval; + this.wsURL = configControl.get('config')?.coreConfig?.coreUrl; + this.secret = configControl.get('config')?.coreConfig?.wsSecret; + this.clientId = configControl.get('config')?.coreConfig?.wsClientId; + this.reconnectInterval = configControl.get('config')?.coreConfig?.wsReConnectInterval; - //logger.info(this.wsURL); + //logger.info(configControl.get('config')); this.ws = new WebSocket(this.wsURL); this.ws.on('open', () => {