From 5fae27d329c7cae333abceadb47b53cc40d9a763 Mon Sep 17 00:00:00 2001 From: wmzh2006 Date: Wed, 3 Apr 2024 15:23:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8DEXTRACT=5FRULE=5FBETWE?= =?UTF-8?q?EN=E6=88=AA=E5=8F=96=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/vastlib/service/BaseActionExecService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6886c35..636f686 100644 --- a/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt +++ b/vastlib/src/main/java/com/example/vastlib/service/BaseActionExecService.kt @@ -118,7 +118,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) ?: "" From f7f2e4f6c0baa382ca22989251b1330fdb5ef42b Mon Sep 17 00:00:00 2001 From: wmzh2006 Date: Wed, 3 Apr 2024 15:24:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B738?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vastlib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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\""