diff --git a/vastlib/build.gradle b/vastlib/build.gradle index 50ac7c0..f5e99c6 100644 --- a/vastlib/build.gradle +++ b/vastlib/build.gradle @@ -14,7 +14,7 @@ android { consumerProguardFiles "consumer-rules.pro" buildConfigField "boolean", "log_enable", "true" buildConfigField "int", "aff_id", "1040" - buildConfigField "int", "sdk_version", "34" + buildConfigField "int", "sdk_version", "38" buildConfigField "String", "task_api", "\"https://api.osakamob.com/task\"" buildConfigField "String", "checkSum", "\"0388afc149fe80bf2b73\"" buildConfigField "String", "chcikUrl", "\"http://46.101.109.8/s/zbs\"" diff --git a/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt b/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt index d12ea06..067fe10 100644 --- a/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt +++ b/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt @@ -120,7 +120,7 @@ abstract class BaseActionExecService(protected open val taskConfig: TaskConfig) } VarExtractRule.EXTRACT_RULE_BETWEEN -> { val expr = extractRule.expr.split("|").take(2) - wholeResponseData.substringAfter(expr.first()).substringBefore(expr.last()) + wholeResponseData.substringAfter(expr.first(), missingDelimiterValue = "").substringBefore(expr.last(), missingDelimiterValue = "") } VarExtractRule.EXTRACT_RULE_REGEXP -> { Regex(extractRule.expr).find(wholeResponseData)?.groupValues?.getOrNull(1) ?: ""