diff --git a/apps/groupAdmin.js b/apps/groupAdmin.js index d8e6ce8..a82c361 100644 --- a/apps/groupAdmin.js +++ b/apps/groupAdmin.js @@ -2,7 +2,8 @@ import plugin from '../../../lib/plugins/plugin.js' import { segment } from 'oicq' import _ from 'lodash' import { Config } from '../components/index.js' -import { GroupAdmin as ga, common, QQApi, puppeteer, CronValidate } from '../model/index.js' +import { GroupAdmin as ga, common, QQApi, puppeteer } from '../model/index.js' +import cronValidate from '../tools/CronValidate.js' import moment from 'moment' // API请求错误文案 @@ -538,7 +539,7 @@ export class GroupAdmin extends plugin { } else { cron = RegRet[2] // 校验cron表达式 - let Validate = CronValidate(cron.trim()) + let Validate = cronValidate(cron.trim()) if (Validate !== true) return e.reply(Validate) } diff --git a/apps/state.js b/apps/state.js index 18feb58..b43c930 100644 --- a/apps/state.js +++ b/apps/state.js @@ -1,12 +1,12 @@ import plugin from '../../../lib/plugins/plugin.js' import os from 'os' import { Config } from '../components/index.js' -import { CPU, common, puppeteer } from '../model/index.js' +import { State, common, puppeteer } from '../model/index.js' import moment from 'moment' import _ from 'lodash' let interval = false -export class State extends plugin { +export class NewState extends plugin { constructor () { super({ name: '椰奶状态', @@ -25,21 +25,21 @@ export class State extends plugin { async state (e) { if (!/椰奶/.test(e.msg) && !Config.Notice.state) return false - if (!CPU.si) return e.reply('❎ 没有检测到systeminformation依赖,请运行:"pnpm add systeminformation -w"进行安装') + if (!State.si) return e.reply('❎ 没有检测到systeminformation依赖,请运行:"pnpm add systeminformation -w"进行安装') // 防止多次触发 if (interval) { return false } else interval = true // 系统 - let osinfo = await CPU.si.osInfo() + let osinfo = await State.si.osInfo() // 可视化数据 let visualData = _.compact([ // CPU板块 - await CPU.getCpuInfo(osinfo.arch), + await State.getCpuInfo(osinfo.arch), // 内存板块 - await CPU.getMemUsage(), + await State.getMemUsage(), // GPU板块 - await CPU.getGPU(), + await State.getGPU(), // Node板块 - await CPU.getNodeInfo() + await State.getNodeInfo() ]) // 渲染数据 let data = { @@ -70,15 +70,15 @@ export class State extends plugin { // 在线状态 status: common.status[Bot.status], // 硬盘内存 - HardDisk: await CPU.getfsSize(), + HardDisk: await State.getfsSize(), // FastFetch - FastFetch: await CPU.getFastFetch(e), + FastFetch: await State.getFastFetch(e), // 取插件 - plugin: CPU.numberOfPlugIns, + plugin: State.numberOfPlugIns, // 硬盘速率 - fsStats: CPU.DiskSpeed, + fsStats: State.DiskSpeed, // 网络 - network: CPU.getnetwork, + network: State.getnetwork, // 可视化数据 visualData, // 系统信息 diff --git a/model/CPU.js b/model/State.js similarity index 100% rename from model/CPU.js rename to model/State.js diff --git a/model/index.js b/model/index.js index bfbf9e8..f241b3d 100644 --- a/model/index.js +++ b/model/index.js @@ -1,9 +1,8 @@ import puppeteer from '../lib/puppeteer/puppeteer.js' -import uploadRecord from '../lib/uploadRecord/uploadRecord.js' +import uploadRecord from '../tools/uploadRecord.js' import Bika from './Bika.js' import common from '../lib/common/common.js' -import CPU from './CPU.js' -import CronValidate from './CronValidate.js' +import State from './State.js' import GroupAdmin from './GroupAdmin.js' import funApi from './api/funApi.js' import Pixiv from './Pixiv.js' @@ -12,7 +11,7 @@ import setu from './setu.js' import Ascii2D from './PicSearch/ascii2d.js' import SauceNAO from './PicSearch/saucenao.js' import WhatAnime from './PicSearch/whatanime.js' -const PicSearch = { +export const PicSearch = { Ascii2D, SauceNAO, WhatAnime @@ -20,14 +19,12 @@ const PicSearch = { export { puppeteer, common, - CPU, + State, Pixiv, setu, Bika, uploadRecord, - CronValidate, GroupAdmin, QQApi, - funApi, - PicSearch + funApi } diff --git a/model/CronValidate.js b/tools/cronValidate.js similarity index 100% rename from model/CronValidate.js rename to tools/cronValidate.js diff --git a/lib/uploadRecord/uploadRecord.js b/tools/uploadRecord.js similarity index 100% rename from lib/uploadRecord/uploadRecord.js rename to tools/uploadRecord.js