subman/subconverter4j
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temp

Browse Source
This commit is contained in:
Rain&Bus
2025-03-25 14:12:06 +08:00
parent 77feaee161
commit bd89de8b4f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/conf/Clash.kt
View File

@@ -910,7 +910,7 @@ data class Clash(
override val dialerProxy: String? = null, override val dialerProxy: String? = null,
override val healthCheck: HealthCheck? = null, override val healthCheck: HealthCheck? = null,
override val override: Override? = null, override val override: Override? = null,
val url: String? = null, // Changed from non-nullable to nullable val url: String? = null,
val path: String? = null, val path: String? = null,
val proxy: String? = null, val proxy: String? = null,
val sizeLimit: Long? = null, val sizeLimit: Long? = null,
@@ -929,9 +929,9 @@ data class Clash(
) : ProxyProvider() ) : ProxyProvider()
data class HealthCheck( data class HealthCheck(
val enable: Boolean? = null, // Changed from non-nullable to nullable val enable: Boolean? = null,
val url: String? = null, // Changed from non-nullable to nullable val url: String? = null,
val interval: Int? = null, // Changed from non-nullable to nullable val interval: Int? = null,
val timeout: Int? = null, val timeout: Int? = null,
val lazy: Boolean? = null, val lazy: Boolean? = null,
val expectedStatus: String? = null, val expectedStatus: String? = null,

2
src/main/kotlin/util/JacksonUtil.kt
View File

@@ -1,7 +1,6 @@
package util package util
import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.node.ArrayNode
import com.fasterxml.jackson.databind.node.JsonNodeFactory import com.fasterxml.jackson.databind.node.JsonNodeFactory
import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.node.ObjectNode
@@ -14,5 +13,4 @@ fun newArrayNode(list: List<JsonNode>): ArrayNode = JsonNodeFactory.instance.arr
fun newTextNode(text: String): TextNode = JsonNodeFactory.instance.textNode(text) fun newTextNode(text: String): TextNode = JsonNodeFactory.instance.textNode(text)
fun newObjectNode(map: Map<String, JsonNode>): ObjectNode = JsonNodeFactory.instance.objectNode().apply { map.forEach { replace(it.key, it.value) } } fun newObjectNode(map: Map<String, JsonNode>): ObjectNode = JsonNodeFactory.instance.objectNode().apply { map.forEach { replace(it.key, it.value) } }