Merge pull request #64 from YuLinLoli/1.1.0

fix and feat

Author: diyigemt

.github/workflows/AutoUploadReleaseBuild.yml

@@ -0,0 +1,56 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: AutoUploadReleaseBuild
+
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  CreateRelease:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./arona-core
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        #安装使用jdk
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+        #构建核心模块
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v3
+        with:
+          build-root-directory: ./arona-core
+          arguments: :buildPlugin
+        #取文件名
+      - name: Get Plugin Name
+        run: |
+          echo "NAME=$(find build/mirai -name "*2.jar" -exec sh -c 'basename {} | sed "s/\.jar$//"' \;)" >> $GITHUB_ENV
+          echo "PATH=$(find build/mirai -name "*2.jar" -exec readlink -f {} +)" >> $GITHUB_ENV
+
+        #上传工件
+      - name: Upload-Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.NAME }}
+          path: ${{ env.PATH }}
+          compression-level: 0
+      #自动发布
+      - name: Publish Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "${{ env.PATH }}"
+          prerelease: ${{ contains(github.ref, 'pre') }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          allowUpdates: true

arona-core/build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
   val kotlinVersion = "1.7.10"
-  val miraiVersion = "2.13.4"
+  val miraiVersion = "2.16.0"
   kotlin("jvm") version kotlinVersion
   kotlin("plugin.serialization") version kotlinVersion
-
+  id("com.github.gmazzo.buildconfig") version "4.1.1"
   id("net.mamoe.mirai-console") version miraiVersion
 }
 
 group = "net.diyigemt"
-version = "1.1.4"
+version = "1.1.5"
 val exposedVersion = "0.38.2"
 val sqliteVersion = "3.36.0.3"
 val quartzVersion = "2.3.2"
@@ -19,8 +19,26 @@ repositories {
   maven("https://jitpack.io")
   maven("https://maven.aliyun.com/repository/public") // 阿里云国内代理仓库
   maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+  //Overflow依赖仓库
+  maven("https://s01.oss.sonatype.org/content/repositories/snapshots")
+}
+//Overflow测试需移除mirai-core
+mirai {
+  noTestCore = true
+  setupConsoleTestRuntime {
+    // 移除 mirai-core 依赖
+    classpath = classpath.filter {
+      !it.nameWithoutExtension.startsWith("mirai-core-jvm")
+    }
+  }
+}
+buildConfig {
+  className("BuildConfig")
+  packageName("net.diyigemt.arona.cg")
+  buildConfigField("String", "version", "\"${version}\"")
+  buildConfigField("String", "name", "\"blue-archive-arona\"")
+  buildConfigField("String", "id", "\"net.diyigemt.arona\"")
 }
-
 dependencies {
 //    implementation("com.github.kittinunf.fuel:fuel:2.3.1")
   implementation("org.jsoup:jsoup:1.15.1")
@@ -42,6 +60,8 @@ dependencies {
   // https://mvnrepository.com/artifact/com.github.taptap/pinyin-plus
   implementation("com.github.taptap:pinyin-plus:1.0")
   implementation("net.mamoe.yamlkt:yamlkt-jvm:0.10.2")
+  //Overflow运行时依赖
+  testConsoleRuntime("top.mrxiaom.mirai:overflow-core:1.0.4.589-05fbc9f-SNAPSHOT")
 }
 
 tasks.test {

arona-core/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

arona-core/src/main/kotlin/net/diyigemt/arona/Arona.kt

@@ -10,6 +10,7 @@ package net.diyigemt.arona
 
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import net.diyigemt.arona.cg.BuildConfig
 import net.diyigemt.arona.config.*
 import net.diyigemt.arona.db.DataBaseProvider
 import net.diyigemt.arona.extension.CommandInterceptorManager
@@ -49,9 +50,9 @@ import kotlin.io.path.absolutePathString
 
 object Arona : KotlinPlugin(
   JvmPluginDescription(
-    id = "net.diyigemt.arona",
-    name = "blue-archive-arona",
-    version = "1.1.4"
+    id = BuildConfig.id,
+    name = BuildConfig.name,
+    version = BuildConfig.version
   ) {
     author("diyigemt")
     info("是常驻这个「シッテムの箱」的系统管理员和主操作系统, 也是今后协助老师的秘书!")
@@ -124,7 +125,7 @@ object Arona : KotlinPlugin(
       INIT.forEach {
         it.init()
       }
-      NetworkUtil.registerInstance()
+
     }
 //    startUpload() // 上传图片获取mirai-code
   }

arona-core/src/main/kotlin/net/diyigemt/arona/entity/GameKeeDAO.kt

@@ -20,7 +20,8 @@ data class Data(
   val begin_at : Long,
   val end_at : Long,
   val importance : Int,
-  val count_down : Int
+  val count_down : Int,
+  val pub_area : String
 )
 
 data class Meta(

arona-core/src/main/kotlin/net/diyigemt/arona/util/GameKeeUtil.kt

@@ -13,7 +13,7 @@ import java.util.*
  *@Create 2022/7/21
  */
 object GameKeeUtil {
-  private const val url = "https://ba.gamekee.com/v1/activity/query"
+  private const val url = "https://www.gamekee.com/v1/activity/query"
   fun getEventData(server: ServerLocale) : Pair<MutableList<Activity>, MutableList<Activity>>{
     val res = NetworkUtil.request(Jsoup.connect(url))
       .header("game-alias", "ba")
@@ -38,7 +38,7 @@ object GameKeeUtil {
     }
 
     for(i in json.data){
-      if(i.title.contains(server.serverName)){
+      if(i.pub_area == server.serverName){
         method.call(
           Calendar.getInstance().time,
           Date(i.begin_at * 1000),

arona-core/src/main/kotlin/net/diyigemt/arona/util/NetworkUtil.kt

@@ -30,6 +30,7 @@ object NetworkUtil {
 
 
   // 向后端服务器注册自己
+  @Deprecated("放弃的方法")
   fun registerInstance() {
     val sysSave = SysDataUtil.get(SysStatic.UUID)
     if (sysSave == null) {