Browse Source

增加env模块

mxd 4 years ago
parent
commit
58b2c90289

+ 7 - 4
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java

@@ -13,6 +13,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.jdbc.core.ColumnMapRowMapper;
 import org.springframework.jdbc.core.RowMapper;
@@ -25,10 +26,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
 import org.ssssssss.magicapi.cache.DefaultSqlCache;
 import org.ssssssss.magicapi.cache.SqlCache;
 import org.ssssssss.magicapi.config.*;
-import org.ssssssss.magicapi.functions.AssertFunctions;
-import org.ssssssss.magicapi.functions.DatabaseQuery;
-import org.ssssssss.magicapi.functions.RequestFunctions;
-import org.ssssssss.magicapi.functions.ResponseFunctions;
+import org.ssssssss.magicapi.functions.*;
 import org.ssssssss.magicapi.logging.LoggerManager;
 import org.ssssssss.magicapi.provider.ApiServiceProvider;
 import org.ssssssss.magicapi.provider.MagicAPIService;
@@ -74,6 +72,9 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer {
 	@Autowired
 	private ApplicationContext springContext;
 
+	@Autowired
+	private Environment environment;
+
 	private String ALL_CLASS_TXT;
 
 	public MagicAPIAutoConfiguration(MagicAPIProperties properties) {
@@ -319,6 +320,8 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer {
 		logger.info("注册模块:{} -> {}", "log", Logger.class);
 		MagicModuleLoader.addModule("log", LoggerFactory.getLogger(MagicScript.class));
 		List<String> importModules = properties.getAutoImportModuleList();
+		logger.info("注册模块:{} -> {}", "env", EnvFunctions.class);
+		MagicModuleLoader.addModule("env", new EnvFunctions(environment));
 		logger.info("注册模块:{} -> {}", "request", RequestFunctions.class);
 		MagicModuleLoader.addModule("request", new RequestFunctions());
 		logger.info("注册模块:{} -> {}", "response", ResponseFunctions.class);