|
|
@@ -17,11 +17,11 @@ import org.springframework.context.annotation.Configuration;
|
|
|
import org.springframework.context.annotation.Import;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.core.Ordered;
|
|
|
+import org.springframework.core.annotation.AnnotationUtils;
|
|
|
import org.springframework.http.converter.HttpMessageConverter;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
-import org.springframework.web.multipart.MultipartResolver;
|
|
|
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
|
|
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
|
|
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
|
@@ -59,9 +59,6 @@ import org.ssssssss.magicapi.datasource.service.DataSourceEncryptProvider;
|
|
|
import org.ssssssss.magicapi.datasource.web.MagicDataSourceController;
|
|
|
import org.ssssssss.magicapi.function.service.FunctionMagicDynamicRegistry;
|
|
|
import org.ssssssss.magicapi.jsr223.LanguageProvider;
|
|
|
-import org.ssssssss.magicapi.modules.servlet.RequestModule;
|
|
|
-import org.ssssssss.magicapi.modules.servlet.ResponseModule;
|
|
|
-import org.ssssssss.magicapi.modules.spring.EnvModule;
|
|
|
import org.ssssssss.magicapi.utils.Mapping;
|
|
|
import org.ssssssss.script.MagicResourceLoader;
|
|
|
import org.ssssssss.script.MagicScript;
|
|
|
@@ -292,7 +289,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
|
|
|
MagicResourceLoader.addModule("log", new DynamicModuleImport(Logger.class, context -> LoggerFactory.getLogger(Objects.toString(context.getScriptName(), "Unknown"))));
|
|
|
List<String> importModules = properties.getAutoImportModuleList();
|
|
|
applicationContext.getBeansWithAnnotation(MagicModule.class).values().forEach(module -> {
|
|
|
- String moduleName = module.getClass().getAnnotation(MagicModule.class).value();
|
|
|
+ String moduleName = AnnotationUtils.findAnnotation(module.getClass(), MagicModule.class).value();
|
|
|
logger.info("注册模块:{} -> {}", moduleName, module.getClass());
|
|
|
MagicResourceLoader.addModule(moduleName, module);
|
|
|
});
|
mxd