diff --git a/src/main/kotlin/info/alinadace/miraibot/annotation/BotFunction.kt b/src/main/kotlin/info/alinadace/miraibot/annotation/BotFunction.kt index f948140..d82dc6c 100644 --- a/src/main/kotlin/info/alinadace/miraibot/annotation/BotFunction.kt +++ b/src/main/kotlin/info/alinadace/miraibot/annotation/BotFunction.kt @@ -13,5 +13,5 @@ import kotlin.reflect.KClass */ @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) -@org.springframework.stereotype.Service("BotFunction") +@org.springframework.stereotype.Service annotation class BotFunction(vararg val value: KClass) diff --git a/src/main/kotlin/info/alinadace/miraibot/configuration/BotConfig.kt b/src/main/kotlin/info/alinadace/miraibot/configuration/BotConfig.kt index dd6a933..5162093 100644 --- a/src/main/kotlin/info/alinadace/miraibot/configuration/BotConfig.kt +++ b/src/main/kotlin/info/alinadace/miraibot/configuration/BotConfig.kt @@ -6,17 +6,30 @@ import org.springframework.context.annotation.Configuration /** * 机器人配置 - * @param id 机器人QQ号 - * @param password 机器人密码 * @author Kane * @since 2024/8/29 下午2:39 */ @Configuration @ConfigurationProperties("bot") class BotConfig { + /** + * 机器人QQ号 + */ final var id: Long = 0L + + /** + * 机器人密码 + */ final var password: String = "" + + /** + * 机器人登录方式 + */ final var type: LoginType = LoginType.PASSWORD + + /** + * 管理员QQ + */ final var admin: Long = 0L constructor() diff --git a/src/main/kotlin/info/alinadace/miraibot/configuration/Initialization.kt b/src/main/kotlin/info/alinadace/miraibot/configuration/Initialization.kt index f46bd89..f55e094 100644 --- a/src/main/kotlin/info/alinadace/miraibot/configuration/Initialization.kt +++ b/src/main/kotlin/info/alinadace/miraibot/configuration/Initialization.kt @@ -18,6 +18,7 @@ import kotlin.reflect.KClass */ @org.springframework.stereotype.Service class Initialization { + @Suppress("SpringJavaInjectionPointsAutowiringInspection") @Resource(name = "functionMap") lateinit var functionMap: HashMap, MutableList>> @@ -36,6 +37,10 @@ class Initialization { } } + GlobalEventChannel.subscribeAlways(Event::class) { + log.info("GlobalEvent: {}", this) + } + log.info("Channel complete") log.info("Login: id:{}", bot.id) bot.login()