重构完成

Author: Nekoer

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.hcyacg"
-version = "1.1"
+version = "1.2"
 
 repositories {
     mavenLocal()

src/main/kotlin/GithubNotice.kt

@@ -2,18 +2,14 @@ package com.hcyacg
 
 
 import com.hcyacg.command.Github
-import com.hcyacg.initial.Configuration
-import com.hcyacg.initial.Configuration.Companion.init
+import com.hcyacg.initial.Configurations.Companion.init
 
 
 import net.mamoe.mirai.console.command.CommandManager
 
 import net.mamoe.mirai.console.extension.PluginComponentStorage
-import net.mamoe.mirai.console.plugin.info
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
-import net.mamoe.mirai.event.GlobalEventChannel
-import net.mamoe.mirai.event.events.GroupMessageEvent
 import net.mamoe.mirai.utils.info
 
 
@@ -32,10 +28,10 @@ object GithubNotice : KotlinPlugin(
 
     override fun onEnable() {
         CommandManager.registerCommand(Github(),true)
-        logger.info { "Plugin loaded" }
-        GlobalEventChannel.subscribeAlways<GroupMessageEvent> { event ->
+        logger.info { "github更新通知 loaded" }
+//        GlobalEventChannel.subscribeAlways<GroupMessageEvent> { event ->
 //            GithubTask.event = event
-        }
+//        }
     }
 
 

src/main/kotlin/command/Github.kt

@@ -3,15 +3,12 @@ package com.hcyacg.command
 import com.hcyacg.GithubNotice
 import com.hcyacg.GithubTask
 import com.hcyacg.GithubTask.Companion.switch
+import com.hcyacg.initial.Configurations
+import com.hcyacg.initial.Configurations.Companion.overload
 
 
-import com.hcyacg.initial.Configuration
 import net.mamoe.mirai.console.command.*
-import net.mamoe.mirai.console.command.descriptor.ExperimentalCommandDescriptors
-import net.mamoe.mirai.event.events.GroupMessageEvent
-import net.mamoe.mirai.message.data.MessageSource.Key.quote
 import net.mamoe.mirai.utils.MiraiLogger
-import net.mamoe.mirai.utils.info
 
 class Github : CompositeCommand(
     GithubNotice,
@@ -20,7 +17,6 @@ class Github : CompositeCommand(
 ) {
     var logger: MiraiLogger = MiraiLogger.create("Bot")
 
-    @OptIn(ExperimentalCommandDescriptors::class, net.mamoe.mirai.console.util.ConsoleExperimentalApi::class)
     @SubCommand("start","启动")
     suspend fun CommandSender.start() {
         switch = true
@@ -35,9 +31,7 @@ class Github : CompositeCommand(
 
     @SubCommand("reload","重载")
     fun CommandSender.reload() {
-//        Configuration.load()
-//        GithubTask.num = 0
-//        Configuration.logger.info("配置文件已重载")
+        overload()
     }
 
 }

src/main/kotlin/github/Commits.kt

@@ -49,7 +49,7 @@ class Commits {
         var stA: String? = null
         var sha1: Any? = null
         var response: Response? = null
-        logger.warning("${projects.toString()} => ${branch.toString()}")
+//        logger.warning("${projects.toString()} => ${branch.toString()}")
         val bots = Bot.instances
 
         try {

src/main/kotlin/initial/Configuration.kt src/main/kotlin/initial/Configurations.kt

@@ -2,29 +2,27 @@ package com.hcyacg.initial
 
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
-import com.hcyacg.GithubTask
 import com.hcyacg.GithubTask.Companion.admin
 import com.hcyacg.GithubTask.Companion.groups
 import com.hcyacg.GithubTask.Companion.num
 import com.hcyacg.GithubTask.Companion.project
 import com.hcyacg.GithubTask.Companion.sha
 import com.hcyacg.GithubTask.Companion.token
 import com.hcyacg.GithubTask.Companion.users
-import kotlinx.coroutines.DelicateCoroutinesApi
 
 import net.mamoe.mirai.utils.MiraiLogger
 
 import java.io.File
 import java.io.InputStream
 
-class Configuration {
+class Configurations {
     companion object {
         private val systemPath: String = System.getProperty("user.dir")
         private val fileDirectory: File =
             File(systemPath + File.separator + "config" + File.separator + "com.hcyacg.github-notice")
         val file: File = File(fileDirectory.path + File.separator + "setting.json")
         var projectJson: JSONObject = JSONObject.parseObject("{}")
-        val path: String = Configuration::class.java.protectionDomain.codeSource.location.path
+        val path: String = Configurations::class.java.protectionDomain.codeSource.location.path
         var logger: MiraiLogger = MiraiLogger.create("Bot")
 
         /**
@@ -39,7 +37,7 @@ class Configuration {
                 fileDirectory.mkdirs()
                 file.createNewFile()
                 val resourceAsStream: InputStream? =
-                    Configuration::class.java.classLoader.getResourceAsStream("setting.json")
+                    Configurations::class.java.classLoader.getResourceAsStream("setting.json")
                 resourceAsStream?.let { file.writeBytes(it.readAllBytes()) }
                 logger.warning("初始化配置文件,请在config/com.hcyacg.github-notice/setting.json配置相关参数")
             } else {
@@ -81,4 +79,6 @@ class Configuration {
             token = projectJson.getString("token")
         }
     }
+
+
 }