diff --git a/apps/Assistant.js b/apps/Assistant.js index 8a710e7..7a69a23 100644 --- a/apps/Assistant.js +++ b/apps/Assistant.js @@ -1,4 +1,4 @@ -import { karin, YamlEditor, config } from 'node-karin' +import { karin } from 'node-karin' import { 编辑文件 } from '#lib' export const 黑白名单 = karin.command(/^#(取消)?(拉黑|拉白)(群)?/, async (e) => { @@ -16,11 +16,4 @@ export const 黑白名单 = karin.command(/^#(取消)?(拉黑|拉白)(群)?/, as const targetType = e.msg.includes('群') ? 'Group' : 'User' return await 编辑文件.编辑黑白名单(e, type, isRemoval, targetType, id) -}, { name: '取消拉黑拉白群', priority: '-1', permission: 'master' }) - -export const 修改日志等级 = karin.command(/^#(修改|设置)日志等级/, async (e) => { - const 日志等级列表 = ['trace', 'debug', 'info', 'warn', 'fatal', 'mark', 'error', 'off'] - const 日志等级 = e.msg.replace(/^#?(设置|修改)日志等级/, '').trim() - if (!日志等级列表.includes(日志等级)) return e.reply('❎ 请输入正确的参数,可选:\ntrace,debug,info,warn,fatal,mark,error,off') - return await 编辑文件.编辑文件(e, 'config.yaml', 日志等级, 'log4jsCfg.level', '日志等级') -}, { name: '修改日志等级', priority: '-1', permission: 'master' }) \ No newline at end of file +}, { name: '取消拉黑拉白群', priority: '-1', permission: 'master' }) \ No newline at end of file diff --git a/apps/KarinSet.js b/apps/KarinSet.js index 646dd46..af55478 100644 --- a/apps/KarinSet.js +++ b/apps/KarinSet.js @@ -8,6 +8,7 @@ const cfgMap = { 黑名单群: 'App_BlackList.groups', 白名单用户: 'App_WhiteList.users', 白名单群: 'App_WhiteList.groups', + 日志等级: 'config_log4jsCfg.level', } const CfgReg = `^#?(Karin|karin|卡莲)设置\\s*(${lodash.keys(cfgMap).join('|')})?\\s*(.*)$` @@ -17,7 +18,13 @@ export const set = karin.command(CfgReg, async (e) => { if (reg && reg[2]) { let val = reg[3] || '' let cfgKey = cfgMap[reg[2]] - if (val.includes('开启') || val.includes('关闭')) { + if (cfgKey == 'config_log4jsCfg.level') { + let level = ['trace', 'debug', 'info', 'warn', 'fatal', 'mark', 'error', 'off'] + if (!level.includes(val)) { + e.reply('请输入正确的日志等级,可选:\ntrace,debug,info,warn,fatal,mark,error,off', true) + return true; + } + } else if (val.includes('开启') || val.includes('关闭')) { val = !/关闭/.test(val) } else { cfgKey = '' diff --git a/resources/admin/index.html b/resources/admin/index.html index 065ed74..8edecc3 100644 --- a/resources/admin/index.html +++ b/resources/admin/index.html @@ -12,7 +12,7 @@
-
基础设置
+
应用配置
+ +
+
通用配置
+ +
{{/block}}