From b91a76ee217ef41a083544c994d593f8ceba1371 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sun, 26 May 2024 17:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin.js         | 2 +-
 components/Data.js    | 2 +-
 guoba.support.js      | 2 +-
 model/GroupAdmin.js   | 7 ++++++-
 model/State/FsSize.js | 2 +-
 model/State/index.js  | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/admin.js b/apps/admin.js
index a444a81..7e5af66 100644
--- a/apps/admin.js
+++ b/apps/admin.js
@@ -216,7 +216,7 @@ const rodom = async function() {
 }
 
 const getStatus = function(rote, alone) {
-  let badge = alone != undefined ? "<span class=\"badge\";>群单独</span>" : ""
+  let badge = alone != undefined ? "<span class=\"badge\">群单独</span>" : ""
   if (rote) {
     return badge + "<div class=\"cfg-status\" >已开启</div>"
   } else {
diff --git a/components/Data.js b/components/Data.js
index f8d5655..57cf12b 100644
--- a/components/Data.js
+++ b/components/Data.js
@@ -59,7 +59,7 @@ let Data = {
    * @param root
    * @param space
    */
-  writeJSON(file, data, root = "", space = 2) {
+  writeJSON(file, data, root = "", space = 4) {
     // 检查并创建目录
     Data.createDir(file, root, true)
     root = getRoot(root)
diff --git a/guoba.support.js b/guoba.support.js
index f24f572..ae8088f 100644
--- a/guoba.support.js
+++ b/guoba.support.js
@@ -16,7 +16,7 @@ export function supportGuoba() {
     pluginInfo: {
       name: "yenai-plugin",
       title: "Yenai-Plugin",
-      author: "@椰羊",
+      author: "@yeyang52",
       authorLink: "https://gitee.com/yeyang52",
       link: "https://gitee.com/yeyang52/yenai-plugin",
       isV3: true,
diff --git a/model/GroupAdmin.js b/model/GroupAdmin.js
index f464fd6..133fb6d 100644
--- a/model/GroupAdmin.js
+++ b/model/GroupAdmin.js
@@ -323,7 +323,12 @@ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${item.user_id}`),
    */
   async delMuteTask(group, type) {
     let redisTask = JSON.parse(await redis.get(this.MuteTaskKey)) || []
-    loader.task = loader.task.filter(item => item.name !== `椰奶群定时${type ? "禁言" : "解禁"}${group}`)
+    const name = `椰奶群定时${type ? "禁言" : "解禁"}${group}`
+    // 终止任务
+    const task = loader.task.find(i => i.name === name)
+    task?.job?.cancel()
+
+    loader.task = loader.task.filter(item => item.name !== name)
     redisTask = redisTask.filter(item => item.group !== group && item.type !== type)
     redis.set(this.MuteTaskKey, JSON.stringify(redisTask))
     return true
diff --git a/model/State/FsSize.js b/model/State/FsSize.js
index 2adabb0..53c808a 100644
--- a/model/State/FsSize.js
+++ b/model/State/FsSize.js
@@ -6,7 +6,7 @@ import Monitor from "./Monitor.js"
  *  获取硬盘
  * @returns {*}
  */
-export default async function getFsSize() {
+export async function getFsSize() {
   // 去重
   let HardDisk = _.uniqWith(await si.fsSize(),
     (a, b) =>
diff --git a/model/State/index.js b/model/State/index.js
index 44a2eac..04dc34f 100644
--- a/model/State/index.js
+++ b/model/State/index.js
@@ -5,7 +5,7 @@ import common from "../../lib/common/common.js"
 import getBotState from "./BotState.js"
 import getCPU from "./CPU.js"
 import getFastFetch from "./FastFetch.js"
-import getFsSize, { getDiskSpeed } from "./FsSize.js"
+import { getDiskSpeed, getFsSize } from "./FsSize.js"
 import getGPU from "./GPU.js"
 import Monitor from "./Monitor.js"
 import { getNetwork, getNetworkTestList } from "./Network.js"