提交 b908fd9b 编写于 作者: Y Yiming Liu

Fix get env properties bugs

上级 b57fbd45
...@@ -13,16 +13,17 @@ import com.ctrip.apollo.core.utils.ResourceUtils; ...@@ -13,16 +13,17 @@ import com.ctrip.apollo.core.utils.ResourceUtils;
* *
* Currently, apollo supports local/dev/fat/uat/lpt/pro environments. * Currently, apollo supports local/dev/fat/uat/lpt/pro environments.
*/ */
@SuppressWarnings({"rawtypes", "unchecked"})
public class MetaDomainConsts { public class MetaDomainConsts {
private static Map<Env, String> domains = new HashMap<>(); private static Map<Env, Object> domains = new HashMap<>();
public static final String DEFAULT_META_URL = "http://localhost:8080"; public static final String DEFAULT_META_URL = "http://localhost:8080";
static { static {
Properties prop = new Properties(); Properties prop = new Properties();
prop = ResourceUtils.readConfigFile("apollo-env.properties", prop); prop = ResourceUtils.readConfigFile("apollo-env.properties", prop);
Map<String, String> env = System.getenv(); Map env = System.getProperties();
domains.put(Env.LOCAL, domains.put(Env.LOCAL,
env.getOrDefault("local_meta", prop.getProperty("local.meta", DEFAULT_META_URL))); env.getOrDefault("local_meta", prop.getProperty("local.meta", DEFAULT_META_URL)));
domains.put(Env.DEV, domains.put(Env.DEV,
...@@ -38,6 +39,6 @@ public class MetaDomainConsts { ...@@ -38,6 +39,6 @@ public class MetaDomainConsts {
} }
public static String getDomain(Env env) { public static String getDomain(Env env) {
return domains.get(env); return String.valueOf(domains.get(env));
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册