Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
243854d2
Commit
243854d2
authored
Apr 27, 2016
by
Yiming Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix properties getDefault
parent
7ea0ac2a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
MetaDomainConsts.java
...src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
+7
-8
No files found.
apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
View file @
243854d2
...
...
@@ -13,7 +13,6 @@ import com.ctrip.apollo.core.utils.ResourceUtils;
*
* Currently, apollo supports local/dev/fat/uat/lpt/pro environments.
*/
@SuppressWarnings
({
"rawtypes"
,
"unchecked"
})
public
class
MetaDomainConsts
{
private
static
Map
<
Env
,
Object
>
domains
=
new
HashMap
<>();
...
...
@@ -23,19 +22,19 @@ public class MetaDomainConsts {
static
{
Properties
prop
=
new
Properties
();
prop
=
ResourceUtils
.
readConfigFile
(
"apollo-env.properties"
,
prop
);
Map
env
=
System
.
getProperties
();
Properties
env
=
System
.
getProperties
();
domains
.
put
(
Env
.
LOCAL
,
env
.
get
OrDefault
(
"local_meta"
,
prop
.
getProperty
(
"local.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"local_meta"
,
prop
.
getProperty
(
"local.meta"
,
DEFAULT_META_URL
)));
domains
.
put
(
Env
.
DEV
,
env
.
get
OrDefault
(
"dev_meta"
,
prop
.
getProperty
(
"dev.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"dev_meta"
,
prop
.
getProperty
(
"dev.meta"
,
DEFAULT_META_URL
)));
domains
.
put
(
Env
.
FAT
,
env
.
get
OrDefault
(
"fat_meta"
,
prop
.
getProperty
(
"fat.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"fat_meta"
,
prop
.
getProperty
(
"fat.meta"
,
DEFAULT_META_URL
)));
domains
.
put
(
Env
.
UAT
,
env
.
get
OrDefault
(
"uat_meta"
,
prop
.
getProperty
(
"uat.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"uat_meta"
,
prop
.
getProperty
(
"uat.meta"
,
DEFAULT_META_URL
)));
domains
.
put
(
Env
.
LPT
,
env
.
get
OrDefault
(
"lpt_meta"
,
prop
.
getProperty
(
"lpt.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"lpt_meta"
,
prop
.
getProperty
(
"lpt.meta"
,
DEFAULT_META_URL
)));
domains
.
put
(
Env
.
PRO
,
env
.
get
OrDefault
(
"pro_meta"
,
prop
.
getProperty
(
"pro.meta"
,
DEFAULT_META_URL
)));
env
.
get
Property
(
"pro_meta"
,
prop
.
getProperty
(
"pro.meta"
,
DEFAULT_META_URL
)));
}
public
static
String
getDomain
(
Env
env
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment