#43 fix the priority level of properties

vipshop · Apr 30, 2019 · 500aef0 · 500aef0
1 parent 9cdad84
commit 500aef0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/pallas-common/src/main/java/com/vip/pallas/processor/prop/DefaultPropertyProcessor.java b/pallas-common/src/main/java/com/vip/pallas/processor/prop/DefaultPropertyProcessor.java
@@ -25,11 +25,11 @@
 import com.vip.pallas.utils.PallasBasicProperties;
 
 /*
- * Order 
- * 	env 	     --> key
- *  env 	     --> key.replace(".", "_").toUpperCase()
+ * priority levels, from high to low
  *  jvm args     --> key
  *  jvm args     --> key.replace(".", "_").toUpperCase()
+ * 	env 	     --> key
+ *  env 	     --> key.replace(".", "_").toUpperCase()
  *  app props    --> key
  */
 public class DefaultPropertyProcessor extends AbstractPropertyProcessor {
@@ -45,14 +45,16 @@ protected DefaultPropertyProcessor() {
 
 	protected String getValue(String key) {
 		Objects.requireNonNull(key);
-        String val = getEnv(key);
-        if (null != val) {
-            return val;
-        }
-        val = getSystem(key);
+		String val = getSystem(key);
+		if (null != val) {
+			return val;
+		}
+
+		val = getEnv(key);
         if (null != val) {
             return val;
         }
+
         return getProperty(key);
 	}
 

diff --git a/...core-open/src/main/java/com/vip/pallas/processor/prop/PallasConsolePropertyProcessor.java b/...core-open/src/main/java/com/vip/pallas/processor/prop/PallasConsolePropertyProcessor.java
@@ -20,11 +20,11 @@
 import com.vip.pallas.utils.ConfigReader;
 
 /*
- * Order 
- * 	env 	     --> key
- *  env 	     --> key.replace(".", "_").toUpperCase()
+ * priority levels, from high to low
  *  jvm args     --> key
  *  jvm args     --> key.replace(".", "_").toUpperCase()
+ * 	env 	     --> key
+ *  env 	     --> key.replace(".", "_").toUpperCase()
  *  app props    --> key
  *  spring props --> key
  */