common 新增 PropertyLoader 在 Boot 环境初始化属性用

common/pom.xml

@@ -258,11 +258,17 @@
 		<!-- Spring begin -->
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
+			<artifactId>spring-beans</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<!-- Spring end -->
 		

common/src/main/java/com/jeesite/common/io/PropertyLoader.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ */
+package com.jeesite.common.io;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import org.springframework.boot.env.OriginTrackedMapPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.Resource;
+
+/**
+ * 配置文件加载（Boot）
+ * @author ThinkGem
+ * @version 2018-10-16
+ */
+public class PropertyLoader implements org.springframework.boot.env.PropertySourceLoader{
+	
+	private static boolean isLoadPropertySource = false;
+	
+	@Override
+	public String[] getFileExtensions() {
+		return new String[] { "properties", "yml" };
+	}
+	
+	@Override
+	public List<PropertySource<?>> load(String name, Resource resource) throws IOException {
+		if (!isLoadPropertySource){
+			isLoadPropertySource = true;
+			Properties properties = PropertiesUtils.getInstance().getProperties();
+			return Collections.singletonList(new OriginTrackedMapPropertySource("jeesite", properties));
+		}
+		return Collections.emptyList();
+	}
+	
+}

web/pom.xml

@@ -37,7 +37,7 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		
-		<!-- 在线API文档 -->
+		<!-- 在线文档 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-swagger</artifactId>