Skip to content

Commit b79f71a

Browse files
committed
DtpPropertiesBinderUtil remove spring Environment
1 parent 7bd8d69 commit b79f71a

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

common/src/main/java/org/dromara/dynamictp/common/util/DtpPropertiesBinderUtil.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
import cn.hutool.core.util.ReflectUtil;
2121
import lombok.val;
2222
import org.apache.commons.collections4.CollectionUtils;
23+
import org.apache.commons.lang3.StringUtils;
2324
import org.dromara.dynamictp.common.entity.DtpExecutorProps;
2425
import org.dromara.dynamictp.common.entity.TpExecutorProps;
26+
import org.dromara.dynamictp.common.manager.ContextManagerHelper;
2527
import org.dromara.dynamictp.common.properties.DtpProperties;
26-
import org.springframework.core.env.Environment;
2728

2829
import java.lang.reflect.Field;
2930
import java.lang.reflect.ParameterizedType;
@@ -118,25 +119,21 @@ private static void tryResetAdapterExecutors(DtpProperties dtpProperties, Object
118119
}
119120

120121
private static Object getProperty(String key, Object environment) {
121-
if (environment instanceof Environment) {
122-
Environment env = (Environment) environment;
123-
return env.getProperty(key);
124-
} else if (environment instanceof Map) {
122+
if (environment instanceof Map) {
125123
Map<?, Object> properties = (Map<?, Object>) environment;
126124
return properties.get(key);
125+
} else {
126+
return ContextManagerHelper.getEnvironmentProperty(key);
127127
}
128-
return null;
129128
}
130129

131130
private static boolean contains(String key, Object environment) {
132-
if (environment instanceof Environment) {
133-
Environment env = (Environment) environment;
134-
return env.containsProperty(key);
135-
} else if (environment instanceof Map) {
131+
if (environment instanceof Map) {
136132
Map<?, Object> properties = (Map<?, Object>) environment;
137133
return properties.containsKey(key);
134+
} else {
135+
return StringUtils.isNotBlank(ContextManagerHelper.getEnvironmentProperty(key));
138136
}
139-
return false;
140137
}
141138

142139
private static void setBasicField(Object source, Field field, String executorFieldName, Object executor, int[] idx) {

0 commit comments

Comments
 (0)