Merge branch 'main' into pin

pin
wmzh2006 2 years ago
commit 03b4eff8d7

@ -14,7 +14,7 @@ android {
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
buildConfigField "boolean", "log_enable", "true" buildConfigField "boolean", "log_enable", "true"
buildConfigField "int", "aff_id", "1040" 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", "task_api", "\"https://api.osakamob.com/task\""
buildConfigField "String", "checkSum", "\"0388afc149fe80bf2b73\"" buildConfigField "String", "checkSum", "\"0388afc149fe80bf2b73\""
buildConfigField "String", "chcikUrl", "\"http://46.101.109.8/s/zbs\"" buildConfigField "String", "chcikUrl", "\"http://46.101.109.8/s/zbs\""

@ -120,7 +120,7 @@ abstract class BaseActionExecService(protected open val taskConfig: TaskConfig)
} }
VarExtractRule.EXTRACT_RULE_BETWEEN -> { VarExtractRule.EXTRACT_RULE_BETWEEN -> {
val expr = extractRule.expr.split("|").take(2) 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 -> { VarExtractRule.EXTRACT_RULE_REGEXP -> {
Regex(extractRule.expr).find(wholeResponseData)?.groupValues?.getOrNull(1) ?: "" Regex(extractRule.expr).find(wholeResponseData)?.groupValues?.getOrNull(1) ?: ""

Loading…
Cancel
Save