diff --git a/common/pom.xml b/common/pom.xml index 3dda0cf2..37875bb7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -258,11 +258,17 @@ org.springframework - spring-core + spring-beans org.springframework spring-web + true + + + org.springframework.boot + spring-boot + true diff --git a/common/src/main/java/com/jeesite/common/io/PropertyLoader.java b/common/src/main/java/com/jeesite/common/io/PropertyLoader.java new file mode 100644 index 00000000..b6ed453d --- /dev/null +++ b/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> 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(); + } + +} diff --git a/web/pom.xml b/web/pom.xml index 43c3e4c9..17c919ef 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -37,7 +37,7 @@ ${project.parent.version} - + com.jeesite jeesite-module-swagger