Skip to content

Commit 3ace9fa

Browse files
committed
refactor: 通过方法访问config
1 parent 6691431 commit 3ace9fa

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ git -C ./plugins/Yunzai-Kuro-Plugin/ pull
8686

8787
(可能 12 月中下旬开始继续更新咕咕咕)
8888

89-
- [ ] 部分项目可配置化(日志等级, 写出日志文件), 适配锅巴
9089
- [ ] 代码重构: 多uid切换
9190
- [ ] 战双签到 指令的时间估计
9291
- [ ] 增加 游戏签到 补签功能

components/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ class ConfigReader {
3535
}
3636
}
3737

38-
export default new ConfigReader().readConfig()
38+
export default new ConfigReader()

components/logger.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import config from './config.js'
66

77
class Logger {
88
constructor(
9-
logLevel = config.logger.logLevel || 'info',
9+
logLevel = config.getConfig().logger.logLevel || 'info',
1010
logDirectory = dataPath + '/logs'
1111
) {
1212
this.logLevel = logLevel.toLowerCase()
@@ -31,7 +31,7 @@ class Logger {
3131
if (logType === 'ERROR') logger.error(chalk.red(logToConsole))
3232

3333
// 保存日志到文件
34-
if(config.logger.saveToFile) {
34+
if(config.getConfig().logger.saveToFile) {
3535
const timestamp = new Date().toISOString()
3636
const logToFile = `[${timestamp}] ${baseLogContent}`
3737
const currentLogFilePath = path.join(this.logDirectory, this.currentLogFile)
@@ -99,8 +99,7 @@ class Logger {
9999
}
100100

101101
// 初始化全局日志记录器实例
102-
console.log(JSON.stringify(config))
103-
const kuroLogger = new Logger(config.logger.logLevel || 'info')
102+
const kuroLogger = new Logger(config.getConfig().logger.logLevel || 'info')
104103
logger.info(chalk.gray(`[库洛插件][LOGGER] Logger initialized!`))
105104

106105
export default kuroLogger

index.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
} from './data/system/pluginConstants.js'
88
import { initAutoTask, checkUpdateTask } from './model/autoTask.js'
99

10-
kuroLogger.info(pluginThemeColor('============(≧∇≦)ノ============'))
11-
kuroLogger.info(pluginThemeColor(`库洛插件 V${pluginVer} 开始载入~`))
10+
await kuroLogger.info(pluginThemeColor('============(≧∇≦)ノ============'))
11+
await kuroLogger.info(pluginThemeColor(`库洛插件 V${pluginVer} 开始载入~`))
1212

13-
kuroLogger.info(pluginThemeColor(`-----------载入模块-----------`))
13+
await kuroLogger.info(pluginThemeColor(`-----------载入模块-----------`))
1414

1515
const files = fs.readdirSync(appsPath).filter((file) => file.endsWith('.js'))
1616

@@ -27,24 +27,23 @@ for (let i in files) {
2727
let name = files[i].replace('.js', '')
2828

2929
if (ret[i].status !== 'fulfilled') {
30-
kuroLogger.error(`载入模块错误:${name}`)
31-
kuroLogger.error(ret[i].reason)
30+
await kuroLogger.error(`载入模块错误:${name}: ${ret[i].reason}`)
3231
continue
3332
} else {
34-
kuroLogger.info(pluginThemeColor(`载入模块成功:${name}`))
33+
await kuroLogger.info(pluginThemeColor(`载入模块成功:${name}`))
3534
}
3635
apps[name] = ret[i].value[Object.keys(ret[i].value)[0]]
3736
}
38-
kuroLogger.info(pluginThemeColor(`载入模块完成!`))
37+
await kuroLogger.info(pluginThemeColor(`载入模块完成!`))
3938
export { apps }
4039

41-
kuroLogger.info(pluginThemeColor(`---------载入定时任务---------`))
42-
initAutoTask()
40+
await kuroLogger.info(pluginThemeColor(`---------载入定时任务---------`))
41+
await initAutoTask()
4342

44-
kuroLogger.info(pluginThemeColor(`载入定时任务完成啦!`))
43+
await kuroLogger.info(pluginThemeColor(`载入定时任务完成啦!`))
4544

46-
kuroLogger.info(pluginThemeColor('插件载入完成, 欢迎使用~'))
47-
kuroLogger.info(pluginThemeColor('=============================='))
45+
await kuroLogger.info(pluginThemeColor('插件载入完成, 欢迎使用~'))
46+
await kuroLogger.info(pluginThemeColor('=============================='))
4847

4948
// 起洞就检查一下更新
5049
await checkUpdateTask()

0 commit comments

Comments
 (0)