Merge remote-tracking branch 'origin/dev/main' into dev/main

simple-robot · Jun 23, 2024 · f75de77 · f75de77
2 parents 73739c6 + f726fc5
commit f75de77
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -41,7 +41,7 @@ object P {
         override val homepage: String get() = HOMEPAGE
 
 
-        private val baseVersion = v(0, 9, 0)
+        private val baseVersion = v(0, 9, 1)
 
         val snapshotVersion = baseVersion - Version.SNAPSHOT
         override val version = if (isSnapshot()) snapshotVersion else baseVersion

diff --git a/...c/jvmMain/kotlin/love/forte/simbot/component/onebot/v11/core/api/OneBotApiRequests.jvm.kt b/...c/jvmMain/kotlin/love/forte/simbot/component/onebot/v11/core/api/OneBotApiRequests.jvm.kt
@@ -557,4 +557,4 @@ public fun <T : Any> OneBotApi<T>.requestDataReserve(
 
 
 internal actual fun initConfig(key: String, default: String?): String? =
-    System.getProperty(key)
+    System.getProperty(key) ?: default
diff --git a/...ot-component-onebot-v11/simbot-component-onebot-v11-core/src/jvmTest/resources/log4j2.xml b/...ot-component-onebot-v11/simbot-component-onebot-v11-core/src/jvmTest/resources/log4j2.xml
@@ -9,6 +9,9 @@
         <Logger name="love.forte.simbot.component.onebot" level="debug" additivity="false">
             <AppenderRef ref="Console"/>
         </Logger>
+        <Logger name="io.ktor.client" level="debug" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
         <Root level="error">
             <AppenderRef ref="Console"/>
         </Root>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -557,4 +557,4 @@ public fun <T : Any> OneBotApi<T>.requestDataReserve(


		internal actual fun initConfig(key: String, default: String?): String? =
		System.getProperty(key)
		System.getProperty(key) ?: default