From 1a498ab1caef8bfe1a13a311c548cf6910085224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E6=83=B3=E5=BD=93=E5=8E=A8=E5=AD=90=E7=9A=84?= =?UTF-8?q?=E8=80=81=E8=B0=AD?= Date: Thu, 18 May 2023 17:35:43 +0800 Subject: [PATCH] feat: for doceker read values form env --- .../java/com/alibaba/datax/common/util/StrUtil.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/alibaba/datax/common/util/StrUtil.java b/common/src/main/java/com/alibaba/datax/common/util/StrUtil.java index 867a9516..02fcaf41 100755 --- a/common/src/main/java/com/alibaba/datax/common/util/StrUtil.java +++ b/common/src/main/java/com/alibaba/datax/common/util/StrUtil.java @@ -58,9 +58,14 @@ public class StrUtil { Matcher matcher = VARIABLE_PATTERN.matcher(param); while (matcher.find()) { String variable = matcher.group(2); - String value = System.getProperty(variable); - if (StringUtils.isBlank(value)) { - value = matcher.group(); + String value = matcher.group(); + String valueFromEnv = System.getenv(variable); + String valueFromProp = System.getProperty(variable); + if (StringUtils.isNotBlank(valueFromEnv)) { + value = valueFromEnv; + } + if (StringUtils.isNotBlank(valueFromProp)) { + value = valueFromProp; } mapping.put(matcher.group(), value); }