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', () => {