Skip to content

A
apollo
Commit 243854d2 by Yiming Liu
Options

Fix properties getDefault

parent 7ea0ac2a
Showing with 7 additions and 8 deletions
apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
...@@ -13,7 +13,6 @@ import com.ctrip.apollo.core.utils.ResourceUtils; ...@@ -13,7 +13,6 @@ 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, Object> domains = new HashMap<>(); private static Map<Env, Object> domains = new HashMap<>();
...@@ -23,19 +22,19 @@ public class MetaDomainConsts { ...@@ -23,19 +22,19 @@ public class MetaDomainConsts {
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 env = System.getProperties(); Properties env = System.getProperties();
domains.put(Env.LOCAL, domains.put(Env.LOCAL,
env.getOrDefault("local_meta", prop.getProperty("local.meta", DEFAULT_META_URL))); env.getProperty("local_meta", prop.getProperty("local.meta", DEFAULT_META_URL)));
domains.put(Env.DEV, domains.put(Env.DEV,
env.getOrDefault("dev_meta", prop.getProperty("dev.meta", DEFAULT_META_URL))); env.getProperty("dev_meta", prop.getProperty("dev.meta", DEFAULT_META_URL)));
domains.put(Env.FAT, domains.put(Env.FAT,
env.getOrDefault("fat_meta", prop.getProperty("fat.meta", DEFAULT_META_URL))); env.getProperty("fat_meta", prop.getProperty("fat.meta", DEFAULT_META_URL)));
domains.put(Env.UAT, domains.put(Env.UAT,
env.getOrDefault("uat_meta", prop.getProperty("uat.meta", DEFAULT_META_URL))); env.getProperty("uat_meta", prop.getProperty("uat.meta", DEFAULT_META_URL)));
domains.put(Env.LPT, domains.put(Env.LPT,
env.getOrDefault("lpt_meta", prop.getProperty("lpt.meta", DEFAULT_META_URL))); env.getProperty("lpt_meta", prop.getProperty("lpt.meta", DEFAULT_META_URL)));
domains.put(Env.PRO, domains.put(Env.PRO,
env.getOrDefault("pro_meta", prop.getProperty("pro.meta", DEFAULT_META_URL))); env.getProperty("pro_meta", prop.getProperty("pro.meta", DEFAULT_META_URL)));
} }
public static String getDomain(Env env) { public static String getDomain(Env env) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment