From f33a7db4bad4dc8d6d57ce9cca4630a5f5b58a47 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 25 Oct 2018 22:53:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E5=88=86=E5=B8=83=E5=BC=8F=E9=85=8D=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/io/PropertiesUtils.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
index 2acab3be..13cf25a8 100644
--- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
+++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
@@ -15,6 +15,7 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 
@@ -38,6 +39,7 @@ public class PropertiesUtils {
 	private static Logger logger = PropertiesUtils.initLogger();
 	private final Set<String> configSet = SetUtils.newLinkedHashSet();
 	private final Properties properties = new Properties();
+	private static Environment environment;
 	
 	/**
 	 * 当前类的实例持有者（静态内部类，延迟加载，懒汉式，线程安全的单例模式）
@@ -165,6 +167,12 @@ public class PropertiesUtils {
 	 * 获取属性值，取不到从System.getProperty()获取，都取不到返回null
 	 */
 	public String getProperty(String key) {
+		if (environment != null){
+			String value = environment.getProperty(key);
+			if (value != null){
+				return value;
+			}
+		}
         String value = properties.getProperty(key);
         if (value != null){
         	// 支持嵌套取值的问题  key=${xx}/yy
@@ -192,6 +200,14 @@ public class PropertiesUtils {
 		return value != null ? value : defaultValue;
 	}
 	
+	/**
+	 * 设置环境属性
+	 * @param environment
+	 */
+	public static void setEnvironment(Environment environment) {
+		PropertiesUtils.environment = environment;
+	}
+
 	/**
 	 * 初始化日志路径
 	 */