|
20 | 20 | import cn.hutool.core.util.ReflectUtil;
|
21 | 21 | import lombok.val;
|
22 | 22 | import org.apache.commons.collections4.CollectionUtils;
|
| 23 | +import org.apache.commons.lang3.StringUtils; |
23 | 24 | import org.dromara.dynamictp.common.entity.DtpExecutorProps;
|
24 | 25 | import org.dromara.dynamictp.common.entity.TpExecutorProps;
|
| 26 | +import org.dromara.dynamictp.common.manager.ContextManagerHelper; |
25 | 27 | import org.dromara.dynamictp.common.properties.DtpProperties;
|
26 |
| -import org.springframework.core.env.Environment; |
27 | 28 |
|
28 | 29 | import java.lang.reflect.Field;
|
29 | 30 | import java.lang.reflect.ParameterizedType;
|
@@ -118,25 +119,21 @@ private static void tryResetAdapterExecutors(DtpProperties dtpProperties, Object
|
118 | 119 | }
|
119 | 120 |
|
120 | 121 | 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) { |
125 | 123 | Map<?, Object> properties = (Map<?, Object>) environment;
|
126 | 124 | return properties.get(key);
|
| 125 | + } else { |
| 126 | + return ContextManagerHelper.getEnvironmentProperty(key); |
127 | 127 | }
|
128 |
| - return null; |
129 | 128 | }
|
130 | 129 |
|
131 | 130 | 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) { |
136 | 132 | Map<?, Object> properties = (Map<?, Object>) environment;
|
137 | 133 | return properties.containsKey(key);
|
| 134 | + } else { |
| 135 | + return StringUtils.isNotBlank(ContextManagerHelper.getEnvironmentProperty(key)); |
138 | 136 | }
|
139 |
| - return false; |
140 | 137 | }
|
141 | 138 |
|
142 | 139 | private static void setBasicField(Object source, Field field, String executorFieldName, Object executor, int[] idx) {
|
|
0 commit comments