build: 1.3.7

Author: cssxsh

build.gradle.kts

@@ -1,22 +1,22 @@
 plugins {
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("jvm") version "1.7.22"
+    kotlin("plugin.serialization") version "1.7.22"
 
-    id("net.mamoe.mirai-console") version "2.12.1"
+    id("net.mamoe.mirai-console") version "2.13.2"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "io.github.gnuf0rce"
-version = "1.3.6"
+version = "1.3.7"
 
 mavenCentralPublish {
     useCentralS01()
     singleDevGithubProject("gnuf0rce", "netdisk-filesync-plugin", "cssxsh")
     licenseFromGitHubProject("AGPL-3.0")
     workingDir = System.getenv("PUBLICATION_TEMP")?.let { file(it).resolve(projectName) }
-        ?: project.buildDir.resolve("publishing-tmp")
+        ?: buildDir.resolve("publishing-tmp")
     publication {
-        artifact(tasks.getByName("buildPlugin"))
+        artifact(tasks["buildPlugin"])
     }
 }
 
@@ -26,15 +26,16 @@ repositories {
 }
 
 dependencies {
-    api("xyz.cssxsh.baidu:baidu-netdisk:3.2.0") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    compileOnly("net.mamoe:mirai-core-utils:2.12.1")
-    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.4.3")
-    //
+    api("xyz.cssxsh.baidu:baidu-netdisk:3.3.0")
+    compileOnly("xyz.cssxsh.mirai:mirai-hibernate-plugin:2.5.1")
     testImplementation(kotlin("test"))
+    //
+    implementation(platform("net.mamoe:mirai-bom:2.13.2"))
+    compileOnly("net.mamoe:mirai-console-compiler-common")
+    testImplementation("net.mamoe:mirai-logging-slf4j")
+    //
+    implementation(platform("org.slf4j:slf4j-parent:2.0.6"))
+    testImplementation("org.slf4j:slf4j-simple")
 }
 
 mirai {

readme.md

@@ -3,7 +3,7 @@
 > 基于 [Mirai Console](https://github.com/mamoe/mirai-console) 的 文件同步/备份 插件
 
 [![Release](https://img.shields.io/github/v/release/gnuf0rce/Netdisk-FileSync-Plugin)](https://github.com/gnuf0rce/Netdisk-FileSync-Plugin/releases)
-![Downloads](https://img.shields.io/github/downloads/gnuf0rce/Netdisk-FileSync-Plugin/total)
+[![Downloads](https://img.shields.io/github/downloads/gnuf0rce/Netdisk-FileSync-Plugin/total)](https://repo1.maven.org/maven2/io/github/gnuf0rce/netdisk-filesync-plugin/)
 [![MiraiForum](https://img.shields.io/badge/post-on%20MiraiForum-yellow)](https://mirai.mamoe.net/topic/765)
 [![maven-central](https://img.shields.io/maven-central/v/io.github.gnuf0rce/netdisk-filesync-plugin)](https://search.maven.org/artifact/io.github.gnuf0rce/netdisk-filesync-plugin)
 
@@ -31,7 +31,9 @@
 
 ### upload.yml
 
-* https 使用Https协议下载文件
+*   `https` 使用Https协议下载文件
+*   `reply` 同步后回复消息
+*   `log` 插件启动时上传日志文件
 
 ## 在插件项目中引用
 
@@ -43,6 +45,10 @@ repositories {
 dependencies {
     compileOnly("io.github.gnuf0rce:netdisk-filesync-plugin:${version}")
 }
+
+mirai {
+    jvmTarget = JavaVersion.VERSION_11
+}
 ``` 
 
 ### 示例代码
@@ -60,9 +66,9 @@ dependencies {
 
 ### MCL 指令安装
 
-`./mcl --update-package io.github.gnuf0rce:netdisk-filesync-plugin --channel stable --type plugin`
+`./mcl --update-package io.github.gnuf0rce:netdisk-filesync-plugin --channel maven-stable --type plugin`
 
 ### 手动安装
 
-1. 运行 [Mirai Console](https://github.com/mamoe/mirai-console) 生成`plugins`文件夹
-1. 从 [Releases](https://github.com/gnuf0rce/Netdisk-FileSync-Plugin/releases) 下载`jar`并将其放入`plugins`文件夹中
+1.  从 [Releases](https://github.com/gnuf0rce/Netdisk-FileSync-Plugin/releases) 或者 [Maven](https://repo1.maven.org/maven2/io/github/gnuf0rce/netdisk-filesync-plugin/) 下载 `mirai2.jar`
+2.  将其放入 `plugins` 文件夹中

settings.gradle.kts

@@ -1,9 +1 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "netdisk-filesync-plugin"

src/main/kotlin/io/github/gnuf0rce/mirai/netdisk/NetDisk.kt

@@ -93,6 +93,8 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
 
     override val apiIgnore: suspend (Throwable) -> Boolean = { throwable ->
         when (throwable) {
+            is java.net.UnknownHostException,
+            is java.net.NoRouteToHostException -> false
             is IOException -> {
                 val count = ++throwable::class.count
                 if (count > 10) {
@@ -245,7 +247,7 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
             rapid(upload = rapid)
             return rapid
         } catch (cause: ClientRequestException) {
-            logger.info { "文件 ${file.name} 秒传失败, 进入文件上传, ${cause.message}" }
+            logger.info { "文件 ${file.name} 秒传失败, 进入文件上传, ${cause.response.bodyAsText()}" }
         } catch (exception: Exception) {
             logger.warning({ "文件 ${file.name} 秒传失败, 进入文件上传" }, exception)
         }

src/main/kotlin/io/github/gnuf0rce/mirai/netdisk/NetDiskFileSyncPlugin.kt

@@ -22,7 +22,7 @@ public object NetDiskFileSyncPlugin : KotlinPlugin(
     ) {
         author("cssxsh")
 
-        dependsOn("xyz.cssxsh.mirai.plugin.mirai-hibernate-plugin", false)
+        dependsOn("xyz.cssxsh.mirai.plugin.mirai-hibernate-plugin", true)
     }
 ) {
 
@@ -43,7 +43,7 @@ public object NetDiskFileSyncPlugin : KotlinPlugin(
             NetDiskFileSyncRecorder.enable()
             logger.info { "审核记录将记录到数据库 ${NetDiskFileSyncRecorder.database()}" }
         } catch (_: NoClassDefFoundError) {
-            logger.info { "审核记录将记录到 ContentCensorHistory.yml" }
+            logger.info { "审核记录将记录到 history.yml" }
             NetdiskSyncHistory.reload()
         }